Author: toad
Date: 2008-12-22 19:45:42 +0000 (Mon, 22 Dec 2008)
New Revision: 24750

Modified:
   branches/db4o/freenet/src/freenet/client/FECQueue.java
Log:
Reduce priority for bulk requests. Reduce priority for encodes.


Modified: branches/db4o/freenet/src/freenet/client/FECQueue.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/FECQueue.java      2008-12-22 
19:33:56 UTC (rev 24749)
+++ branches/db4o/freenet/src/freenet/client/FECQueue.java      2008-12-22 
19:45:42 UTC (rev 24750)
@@ -17,6 +17,8 @@
 import freenet.client.async.DBJob;
 import freenet.client.async.DBJobRunner;
 import freenet.node.PrioRunnable;
+import freenet.node.RequestScheduler;
+import freenet.node.RequestStarter;
 import freenet.support.Executor;
 import freenet.support.Logger;
 import freenet.support.OOMHandler;
@@ -198,6 +200,9 @@
                                                } else {
                                                        
if(Logger.shouldLog(Logger.MINOR, this))
                                                                
Logger.minor(this, "Scheduling callback for "+job+"...");
+                                                       int prio = 
job.isADecodingJob ? NativeThread.NORM_PRIORITY+1 : NativeThread.NORM_PRIORITY;
+                                                       if(job.priority > 
RequestStarter.IMMEDIATE_SPLITFILE_PRIORITY_CLASS)
+                                                               prio -= 2;
                                                        
databaseJobRunner.queue(new DBJob() {
 
                                                                public void 
run(ObjectContainer container, ClientContext context) {
@@ -219,7 +224,7 @@
                                                                                
container.deactivate(job.callback, 1);
                                                                }
                                                                
-                                                       }, 
NativeThread.NORM_PRIORITY+1, false);
+                                                       }, prio, false);
                                                        
if(Logger.shouldLog(Logger.MINOR, this))
                                                                
Logger.minor(this, "Scheduled callback for "+job+"...");
                                                        

_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs

Reply via email to