Changeset 6249 for trunk/Ohana/src/opihi/pantasks

Timestamp:

Jan 29, 2006, 9:36:21 AM (20 years ago)

Author:

eugene

Message:

adding to queue options, psched handling

Location:

trunk/Ohana/src/opihi/pantasks

Files:

• CheckJobs.c (modified) (5 diffs)
• TaskOps.c (modified) (1 diff)
• task_periods.c (modified) (1 diff)

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

@@ -6 +6 @@
   Macro *macro;
   int i, status;
+  char varname[64];
 
   /** test all jobs: ready to test?  finished? **/
@@ -30 +31 @@
         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]);
+        }
+        set_int_variable ("taskarg:n", job[0].argc);
+
         /* XXX this will break on 0 values in output streams */
         /* perhaps define PushNamedQueueBuffer */
@@ -43 +51 @@
         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]);
+        }
+        set_int_variable ("taskarg:n", job[0].argc);
+
+        /* 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 */
         macro = job[0].task[0].defexit;
@@ -68 +90 @@
       if (GetTaskTimer(job[0].start) < job[0].task[0].timeout_period) continue;
       if (VerboseMode()) fprintf (stderr, "timeout on %s\n", job[0].task[0].name);
+
+      /* update the timeout counter */
+      job[0].task[0].Ntimeout ++;
+
       if (!KillLocalJob (job)) {
         job[0].state = JOB_HUNG;
@@ -73 +99 @@
         continue;
       }
+
+      /* set taskarg variables */
+      for (i = 0; i < job[0].argc; i++) {
+          sprintf (varname, "taskarg:%d", i);
+          set_str_variable (varname, job[0].argv[i]);
+      }
+      set_int_variable ("taskarg:n", job[0].argc);
+
+
       /* run task[0].timeout macro, if it exists */
       if (job[0].task[0].timeout != NULL) {

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

@@ -229 +229 @@
   /* init task timer (is reset by 'run') */  
   gettimeofday (&NewTask[0].last, (void *) NULL);
+  NewTask[0].Nmax = 0;  /* default value means 'no limit' */
+
   NewTask[0].Njobs = 0;
-  NewTask[0].Nmax = 0;  /* default value means 'no limit' */
-
+  NewTask[0].Nsuccess = 0;
+  NewTask[0].Nfailure = 0;
+  NewTask[0].Ntimeout = 0;
   return (NewTask);
 }

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

@@ -42 +42 @@
   task = GetNewTask ();
   if (task == NULL) {
-    fprintf (stderr, "ERROR: not defining or running a task\n");
-    return (FALSE);
+    task = GetActiveTask ();
+    if (task == NULL) {
+      fprintf (stderr, "ERROR: not defining or running a task\n");
+      return (FALSE);
+    }
   }