Now that making the job ready to run is an asynchronous event, the deliberate

scheduler delay'ed poke has to happen when the jobcontrol completes.

diff --git a/faxd/faxQueueApp.c++ b/faxd/faxQueueApp.c++
index 7b5c93cf70c340906c9c28fa3d5e49c9cb4c0981..ed958e92f2c53ad75492286bc228db8e25f11ac1 100644 (file)
--- a/faxd/faxQueueApp.c++
+++ b/faxd/faxQueueApp.c++
@@ -1688,7 +1688,14 @@ faxQueueApp::ctrlJobDone(Job& job, int status)
       (iter.job().pri == job.pri && iter.job().tts <= job.tts)); iter++)
        ;
     job.insert(iter.job());
-    pokeScheduler(0);
+    /*
+     * In order to deliberately batch jobs by using a common
+     * time-to-send we need to give time for the other jobs'
+     * timers to expire and to enter the run queue before
+     * running the scheduler.  Thus the scheduler is poked
+     * with a delay.
+     */
+    pokeScheduler(1);
 }
 
 /*
@@ -2231,14 +2238,6 @@ faxQueueApp::runJob(Job& job)
 {
     job.remove();
     setReadyToRun(job, jobCtrlWait);
-    /*
-     * In order to deliberately batch jobs by using a common
-     * time-to-send we need to give time for the other jobs'
-     * timers to expire and to enter the run queue before
-     * running the scheduler.  Thus the scheduler is poked
-     * with a delay.
-     */
-    pokeScheduler(1);
 }
 
 /*