Author: toad
Date: 2007-05-18 20:54:53 +0000 (Fri, 18 May 2007)
New Revision: 13267
Modified:
trunk/freenet/src/freenet/node/KeyTracker.java
trunk/freenet/src/freenet/node/PacketSender.java
trunk/freenet/src/freenet/node/PeerNode.java
Log:
Minor refactoring
Modified: trunk/freenet/src/freenet/node/KeyTracker.java
===================================================================
--- trunk/freenet/src/freenet/node/KeyTracker.java 2007-05-18 20:39:02 UTC
(rev 13266)
+++ trunk/freenet/src/freenet/node/KeyTracker.java 2007-05-18 20:54:53 UTC
(rev 13267)
@@ -659,7 +659,7 @@
synchronized(packetsToResend) {
packetsToResend.add(new Integer(seqNumber));
}
- pn.node.ps.queuedResendPacket();
+ pn.node.ps.wakeUp();
} else {
synchronized(this) {
String msg = "Asking me to resend packet "+seqNumber+
@@ -1011,7 +1011,7 @@
}
pn.requeueMessageItems(messages, 0, messages.length, true);
- pn.node.ps.queuedResendPacket();
+ pn.node.ps.wakeUp();
}
/**
Modified: trunk/freenet/src/freenet/node/PacketSender.java
===================================================================
--- trunk/freenet/src/freenet/node/PacketSender.java 2007-05-18 20:39:02 UTC
(rev 13266)
+++ trunk/freenet/src/freenet/node/PacketSender.java 2007-05-18 20:54:53 UTC
(rev 13267)
@@ -395,7 +395,8 @@
}
}
- protected void queuedResendPacket() {
+ /** Wake up, and send any queued packets. */
+ void wakeUp() {
// Wake up if needed
synchronized(this) {
notifyAll();
Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java 2007-05-18 20:39:02 UTC
(rev 13266)
+++ trunk/freenet/src/freenet/node/PeerNode.java 2007-05-18 20:54:53 UTC
(rev 13267)
@@ -953,9 +953,7 @@
}
if(x > 1024) {
// If there is a packet's worth to send, wake up the
packetsender.
- synchronized(node.ps) {
- node.ps.notifyAll();
- }
+ node.ps.wakeUp();
}
// We DO NOT NEED to wake up the PacketSender
// It will wake up before the maximum coalescing delay (100ms) because
