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

Timestamp:

Jul 4, 2005, 6:29:10 PM (21 years ago)

Author:

eugene

Message:

fixed up some bugs

Location:

trunk/Ohana/src/opihi/pantasks

Files:

• CheckJobs.c (modified) (2 diffs)
• ControllerOps.c (modified) (2 diffs)
• LocalJob.c (modified) (2 diffs)
• task.c (modified) (1 diff)
• task_command.c (modified) (1 diff)
• task_host.c (modified) (1 diff)
• task_macros.c (modified) (1 diff)
• task_periods.c (modified) (1 diff)

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

@@ -34 +34 @@
 
       case JOB_CRASH:
-        fprintf (stderr, "job %s (%d) crash\n", job[0].task[0].name, job[0].JobID);
         /* run task[0].crash macro, if it exists */
         /* set the stdout and stderr variables with job.stdout, job.stderr */
         /* XXX this will break on 0 values in output streams */
+        fprintf (stderr, "job %s (%d) crash\n", job[0].task[0].name, job[0].JobID);
         set_str_variable ("stdout", job[0].stdout.buffer);
         set_str_variable ("stderr", job[0].stderr.buffer);
@@ -49 +49 @@
       case JOB_EXIT:
         fprintf (stderr, "job %s (%d) exit\n", job[0].task[0].name, job[0].JobID);
+        set_str_variable ("stdout", job[0].stdout.buffer);
+        set_str_variable ("stderr", job[0].stderr.buffer);
         /* run corresponding task[0].exit macro, if it exists */
         macro = job[0].task[0].def;

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

@@ -64 +64 @@
   char *p;
   IOBuffer buffer;
-  
 
   sprintf (cmd, "check job %d", job[0].pid);
@@ -179 +178 @@
   job[0].pid = atoi (string);
   FreeIOBuffer (&buffer);
+
+  InitIOBuffer (&job[0].stdout, 0x100);
+  InitIOBuffer (&job[0].stderr, 0x100);
   return (TRUE);
 }

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

@@ -15 +15 @@
   pid = fork ();
   if (!pid) { /* must be child process */
-    fprintf (stderr, "starting controller connection\n");
+    fprintf (stderr, "starting local job\n");
 
     /* close the other ends of the pipes */
@@ -45 +45 @@
   job[0].pid = pid;
 
+  InitIOBuffer (&job[0].stdout, 0x100);
+  InitIOBuffer (&job[0].stderr, 0x100);
   return (TRUE);
 

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

@@ -1 @@
-# include "basic.h"
 # include "scheduler.h"
 # define prompt "> "

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

@@ -1 @@
-# include "basic.h"
 # include "scheduler.h"
 

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

@@ -1 @@
-# include "basic.h"
 # include "scheduler.h"
 

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

@@ -1 @@
-# include "basic.h"
 # include "scheduler.h"
 # define D_NLINES 100

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

@@ -1 @@
-# include "basic.h"
 # include "scheduler.h"