Changeset 8129 for trunk/Ohana/src/opihi/pantasks/CheckJobs.c

Timestamp:

Aug 4, 2006, 2:19:21 AM (20 years ago)

Author:

eugene

Message:

adding task options

File:

• trunk/Ohana/src/opihi/pantasks/CheckJobs.c (modified) (3 diffs)

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

@@ -26 +26 @@
 
       case JOB_CRASH:
-        /* run task[0].crash macro, if it exists */
+      case JOB_EXIT:
         /* push output buffer data to the stdout and stderr queues */
-        if (VerboseMode()) gprint (GP_LOG, "job %s (%d) crash\n", job[0].task[0].name, job[0].JobID);
+        /* XXX this will break on 0 values in output streams */
         PushNamedQueue ("stdout", job[0].stdout.buffer);
         PushNamedQueue ("stderr", job[0].stderr.buffer);
+
         /* set taskarg variables */
         for (i = 0; i < job[0].argc; i++) {
@@ -38 +39 @@
         set_int_variable ("taskarg:n", job[0].argc);
 
-        /* XXX this will break on 0 values in output streams */
-        /* perhaps define PushNamedQueueBuffer */
-        if (job[0].task[0].crash != NULL) {
-          exec_loop (job[0].task[0].crash);
+        /* set options variables */
+        for (i = 0; i < job[0].optc; i++) {
+            sprintf (varname, "options:%d", i);
+            set_str_variable (varname, job[0].optv[i]);
         }
-        DeleteJob (job);
-        continue;
-        break;
+        set_int_variable ("options:n", job[0].optc);
 
-      case JOB_EXIT:
-        if (VerboseMode()) gprint (GP_LOG, "job %s (%d) exit\n", job[0].task[0].name, job[0].JobID);
-        PushNamedQueue ("stdout", job[0].stdout.buffer);
-        PushNamedQueue ("stderr", job[0].stderr.buffer);
-        /* set taskarg variables */
-        for (i = 0; i < job[0].argc; i++) {
-            sprintf (varname, "taskarg:%d", i);
-            set_str_variable (varname, job[0].argv[i]);
+        if (status == JOB_CRASH) {
+          /* XXX add an Ncrash element? */
+          job[0].task[0].Nfailure ++;
+
+          /* run task[0].crash macro, if it exists */
+          /* perhaps define PushNamedQueueBuffer */
+
+          if (VerboseMode()) gprint (GP_LOG, "job %s (%d) crash\n", job[0].task[0].name, job[0].JobID);
+          if (job[0].task[0].crash != NULL) {
+            exec_loop (job[0].task[0].crash);
+          }
         }
-        set_int_variable ("taskarg:n", job[0].argc);
+        if (status == JOB_EXIT) {
+          /* update the exit status counters */
+          if (job[0].exit_status) {
+            job[0].task[0].Nfailure ++;
+          } else {
+            job[0].task[0].Nsuccess ++;
+          }
 
-        /* update the exit status counters */
-        if (job[0].exit_status) {
-            job[0].task[0].Nfailure ++;
-        } else {
-            job[0].task[0].Nsuccess ++;
+          /* run corresponding task[0].exit macro, if it exists */
+          if (VerboseMode()) gprint (GP_LOG, "job %s (%d) exit\n", job[0].task[0].name, job[0].JobID);
+          macro = job[0].task[0].defexit;
+          for (i = 0; i < job[0].task[0].Nexit; i++) {
+            if (job[0].exit_status == atoi(job[0].task[0].exit[i][0].name)) {
+              macro = job[0].task[0].exit[i];
+              break;
+            }
+          }
+          if (macro != NULL) exec_loop (macro);
         }
 
-        /* run corresponding task[0].exit macro, if it exists */
-        macro = job[0].task[0].defexit;
-        for (i = 0; i < job[0].task[0].Nexit; i++) {
-          if (job[0].exit_status == atoi(job[0].task[0].exit[i][0].name)) {
-            macro = job[0].task[0].exit[i];
-            break;
-          }
-        }
-        if (macro != NULL) exec_loop (macro);
         DeleteJob (job);
         continue;
@@ -107 +111 @@
       set_int_variable ("taskarg:n", job[0].argc);
 
+      /* set options variables */
+      for (i = 0; i < job[0].optc; i++) {
+        sprintf (varname, "options:%d", i);
+        set_str_variable (varname, job[0].optv[i]);
+      }
+      set_int_variable ("options:n", job[0].optc);
 
       /* run task[0].timeout macro, if it exists */