Update iperf to 2.0.4 (#4317), thanks Raphael

SVN-Revision: 13573

diff --git a/net/iperf/Makefile b/net/iperf/Makefile
index 9ac017fbf470873d935bb461d2d7aed8f899de35..46334650b1b0e74b24196087fac0ddda1b1bdfce 100644 (file)
--- a/net/iperf/Makefile
+++ b/net/iperf/Makefile
@@ -9,12 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=iperf
-PKG_VERSION:=2.0.2
-PKG_RELEASE:=2
+PKG_VERSION:=2.0.4
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://downloads.openwrt.org/sources/
-PKG_MD5SUM:=bb658aba58a5af0356f5b1342dfe8f53
+PKG_SOURCE_URL:=@SF/$(PKG_NAME)
+PKG_MD5SUM:=8c5bc14cc2ea55f18f22afe3c23e3dcb
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/net/iperf/patches/001-locking_fixes.patch b/net/iperf/patches/001-locking_fixes.patch
deleted file mode 100755 (executable)
index a297130..0000000
--- a/net/iperf/patches/001-locking_fixes.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-===================================================================
---- iperf-2.0.2.orig/compat/Thread.c
-+++ iperf-2.0.2/compat/Thread.c
-@@ -405,9 +405,6 @@ int thread_numuserthreads( void ) {
- void thread_rest ( void ) {
- #if defined( HAVE_THREAD )
- #if defined( HAVE_POSIX_THREAD )
--    // TODO add checks for sched_yield or pthread_yield and call that
--    // if available
--    usleep( 0 );
- #else // Win32
-     SwitchToThread( );
- #endif
-Index: iperf-2.0.2/src/Reporter.c
-===================================================================
---- iperf-2.0.2.orig/src/Reporter.c
-+++ iperf-2.0.2/src/Reporter.c
-@@ -111,6 +111,7 @@ report_statistics multiple_reports[kRepo
- char buffer[64]; // Buffer for printing
- ReportHeader *ReportRoot = NULL;
- extern Condition ReportCond;
-+extern Condition ReportDoneCond;
- int reporter_process_report ( ReportHeader *report );
- void process_report ( ReportHeader *report );
- int reporter_handle_packet( ReportHeader *report );
-@@ -338,7 +339,7 @@ void ReportPacket( ReportHeader* agent, 
-             // item
-             while ( index == 0 ) {
-                 Condition_Signal( &ReportCond );
--                thread_rest();
-+                Condition_Wait( &ReportDoneCond );
-                 index = agent->reporterindex;
-             }
-             agent->agentindex = 0;
-@@ -346,7 +347,7 @@ void ReportPacket( ReportHeader* agent, 
-         // Need to make sure that reporter is not about to be "lapped"
-         while ( index - 1 == agent->agentindex ) {
-             Condition_Signal( &ReportCond );
--            thread_rest();
-+            Condition_Wait( &ReportDoneCond );
-             index = agent->reporterindex;
-         }
-         
-@@ -553,6 +554,7 @@ void reporter_spawn( thread_Settings *th
-         }
-         Condition_Unlock ( ReportCond );
- 
-+again:
-         if ( ReportRoot != NULL ) {
-             ReportHeader *temp = ReportRoot;
-             //Condition_Unlock ( ReportCond );
-@@ -575,9 +577,12 @@ void reporter_spawn( thread_Settings *th
-                 // finished with report so free it
-                 free( temp );
-                 Condition_Unlock ( ReportCond );
-+              Condition_Signal( &ReportDoneCond );
-+              if (ReportRoot)
-+                      goto again;
-             }
--            // yield control of CPU is another thread is waiting
--            thread_rest();
-+            Condition_Signal( &ReportDoneCond );
-+            usleep(10000);
-         } else {
-             //Condition_Unlock ( ReportCond );
-         }
-Index: iperf-2.0.2/src/main.cpp
-===================================================================
---- iperf-2.0.2.orig/src/main.cpp
-+++ iperf-2.0.2/src/main.cpp
-@@ -96,6 +96,7 @@ extern "C" {
-     // records being accessed in a report and also to
-     // serialize modification of the report list
-     Condition ReportCond;
-+    Condition ReportDoneCond;
- }
- 
- // global variables only accessed within this file
-@@ -141,6 +142,7 @@ int main( int argc, char **argv ) {
- 
-     // Initialize global mutexes and conditions
-     Condition_Initialize ( &ReportCond );
-+    Condition_Initialize ( &ReportDoneCond );
-     Mutex_Initialize( &groupCond );
-     Mutex_Initialize( &clients_mutex );
- 
--
-To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
-the body of a message to majordomo@vger.kernel.org
-More majordomo info at  http://vger.kernel.org/majordomo-info.html
-Please read the FAQ at  http://www.tux.org/lkml/
-