Changeset 8424 for trunk/Ohana/src/opihi/pcontrol/JobOps.c

Timestamp:

Aug 18, 2006, 1:44:51 PM (20 years ago)

Author:

eugene

Message:

successful implementation of the threaded version of pcontrol

File:

• trunk/Ohana/src/opihi/pcontrol/JobOps.c (modified) (3 diffs)

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

@@ -17 +17 @@
 }
 
+char *GetJobStackName (int StackID) {
+  switch (StackID) {
+    case PCONTROL_JOB_PENDING: return ("PENDING");
+    case PCONTROL_JOB_BUSY:    return ("BUSY");
+    case PCONTROL_JOB_DONE:    return ("DONE");
+    case PCONTROL_JOB_KILL:    return ("KILL");
+    case PCONTROL_JOB_EXIT:    return ("EXIT");
+    case PCONTROL_JOB_CRASH:   return ("CRASH");
+  }
+  gprint (GP_ERR, "error: unknown host stack : programming error\n");
+  exit (1);
+}
+
 Stack *GetJobStack (int StackID) {
   switch (StackID) {
-    case PCONTROL_JOB_PENDING:
-      return (JobPool_Pending);
-    case PCONTROL_JOB_BUSY:
-      return (JobPool_Busy);
-    case PCONTROL_JOB_DONE:
-      return (JobPool_Done);
-    case PCONTROL_JOB_KILL:
-      return (JobPool_Kill);
-    case PCONTROL_JOB_EXIT:
-      return (JobPool_Exit);
-    case PCONTROL_JOB_CRASH:
-      return (JobPool_Crash);
-    default:
-      gprint (GP_ERR, "error: unknown job stack : programming error\n");
-      exit (1);
+    case PCONTROL_JOB_PENDING: return (JobPool_Pending);
+    case PCONTROL_JOB_BUSY:    return (JobPool_Busy);
+    case PCONTROL_JOB_DONE:    return (JobPool_Done);
+    case PCONTROL_JOB_KILL:    return (JobPool_Kill);
+    case PCONTROL_JOB_EXIT:    return (JobPool_Exit);
+    case PCONTROL_JOB_CRASH:   return (JobPool_Crash);
   }
   gprint (GP_ERR, "error: unknown job stack : programming error\n");
@@ -191 +195 @@
   JobID = job[0].JobID;
   PutJob (job, PCONTROL_JOB_PENDING, STACK_BOTTOM);
-  gprint (GP_ERR, "added new job\n");
+  if (VerboseMode()) gprint (GP_ERR, "added new job\n");
   return (JobID);
 }
@@ -210 +214 @@
   FREE (job);
 }
-
-/* unlink job and host, pull host from its stack */
-Host *UnlinkJobAndHost (Job *job) {
-
-  Host *host;
-
-  host = (Host *) job[0].host;
-  if (host == NULL) {
-    gprint (GP_ERR, "programming error: job has no host\n");
-    exit (2);
-  }
-
-  /* unlink host & job */
-  job[0].host = NULL;
-  host[0].job = NULL;
-  
-  /* remove host from correct stack */
-  XXXX does this step asuume the host is in this stack??
-  if (PullHostFromStackByID (host[0].stack, host[0].HostID) == NULL) {
-    gprint (GP_ERR, "programming error: host is not found in current stack\n");
-    exit (2);
-  }
-  return (host);
-}