Changeset 23530 for trunk/Ohana/src/opihi/pantasks/JobOps.c

Timestamp:

Mar 25, 2009, 11:56:09 AM (17 years ago)

Author:

eugene

Message:

upgrade threading/locking model for pantasks: changes merged from eam_branch_20090322

File:

• trunk/Ohana/src/opihi/pantasks/JobOps.c (modified) (4 diffs)

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

@@ -88 +88 @@
   }
 
-  /* check if controller is running */
-  status = CheckControllerStatus ();
-  if (!status) {
-    return;
-  }
-
-  sprintf (command, "jobstack busy");
-  InitIOBuffer (&buffer, 0x100);
-
-  SerialThreadLock ();
-  status = ControllerCommand (command, CONTROLLER_PROMPT, &buffer);
-  SerialThreadUnlock ();
-
-  if (status) {
-    gprint (GP_LOG, " jobs currently running remotely:\n");
-    gwrite (buffer.buffer, 1, buffer.Nbuffer, GP_LOG);
-  } else {
-    gprint (GP_LOG, "controller is not responding\n");
-  }
-  FreeIOBuffer (&buffer);
   return;
 }
@@ -169 +149 @@
     REALLOCATE (jobs, Job *, NJOBS);
   }
+
+  /* increment job counters */
+  task[0].Npending ++;
+
   return (jobs[Njobs-1]);
 }
@@ -265 +249 @@
 int SubmitJob (Job *job) {
 
+  int status;
+
   if (job[0].mode == JOB_LOCAL) {
     if (DEBUG) fprintf (stderr, "submit job: (%zx) %d of %d\n", (size_t) job[0].stdout_buff.buffer, job[0].stdout_buff.Nbuffer, job[0].stdout_buff.Nalloc); 
-    SubmitLocalJob (job);
+    status = SubmitLocalJob (job);
   } else {
-    SubmitControllerJob (job);
+    status = SubmitControllerJob (job);
+  }
+  if (!status) {
+    return FALSE;
   }
 
@@ -285 +274 @@
   if (job[0].mode == JOB_LOCAL) {
     CheckLocalJob (job);
-  } else {
-    /* controller jobs are now checked en masse by CheckController */
-    /* CheckControllerJob (job); */
+    /* controller jobs are checked en masse by CheckController */
   }
   return (job[0].state);