[freenet-cvs] r16985 - trunk/freenet/src/freenet/node

[robert at freenetproject.org]

Author: robert
Date: 2008-01-09 18:04:28 +0000 (Wed, 09 Jan 2008)
New Revision: 16985

Modified:
   trunk/freenet/src/freenet/node/NodeClientCore.java
   trunk/freenet/src/freenet/node/RequestHandler.java
   trunk/freenet/src/freenet/node/RequestSender.java
Log:
revert r16983: interferes with bytecounts/throttling


Modified: trunk/freenet/src/freenet/node/NodeClientCore.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeClientCore.java	2008-01-09 17:42:12 UTC (rev 16984)
+++ trunk/freenet/src/freenet/node/NodeClientCore.java	2008-01-09 18:04:28 UTC (rev 16985)
@@ -465,7 +465,7 @@
 		boolean rejectedOverload = false;
 		short waitStatus = 0;
 		while(true) {
-			waitStatus = rs.waitUntilStatusChange(waitStatus, 120000);
+			waitStatus = rs.waitUntilStatusChange(waitStatus);
 			if((!rejectedOverload) && (waitStatus & RequestSender.WAIT_REJECTED_OVERLOAD) != 0) {
 				// See below; inserts count both
 				requestStarters.rejectedOverload(false, false);
@@ -578,7 +578,7 @@
 		boolean rejectedOverload = false;
 		short waitStatus = 0;
 		while(true) {
-			waitStatus = rs.waitUntilStatusChange(waitStatus, 120000);
+			waitStatus = rs.waitUntilStatusChange(waitStatus);
 			if((!rejectedOverload) && (waitStatus & RequestSender.WAIT_REJECTED_OVERLOAD) != 0) {
 				requestStarters.rejectedOverload(true, false);
 				rejectedOverload = true;

Modified: trunk/freenet/src/freenet/node/RequestHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestHandler.java	2008-01-09 17:42:12 UTC (rev 16984)
+++ trunk/freenet/src/freenet/node/RequestHandler.java	2008-01-09 18:04:28 UTC (rev 16985)
@@ -158,9 +158,9 @@
         
         while(true) {
             
-        	waitStatus = rs.waitUntilStatusChange(waitStatus, responseDeadline-System.currentTimeMillis());
+        	waitStatus = rs.waitUntilStatusChange(waitStatus);
 			
-			if (System.currentTimeMillis() >= responseDeadline) {
+			if (System.currentTimeMillis() > responseDeadline) {
 				applyByteCounts();
 				return;
 			}

Modified: trunk/freenet/src/freenet/node/RequestSender.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestSender.java	2008-01-09 17:42:12 UTC (rev 16984)
+++ trunk/freenet/src/freenet/node/RequestSender.java	2008-01-09 18:04:28 UTC (rev 16985)
@@ -641,9 +641,8 @@
      * @return Bitmask indicating present situation. Can be fed back to this function,
      * if nonzero.
      */
-    public synchronized short waitUntilStatusChange(short mask, long timeout) {
+    public synchronized short waitUntilStatusChange(short mask) {
     	if(mask == WAIT_ALL) throw new IllegalArgumentException("Cannot ignore all!");
-		long startTime=System.currentTimeMillis();
         while(true) {
         	short current = mask; // If any bits are set already, we ignore those states.
         	
@@ -657,17 +656,9 @@
         		current |= WAIT_FINISHED;
         	
         	if(current != mask) return current;
-        	
-			long timeLeft = (startTime+timeout) - System.currentTimeMillis();
 			
-			if (timeLeft <= 0) {
-				Logger.normal(this, "RequestSender.waitUntilStatusChange timed out");
-				return current;
-			}
-			
             try {
-				//Wait at most ten seconds per-loop
-                wait(Math.min(timeLeft, 10000));
+                wait(10000);
             } catch (InterruptedException e) {
                 // Ignore
             }