Changeset 13540

Timestamp:

May 30, 2007, 12:13:00 PM (19 years ago)

Author:

eugene

Message:

added flush jobs command

Location:

trunk/Ohana/src/opihi/pantasks

Files:

• CheckJobs.c (modified) (2 diffs)
• JobOps.c (modified) (1 diff)
• Makefile (modified) (1 diff)

trunk/Ohana/src/opihi/pantasks/CheckJobs.c

@@ -23 +23 @@
 
     task = job[0].task;
+    // XXX we need to guarantee that the task exists
+    // if we delete a task, we need to keep a copy until all task jobs are
+    // removed
 
     /* check poll period (ready to ask for status?) */
@@ -140 +143 @@
         UpdateTaskTimerStats (task, TIMER_ALLJOBS, job[0].dtime);
 
-        task[0].Npending --;
         DeleteJob (job);
         continue;

trunk/Ohana/src/opihi/pantasks/JobOps.c

@@ -215 +215 @@
     ActiveJob --;
   }
+
+  job[0].task[0].Npending --;
+  return (TRUE);
+}
+
+int FlushJobs () {
+
+  int i;
+
+  // kill outstanding jobs
+  for (i = 0; i < Njobs; i++) {
+    if (jobs[i][0].mode == JOB_LOCAL) {
+      if (!KillLocalJob (jobs[i])) {
+        jobs[i][0].state = JOB_HUNG;
+        if (VerboseMode()) gprint (GP_LOG, "child process %d is hung, cannot kill\n", jobs[i][0].pid);
+      }
+    } else {
+      if (!KillControllerJob (jobs[i])) {
+        jobs[i][0].state = JOB_HUNG;
+        if (VerboseMode()) gprint (GP_LOG, "child process %d is hung, cannot kill\n", jobs[i][0].pid);
+      }
+    }    
+    jobs[i][0].task[0].Npending = 0;
+    FreeJob (jobs[i]);
+  }
+    
+  Njobs = 0;
+  NJOBS = 20;
+  REALLOCATE (jobs, Job *, NJOBS);
+  ActiveJob = -1;
   return (TRUE);
 }

trunk/Ohana/src/opihi/pantasks/Makefile

@@ -65 +65 @@
 $(SRC)/pulse.$(ARCH).o \
 $(SRC)/status.$(ARCH).o \
+$(SRC)/flush.$(ARCH).o \
 $(SRC)/showtask.$(ARCH).o \
 $(SRC)/kill.$(ARCH).o \