Update of /cvsroot/freenet/freenet/src/freenet
In directory sc8-pr-cvs1:/tmp/cvs-serv32052/src/freenet
Modified Files:
Ticker.java
Log Message:
Make the HTML view display age of the items in the fast-event queue
Index: Ticker.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/Ticker.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -w -r1.24 -r1.25
--- Ticker.java 14 Oct 2003 17:52:48 -0000 1.24
+++ Ticker.java 14 Oct 2003 18:40:41 -0000 1.25
@@ -369,7 +369,7 @@
//No synch here since we are allowed to oovershoot the limit
by a couple of
//events or so..
if(immediateExecutionQueue.size()<desiredMaximumQueue){
- immediateExecutionQueue.enqueue(mo);
+ immediateExecutionQueue.enqueue(new
EventQueueItem(mo));
return true;
}else
return false;
@@ -378,25 +378,34 @@
while(true) {
try{
Object o = immediateExecutionQueue.dequeue();
- runOrSchedule((MessageObject)o);
+ runOrSchedule(((EventQueueItem)o).mo);
}catch(InterruptedException e){}
}
}
public void writeEventsHtml(PrintWriter pw){
pw.println("<b>Pending immediate execution tasks (Count:
"+immediateExecutionThread.getCurrentQueueSize()+", Desired max:
"+desiredMaximumQueue+")</b>");
- pw.println("<table
border=1><tr><th>Time</th><th>Event</th></tr>");
+ pw.println("<table
border=1><tr><th>Age</th><th>Event</th></tr>");
- Object[] messageobjects = immediateExecutionQueue.toArray();
- for (int i = 0 ; i < messageobjects.length ; i++) {
+ Object[] events = immediateExecutionQueue.toArray();
+ for (int i = 0 ; i < events.length ; i++) {
pw.print("<tr><td>");
- MessageObject message =((MessageObject)
messageobjects[i]);
- pw.print("(immediately)");
+ EventQueueItem evt =((EventQueueItem) events[i]);
+ pw.print(System.currentTimeMillis()-evt.timeQueued);
pw.print("</td><td>");
- pw.print(message);
+ pw.print(evt);
pw.println("</td></tr>");
}
pw.println("</table>");
+ }
+ private class EventQueueItem
+ {
+ MessageObject mo;
+ long timeQueued;
+ EventQueueItem(MessageObject mo){
+ this.mo = mo;
+ timeQueued = System.currentTimeMillis();
+ }
}
}
}
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
