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

List:       kde-commits
Subject:    kdenonbeta/icecream/icecream/services [POSSIBLY UNSAFE]
From:       Michael Matz <matz () kde ! org>
Date:       2004-08-22 12:09:41
Message-ID: 20040822120941.10BDD2737 () office ! kde ! org
[Download RAW message or body]

CVS commit by matz: 

More debug possibilities.


  M +27 -3     scheduler.cpp   1.146 [POSSIBLY UNSAFE: printf]


--- kdenonbeta/icecream/icecream/services/scheduler.cpp  #1.145:1.146
@@ -165,4 +165,5 @@ public:
   time_t start_on_scheduler;  // starttime local to scheduler
   string target_platform;
+  string filename;
   list<Job*> master_job_for;
   unsigned int arg_flags;
@@ -459,4 +460,5 @@ handle_cs_request (MsgChannel *c, Msg *_
       job->arg_flags = m->arg_flags;
       job->language = ( m->lang == CompileJob::Lang_C ? "C" : "C++" );
+      job->filename = m->filename;
       enqueue_job_request (job);
       log_info() << "NEW: " << job->id << " versions=[";
@@ -1040,4 +1042,6 @@ handle_line (MsgChannel *c, Msg *_m)
   if (!m)
     return false;
+  char buffer[1000];
+  string line;
   if (m->text == "listcs")
     {
@@ -1045,13 +1049,32 @@ handle_line (MsgChannel *c, Msg *_m)
         {
           CS* cs= *it;
-          string line;
-          char buffer[1000];
           line = " " + cs->nodename + "(" + cs->name + ")";
           line += "[" + cs->host_platform + "] speed= ";
-          sprintf (buffer, "%.2f max=%d", server_speed (cs), cs->max_jobs);
+          sprintf (buffer, "%.2f jobs=%d/%d", server_speed (cs),
+                   cs->joblist.size(), cs->max_jobs);
           line = line + buffer;
           c->send_msg (TextMsg (line));
         }
     }
+  else if (m->text == "listjobs")
+    {
+      for (map<unsigned int, Job*>::const_iterator it = jobs.begin();
+           it != jobs.end(); ++it)
+        {
+          int id = it->first;
+          Job *job = it->second;
+          sprintf (buffer, "%d %s sub:%s on:%s ",
+                   id,
+                   job->submitter ? job->submitter->nodename.c_str() : "<>",
+                   job->server ? job->server->nodename.c_str() : "<unknown>",
+                   job->state == Job::PENDING ? "PEND"
+                     : job->state == Job::WAITINGFORCS ? "WAIT"
+                     : job->state == Job::COMPILING ? "COMP"
+                     : "Huh?");
+          line = buffer;
+          line = line + job->filename;
+          c->send_msg (TextMsg (line));
+        }
+    }
   else if (m->text == "quit")
     {
@@ -1066,4 +1089,5 @@ handle_line (MsgChannel *c, Msg *_m)
       c->send_msg (TextMsg (txt));
     }
+  c->send_msg (TextMsg (string ("done")));
   return true;
 }


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