[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/work/icecream-make-it-cool/services
From:       Dirk Mueller <mueller () kde ! org>
Date:       2007-07-30 22:09:14
Message-ID: 1185833354.306267.2478.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 694507 by mueller:

- fix job statistics in monitor


 M  +2 -5      comm.h  
 M  +4 -4      scheduler.cpp  


--- branches/work/icecream-make-it-cool/services/comm.h #694506:694507
@@ -541,11 +541,8 @@
   MonJobDoneMsg() : JobDoneMsg() {
     type = M_MON_JOB_DONE;
   }
-  MonJobDoneMsg (int job_id, int exitcode)
-    : JobDoneMsg(job_id, exitcode)
-  {
-    type = M_MON_JOB_DONE;
-  }
+  MonJobDoneMsg(const JobDoneMsg& o)
+    : JobDoneMsg(o) { type = M_MON_JOB_DONE; }
 };
 
 class MonLocalJobBeginMsg : public Msg {
--- branches/work/icecream-make-it-cool/services/scheduler.cpp #694506:694507
@@ -356,7 +356,7 @@
     {
       it_old = it++;
       /* If we can't send it, don't be clever, simply close this monitor.  */
-      if (!(*it_old)->send_msg (*m, MsgChannel::SendNonBlocking)) {
+      if (!(*it_old)->send_msg (*m, MsgChannel::SendNonBlocking /*| MsgChannel::SendBulkOnly*/)) {
         trace() << "monitor is blocking... removing" << endl;
         handle_end (*it_old, 0);
       }
@@ -1363,7 +1363,7 @@
       j->server->busy_installing = 0;
     }
   add_job_stats (j, m);
-  notify_monitors (new MonJobDoneMsg (m->job_id, m->exitcode));
+  notify_monitors (new MonJobDoneMsg (*m));
   jobs.erase (m->job_id);
   delete j;
 
@@ -1672,7 +1672,7 @@
 	    for (jit = l->l.begin(); jit != l->l.end(); ++jit)
 	      {
 		trace() << "STOP (DAEMON) FOR " << (*jit)->id << endl;
-                notify_monitors (new MonJobDoneMsg ( ( *jit )->id,  255 ));
+                notify_monitors (new MonJobDoneMsg ( JobDoneMsg (( *jit )->id,  255 )));
 		if ((*jit)->server)
 		  (*jit)->server->busy_installing = 0;
 		jobs.erase( (*jit)->id );
@@ -1691,7 +1691,7 @@
           if (job->server == toremove || job->submitter == toremove)
             {
               trace() << "STOP (DAEMON2) FOR " << mit->first << endl;
-              notify_monitors (new MonJobDoneMsg ( job->id,  255 ));
+              notify_monitors (new MonJobDoneMsg ( JobDoneMsg( job->id,  255 )));
 	      /* If this job is removed because the submitter is removed
 		 also remove the job from the servers joblist.  */
 	      if (job->server && job->server != toremove)
[prev in list] [next in list] [prev in thread] [next in thread]