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

Timestamp:

Jul 23, 2005, 9:13:00 PM (21 years ago)

Author:

eugene

Message:

added valid time ranges and elements of Njobs, status

Location:

trunk/Ohana/src/opihi/pantasks

Files:

• CheckJobs.c (modified) (5 diffs)
• CheckTasks.c (modified) (2 diffs)
• CheckTimeRanges.c (added)
• ControllerOps.c (modified) (1 diff)
• LocalJob.c (modified) (1 diff)
• Makefile (modified) (3 diffs)
• TaskOps.c (modified) (2 diffs)
• init.c (modified) (4 diffs)
• status.c (modified) (1 diff)
• task.c (modified) (3 diffs)
• task_trange.c (added)
• verbose.c (added)

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

@@ -14 +14 @@
     /* check for timeout - only local jobs timeout here */
     if ((job[0].mode == JOB_LOCAL) && (GetTaskTimer(job[0].start) >= job[0].task[0].timeout_period)) {
-      fprintf (stderr, "timeout on %s\n", job[0].task[0].name);
+      if (VerboseMode()) fprintf (stderr, "timeout on %s\n", job[0].task[0].name);
       /* run task[0].timeout macro, if it exists */
       if (job[0].task[0].timeout != NULL) {
@@ -30 +30 @@
     switch (status) {
       case JOB_PENDING:
-        fprintf (stderr, "job %s (%d) pending\n", job[0].task[0].name, job[0].JobID);
+        if (VerboseMode()) fprintf (stderr, "job %s (%d) pending\n", job[0].task[0].name, job[0].JobID);
         break;
 
       case JOB_BUSY:
-        fprintf (stderr, "job %s (%d) busy\n", job[0].task[0].name, job[0].JobID);
+        if (VerboseMode()) fprintf (stderr, "job %s (%d) busy\n", job[0].task[0].name, job[0].JobID);
         break;
 
@@ -41 +41 @@
         /* 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);
+        if (VerboseMode()) 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);
@@ -52 +52 @@
 
       case JOB_EXIT:
-        fprintf (stderr, "job %s (%d) exit\n", job[0].task[0].name, job[0].JobID);
+        if (VerboseMode()) 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);
@@ -69 +69 @@
 
       default:
-        fprintf (stderr, "unknown exit status: %d\n", status);
+        if (VerboseMode()) fprintf (stderr, "unknown exit status: %d\n", status);
         /** do something more useful here ?? **/
         break;

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

@@ -15 +15 @@
     if (GetTaskTimer(task[0].last) < task[0].exec_period) continue;
 
+    /* need to check if the current time is within valid/invalid periods */
+    if (!CheckTimeRanges (task[0].ranges, task[0].Nranges)) continue;
+
     SetCurrentTask (task[0].name);
-    fprintf (stderr, "trying task %s\n", task[0].name);
 
     /* ready to run? : run task.exec macro */
@@ -35 +37 @@
     /* reset timer on task (don't do this if Create/Submit fails)*/
     gettimeofday (&task[0].last, (void *) NULL);
+    task[0].Njobs ++;
   }
   return (TRUE);

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

@@ -339 +339 @@
   int Nread;
 
+  if (!status) return (TRUE);
+
   /* read stdout buffer */
   Nread = ReadtoIOBuffer (&stdout_buffer, stdout_cntl);

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

@@ -15 +15 @@
   pid = fork ();
   if (!pid) { /* must be child process */
-    fprintf (stderr, "starting local job\n");
+    if (VerboseMode()) fprintf (stderr, "starting local job\n");
 
     /* close the other ends of the pipes */

trunk/Ohana/src/opihi/pantasks/Makefile

@@ -31 +31 @@
 $(SDIR)/CheckSystem.$(ARCH).o \
 $(SDIR)/CheckTasks.$(ARCH).o \
+$(SDIR)/CheckTimeRanges.$(ARCH).o \
 $(SDIR)/ControllerOps.$(ARCH).o \
 $(SDIR)/LocalJob.$(ARCH).o \
@@ -44 +45 @@
 $(SDIR)/kill.$(ARCH).o \
 $(SDIR)/delete.$(ARCH).o \
+$(SDIR)/verbose.$(ARCH).o \
 $(SDIR)/controller.$(ARCH).o \
 $(SDIR)/controller_host.$(ARCH).o \
@@ -53 +55 @@
 $(SDIR)/task_host.$(ARCH).o \
 $(SDIR)/task_macros.$(ARCH).o \
+$(SDIR)/task_trange.$(ARCH).o \
 $(SDIR)/task_periods.$(ARCH).o
 

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

@@ -37 +37 @@
 void ListTasks () {
 
-  int i;
+  int i, valid;
 
   for (i = 0; i < Ntasks; i++) {
-    fprintf (stderr, "%-15s %20s\n", tasks[i].name, tasks[i].argv[0]);
+    valid = CheckTimeRanges (tasks[i].ranges, tasks[i].Nranges);
+    if (valid) {
+      fprintf (stderr, "+ ");
+    } else {
+      fprintf (stderr, "- ");
+    }
+    fprintf (stderr, "%-15s %4d %20s\n", tasks[i].name, tasks[i].Njobs, tasks[i].argv[0]);
   }
   return;
@@ -126 +132 @@
   tasks[Ntasks].timeout_period = 1.0;
 
+  tasks[Ntasks].Nranges = 0;
+  ALLOCATE (tasks[Ntasks].ranges, TimeRange, 1);
+
   /* init task timer (is reset by 'run') */  
   gettimeofday (&tasks[Ntasks].last, (void *) NULL);
+  tasks[Ntasks].Njobs = 0;
 
   Ntasks ++;

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

@@ -4 +4 @@
 int task            PROTO((int, char **));
 int task_host       PROTO((int, char **));
+int task_trange     PROTO((int, char **));
 int task_macros     PROTO((int, char **));
 int task_command    PROTO((int, char **));
@@ -12 +13 @@
 int kill_job        PROTO((int, char **));
 int delete_job      PROTO((int, char **));
+int verbose         PROTO((int, char **));
 
 static Command cmds[] = {  
@@ -17 +19 @@
   {"task",       task,         "define a schedulable task"},
   {"host",       task_host,    "define host machine for a task"},
+  {"trange",     task_trange,  "define valid/invalid time periods for a task"},
   {"task.exit",  task_macros,  "define exit macros for a task"},
   {"task.exec",  task_macros,  "define pre-exec macro for a task"},
@@ -26 +29 @@
   {"kill",       kill_job,     "kill job"},
   {"delete",     delete_job,   "delete job"},
+  {"verbose",    verbose,      "set/toggle verbose mode"},
 }; 
 

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

@@ -3 +3 @@
 int status_sys (int argc, char **argv) {
 
+  if (rl_event_hook == NULL) {
+    fprintf (stderr, "scheduler is stopped\n");
+  } else {
+    fprintf (stderr, "scheduler is running\n");
+  }
   ListTasks ();
   ListJobs ();

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

@@ -2 +2 @@
 # define prompt "> "
 
-enum {TASK_NONE, TASK_EMPTY, TASK_COMMENT, TASK_END, TASK_HOST, TASK_COMMAND, TASK_PERIODS, TASK_EXIT, TASK_EXEC};
+enum {TASK_NONE, TASK_EMPTY, TASK_COMMENT, TASK_NMAX, TASK_TRANGE, TASK_END, TASK_HOST, TASK_COMMAND, TASK_PERIODS, TASK_EXIT, TASK_EXEC};
 
 int task (int argc, char **argv) {
@@ -68 +68 @@
 
       case TASK_END:
+        /* I need to add in a test here to see if all task elements 
+           have been defined.  delete the task if not */
         free (input);
         return (TRUE);
         break;
 
+      case TASK_TRANGE:
+      case TASK_NMAX:
       case TASK_HOST:
       case TASK_EXIT:
@@ -104 +108 @@
   if (!strcasecmp (command, "END"))       hash = TASK_END;
   if (!strcasecmp (command, "HOST"))      hash = TASK_HOST;
+  if (!strcasecmp (command, "NMAX"))      hash = TASK_NMAX;
+  if (!strcasecmp (command, "TRANGE"))    hash = TASK_TRANGE;
   if (!strcasecmp (command, "COMMAND"))   hash = TASK_COMMAND;
   if (!strcasecmp (command, "PERIODS"))   hash = TASK_PERIODS;