[Udt-java-commits] SF.net SVN: udt-java:[68] udt-java/trunk/src

[<bsc...@us...>]

Revision: 68
          http://udt-java.svn.sourceforge.net/udt-java/?rev=68&view=rev
Author:   bschuller
Date:     2011-12-01 19:52:51 +0000 (Thu, 01 Dec 2011)
Log Message:
-----------
apply a few fixes from P. Elgee

Modified Paths:
--------------
    udt-java/trunk/src/main/java/udt/sender/FlowWindow.java
    udt-java/trunk/src/main/java/udt/util/ReceiveBuffer.java
    udt-java/trunk/src/test/java/udt/performance/TestUDTLargeData.java
    udt-java/trunk/src/test/java/udt/sender/TestFlowWindow.java

Modified: udt-java/trunk/src/main/java/udt/sender/FlowWindow.java
===================================================================
--- udt-java/trunk/src/main/java/udt/sender/FlowWindow.java	2011-12-01 13:55:08 UTC (rev 67)
+++ udt-java/trunk/src/main/java/udt/sender/FlowWindow.java	2011-12-01 19:52:51 UTC (rev 68)
@@ -78,7 +78,7 @@
 			writePos++;
 			if(writePos==length)writePos=0;
 			validEntries++;
-			isFull=validEntries==length-1;
+			isFull=validEntries==length;
 			isEmpty=false;
 			produced++;
 		}finally{

Modified: udt-java/trunk/src/main/java/udt/util/ReceiveBuffer.java
===================================================================
--- udt-java/trunk/src/main/java/udt/util/ReceiveBuffer.java	2011-12-01 13:55:08 UTC (rev 67)
+++ udt-java/trunk/src/main/java/udt/util/ReceiveBuffer.java	2011-12-01 19:52:51 UTC (rev 68)
@@ -120,7 +120,6 @@
 			}
 			else return null;
 		}
-		numValidChunks.decrementAndGet();
 		return r;
 	}
 

Modified: udt-java/trunk/src/test/java/udt/performance/TestUDTLargeData.java
===================================================================
--- udt-java/trunk/src/test/java/udt/performance/TestUDTLargeData.java	2011-12-01 13:55:08 UTC (rev 67)
+++ udt-java/trunk/src/test/java/udt/performance/TestUDTLargeData.java	2011-12-01 19:52:51 UTC (rev 68)
@@ -22,7 +22,7 @@
 	boolean running=false;
 
 	//how many
-	int num_packets=500;
+	int num_packets=50;
 	
 	//how large is a single packet
 	int size=20*1024*1024;

Modified: udt-java/trunk/src/test/java/udt/sender/TestFlowWindow.java
===================================================================
--- udt-java/trunk/src/test/java/udt/sender/TestFlowWindow.java	2011-12-01 13:55:08 UTC (rev 67)
+++ udt-java/trunk/src/test/java/udt/sender/TestFlowWindow.java	2011-12-01 19:52:51 UTC (rev 68)
@@ -110,9 +110,7 @@
 				while( (p=fw.consumeData())==null){
 					Thread.sleep(1);
 				}
-				synchronized (p) {
-					assertEquals(i,p.getMessageNumber());
-				}
+				assertEquals(i,p.getMessageNumber());
 			}	
 		}catch(Throwable ex){
 			ex.printStackTrace();
@@ -131,11 +129,9 @@
 				do{
 					p=fw.getForProducer();
 					if(p!=null){
-						synchronized(p){
-							p.setData(("test"+i).getBytes());
-							p.setMessageNumber(i);
-							fw.produce();
-						}
+						p.setData(("test"+i).getBytes());
+						p.setMessageNumber(i);
+						fw.produce();
 					}
 				}while(p==null);
 			}	

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