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

Timestamp:

Jun 12, 2008, 12:52:06 PM (18 years ago)

Author:

eugene

Message:

use virtual stacks for host and job queries by user thread

File:

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

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

@@ -1 +1 @@
 # include "pcontrol.h"
 
-// Stack *JobPool_AllJobs;
+Stack *JobPool_AllJobs;  // virtual pool for user status queries
 
 Stack *JobPool_Pending;
@@ -12 +12 @@
 
 void InitJobStacks () {
-  // JobPool_AllJobs = InitStack ();
+  JobPool_AllJobs = InitStack ();
 
   JobPool_Pending = InitStack ();
@@ -32 +32 @@
 
 void FreeJobStacks () {
-
-  // AllJobs is a virtual stack : all jobs are references
-  // FreeStack (JobPool_AllJobs);
-
   FreeJobStack (JobPool_Pending);
   FreeJobStack (JobPool_Busy   );
@@ -43 +39 @@
   FreeJobStack (JobPool_Exit   );
   FreeJobStack (JobPool_Crash  );
+
+  // AllJobs is a virtual stack : all jobs are references
+  FreeStack (JobPool_AllJobs);
 }
 
 char *GetJobStackName (int StackID) {
   switch (StackID) {
-    // case PCONTROL_JOB_ALLJOBS: return ("ALLJOBS");
+    case PCONTROL_JOB_ALLJOBS: return ("ALLJOBS");
 
     case PCONTROL_JOB_PENDING: return ("PENDING");
@@ -64 +63 @@
 Stack *GetJobStack (int StackID) {
   switch (StackID) {
-    // case PCONTROL_JOB_ALLJOBS: return (JobPool_AllJobs);
+    case PCONTROL_JOB_ALLJOBS: return (JobPool_AllJobs);
 
     case PCONTROL_JOB_PENDING: return (JobPool_Pending);
@@ -81 +80 @@
 Stack *GetJobStackByName (char *name) {
 
-  // if (!strcasecmp (name, "all"))     return (JobPool_AllJobs);
+  if (!strcasecmp (name, "all"))     return (JobPool_AllJobs);
 
   if (!strcasecmp (name, "pending")) return (JobPool_Pending);
@@ -186 +185 @@
   job[0].argv     = argv;
   job[0].hostname = hostname;
+  job[0].realhost = NULL;
+
+  job[0].exit_status = 0;
+  job[0].Reset    = FALSE;
+  job[0].stdout_size = 0;
+  job[0].stderr_size = 0;
+
   job[0].mode     = mode;
-  job[0].host     = NULL;
-  job[0].JobID    = NextJobID();
-  job[0].Reset    = FALSE;
-  job[0].realhost = NULL;
+
+  job[0].state = 0;
+  job[0].stack = 0;
 
   /* do this step on start? */
@@ -196 +201 @@
   InitIOBuffer (&job[0].stderr_buff, 0x1000);
 
+  job[0].dtime = 0.0;
+  job[0].pid = 0;
+
+  job[0].JobID    = NextJobID();
+  job[0].host     = NULL;
+
   JobID = job[0].JobID;
 
+  // Put a copy of all created jobs on the ALLJOBS stack
+  // This is a virtual stack: do not free the job from this stack
+  PutJob (job, PCONTROL_JOB_ALLJOBS, STACK_BOTTOM);
   PutJob (job, PCONTROL_JOB_PENDING, STACK_BOTTOM);
-  // PutJob (job, PCONTROL_JOB_ALLJOBS, STACK_BOTTOM);
 
   if (VerboseMode()) gprint (GP_ERR, "added new job\n");
@@ -208 +221 @@
 
   int i;
+
+  Job *copy;
+
+  copy = PullStackByID (JobPool_AllJobs, job[0].JobID);
+  ASSERT (copy == job, "programming error: ALLJOBS entry does not match");
 
   FREE (job[0].hostname);