svn commit: r305913 - in head/net-p2p: libtorrent libtorrent/files rtorrent

[Andrej Zverev]

Author: az
Date: Mon Oct 15 12:41:26 2012
New Revision: 305913
URL: http://svn.freebsd.org/changeset/ports/305913

Log:
  - fix bug causing CPU load on FreeBSD.
  - bump portrevisions.
  
  PR:		ports/170766
  Submitted by: 	Yamagi Burmeister <yamagi at yamagi.org>
  Approved by:	maintainer (timeout > 2 weeks)
  
  Feature safe: yes

Added:
  head/net-p2p/libtorrent/files/patch-src_torrent_utils_thread__base.cc   (contents, props changed)
Modified:
  head/net-p2p/libtorrent/Makefile   (contents, props changed)
  head/net-p2p/rtorrent/Makefile   (contents, props changed)

Modified: head/net-p2p/libtorrent/Makefile
==============================================================================
--- head/net-p2p/libtorrent/Makefile	Mon Oct 15 12:33:25 2012	(r305912)
+++ head/net-p2p/libtorrent/Makefile	Mon Oct 15 12:41:26 2012	(r305913)
@@ -2,6 +2,7 @@
 
 PORTNAME?=	libtorrent
 PORTVERSION?=	0.13.2
+PORTREVISION=	1
 CATEGORIES=	net-p2p
 MASTER_SITES=	http://libtorrent.rakshasa.no/downloads/ \
 		${MASTER_SITE_LOCAL}

Added: head/net-p2p/libtorrent/files/patch-src_torrent_utils_thread__base.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-p2p/libtorrent/files/patch-src_torrent_utils_thread__base.cc	Mon Oct 15 12:41:26 2012	(r305913)
@@ -0,0 +1,20 @@
+--- src/torrent/utils/thread_base.cc.orig
++++ src/torrent/utils/thread_base.cc
+@@ -88,6 +88,8 @@ thread_base::stop_thread_wait() {
+ 
+ void
+ thread_base::interrupt() {
++  int sleep_length = 0;
++
+   __sync_fetch_and_or(&m_flags, flag_no_timeout);
+ 
+   while (is_polling() && has_no_timeout()) {
+@@ -96,7 +98,8 @@ thread_base::interrupt() {
+     if (!(is_polling() && has_no_timeout()))
+       return;
+ 
+-    usleep(0);
++    usleep(sleep_length);
++    sleep_length = std::min(sleep_length + 50, 1000);
+   }
+ }
\ No newline at end of file

Modified: head/net-p2p/rtorrent/Makefile
==============================================================================
--- head/net-p2p/rtorrent/Makefile	Mon Oct 15 12:33:25 2012	(r305912)
+++ head/net-p2p/rtorrent/Makefile	Mon Oct 15 12:41:26 2012	(r305913)
@@ -2,7 +2,7 @@
 
 PORTNAME?=	rtorrent
 PORTVERSION?=	0.9.2
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	net-p2p
 MASTER_SITES=	http://libtorrent.rakshasa.no/downloads/ \
 		${MASTER_SITE_LOCAL}
@@ -11,8 +11,8 @@ MASTER_SITE_SUBDIR=	flz/rtorrent/
 MAINTAINER?=	flz at FreeBSD.org
 COMMENT?=	BitTorrent Client written in C++
 
-BUILD_DEPENDS?=	libtorrent=0.13.2:${PORTSDIR}/net-p2p/libtorrent
-RUN_DEPENDS?=	libtorrent=0.13.2:${PORTSDIR}/net-p2p/libtorrent
+BUILD_DEPENDS?=	libtorrent=0.13.2_1:${PORTSDIR}/net-p2p/libtorrent
+RUN_DEPENDS?=	libtorrent=0.13.2_1:${PORTSDIR}/net-p2p/libtorrent
 LIB_DEPENDS?=	curl.6:${PORTSDIR}/ftp/curl
 
 CONFLICTS?=	rtorrent-devel-[0-9]*