echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2007-01-28 zzz

Browse Source 
* i2psnark: Don't hold sendQueue lock while flushing output,
      to make everything run smoother
This commit is contained in:
zzz
2007-01-29 04:03:36 +00:00
committed by zzz
parent 0fd41a9490
commit 2aeef44f8d
3 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
apps/i2psnark/java/src/org/klomp/snark/PeerConnectionOut.java
View File

@ -72,6 +72,16 @@ class PeerConnectionOut implements Runnable
{ {
Message m = null; Message m = null;
PeerState state = null; PeerState state = null;
boolean shouldFlush;
synchronized(sendQueue)
{
shouldFlush = !quit && peer.isConnected() && sendQueue.isEmpty();
}
if (shouldFlush)
// Make sure everything will reach the other side.
// flush while not holding lock, could take a long time
dout.flush();
synchronized(sendQueue) synchronized(sendQueue)
{ {
while (!quit && peer.isConnected() && sendQueue.isEmpty()) while (!quit && peer.isConnected() && sendQueue.isEmpty())
@ -79,7 +89,8 @@ class PeerConnectionOut implements Runnable
try try
{ {
// Make sure everything will reach the other side. // Make sure everything will reach the other side.
dout.flush(); // don't flush while holding lock, could take a long time
// dout.flush();
// Wait till more data arrives. // Wait till more data arrives.
sendQueue.wait(60*1000); sendQueue.wait(60*1000);

6
history.txt
View File

@ -1,4 +1,8 @@
$Id: history.txt,v 1.544 2007-01-20 22:49:41 complication Exp $ $Id: history.txt,v 1.545 2007-01-27 21:30:07 zzz Exp $
2007-01-28 zzz
* i2psnark: Don't hold sendQueue lock while flushing output,
to make everything run smoother
2007-01-27 zzz 2007-01-27 zzz
* i2psnark: Fix orphaned Snark reader tasks leading to OOMs * i2psnark: Fix orphaned Snark reader tasks leading to OOMs

4
router/java/src/net/i2p/router/RouterVersion.java
View File

@ -15,9 +15,9 @@ import net.i2p.CoreVersion;
* *
*/ */
public class RouterVersion { public class RouterVersion {
public final static String ID = "$Revision: 1.480 $ $Date: 2007-01-20 22:49:41 $"; public final static String ID = "$Revision: 1.481 $ $Date: 2007-01-27 21:30:05 $";
public final static String VERSION = "0.6.1.26"; public final static String VERSION = "0.6.1.26";
public final static long BUILD = 14; public final static long BUILD = 15;
public static void main(String args[]) { public static void main(String args[]) {
System.out.println("I2P Router version: " + VERSION + "-" + BUILD); System.out.println("I2P Router version: " + VERSION + "-" + BUILD);
System.out.println("Router ID: " + RouterVersion.ID); System.out.println("Router ID: " + RouterVersion.ID);