Author: toad
Date: 2008-02-18 15:06:17 +0000 (Mon, 18 Feb 2008)
New Revision: 18046
Modified:
trunk/freenet/src/freenet/node/PacketSender.java
trunk/freenet/src/freenet/node/Ticker.java
trunk/freenet/src/freenet/support/PooledExecutor.java
Log:
Pass in job name to PacketSender. Use it if we run immediately.
Modified: trunk/freenet/src/freenet/node/PacketSender.java
===================================================================
--- trunk/freenet/src/freenet/node/PacketSender.java 2008-02-18 15:00:22 UTC
(rev 18045)
+++ trunk/freenet/src/freenet/node/PacketSender.java 2008-02-18 15:06:17 UTC
(rev 18046)
@@ -466,16 +466,16 @@
}
public void queueTimedJob(Runnable job, long offset) {
- queueTimedJob(job, offset, false);
+ queueTimedJob(job, "Scheduled job: "+job, offset, false);
}
- public void queueTimedJob(Runnable job, long offset, boolean
runOnTickerAnyway) {
+ public void queueTimedJob(Runnable job, String name, long offset,
boolean runOnTickerAnyway) {
// Run directly *if* that won't cause any priority problems.
if(offset <= 0 && !runOnTickerAnyway) {
if(logMINOR) Logger.minor(this, "Running directly:
"+job);
- node.executor.execute(job, "Scheduled job: " + job);
+ node.executor.execute(job, name);
return;
}
if(offset < 0) offset = 0;
Modified: trunk/freenet/src/freenet/node/Ticker.java
===================================================================
--- trunk/freenet/src/freenet/node/Ticker.java 2008-02-18 15:00:22 UTC (rev
18045)
+++ trunk/freenet/src/freenet/node/Ticker.java 2008-02-18 15:06:17 UTC (rev
18046)
@@ -6,6 +6,6 @@
public interface Ticker {
public abstract void queueTimedJob(Runnable job, long offset);
- public abstract void queueTimedJob(Runnable job, long offset, boolean
runOnTickerAnyway);
+ public abstract void queueTimedJob(Runnable job, String name, long
offset, boolean runOnTickerAnyway);
}
\ No newline at end of file
Modified: trunk/freenet/src/freenet/support/PooledExecutor.java
===================================================================
--- trunk/freenet/src/freenet/support/PooledExecutor.java 2008-02-18
15:00:22 UTC (rev 18045)
+++ trunk/freenet/src/freenet/support/PooledExecutor.java 2008-02-18
15:06:17 UTC (rev 18046)
@@ -68,7 +68,7 @@
// Must create new thread
if((!fromTicker) &&
NativeThread.usingNativeCode() && prio > Thread.currentThread().getPriority()) {
// Run on ticker
- ticker.queueTimedJob(job, 0,
true);
+ ticker.queueTimedJob(job,
jobName, 0, true);
return;
}
// Will be coalesced by thread count
listings if we use "@" or "for"
