[Sipp-commits] SF.net SVN: sipp:[511] sipp/trunk/sipp.cpp

[<cha...@us...>]

Revision: 511
          http://sipp.svn.sourceforge.net/sipp/?rev=511&view=rev
Author:   charlespwright
Date:     2008-07-21 14:20:57 +0000 (Mon, 21 Jul 2008)

Log Message:
-----------
revised pollset_process fix by M.H. Van Leeuwen.

Modified Paths:
--------------
    sipp/trunk/sipp.cpp

Modified: sipp/trunk/sipp.cpp
===================================================================
--- sipp/trunk/sipp.cpp	2008-07-18 11:09:18 UTC (rev 510)
+++ sipp/trunk/sipp.cpp	2008-07-21 14:20:57 UTC (rev 511)
@@ -29,6 +29,7 @@
  *           Clement Chen
  *           Wolfgang Beck
  *           Charles P Wright from IBM Research
+ *           Martin Van Leeuwen
  */
 
 #define GLOBALS_FULL_DEFINITION
@@ -3180,14 +3181,16 @@
 	}
       } else {
 	if ((ret = empty_socket(sock)) <= 0) {
-	  read_error(sock, ret);
-	  /* If read_error() then the poll_idx now belongs
-	   * to the newest/last socket added to the sockets[].
-	   * Need to re-do the same poll_idx for the "new" socket. */
-	  poll_idx--;
-	  events++;
-	  rs--;
-	  continue;
+	  ret = read_error(sock, ret);
+	  if (ret == 0) {
+	    /* If read_error() then the poll_idx now belongs
+	     * to the newest/last socket added to the sockets[].
+	     * Need to re-do the same poll_idx for the "new" socket. */
+	    poll_idx--;
+	    events++;
+	    rs--;
+	    continue;
+	  }
 	}
       }
       events++;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.