Changeset 11317

Timestamp:

Jan 26, 2007, 10:10:40 AM (19 years ago)

Author:

eugene

Message:

fixed npending, active

Location:

trunk/Ohana/src/opihi/pantasks

Files:

• CheckTasks.c (modified) (1 diff)
• init.c (modified) (2 diffs)

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

@@ -16 +16 @@
 
     /* need to check if the current time is within valid/invalid periods */
-    if (!CheckTimeRanges (task[0].ranges, task[0].Nranges)) continue;
-    if (task[0].Nmax && (task[0].Njobs >= task[0].Nmax)) continue;
-    if (task[0].NpendingMax && (task[0].Npending >= task[0].NpendingMax)) continue;
+    if (!CheckTimeRanges (task[0].ranges, task[0].Nranges)) {
+        gettimeofday (&task[0].last, (void *) NULL);
+        continue;
+    }
+    if (task[0].Nmax && (task[0].Njobs >= task[0].Nmax)) {
+        gettimeofday (&task[0].last, (void *) NULL);
+        continue;
+    }
+    if (task[0].NpendingMax && (task[0].Npending >= task[0].NpendingMax)) {
+        gettimeofday (&task[0].last, (void *) NULL);
+        continue;
+    }
+
+    /* check if there are errors with this task */
+    if (!ValidateTask (task, TRUE)) { 
+        gettimeofday (&task[0].last, (void *) NULL);
+        continue;
+    }
 
     /* ready to run? : run task.exec macro */
     if (task[0].exec != NULL) {
       status = exec_loop (task[0].exec);
-      if (!status) continue;
+      if (!status) {
+          gettimeofday (&task[0].last, (void *) NULL);
+          continue;
+      }
     }
-    if (!ValidateTask (task, TRUE)) continue;
 
     /* construct job from task */

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

@@ -5 +5 @@
 int task_host       PROTO((int, char **));
 int task_nmax       PROTO((int, char **));
+int task_npending   PROTO((int, char **));
 int task_active     PROTO((int, char **));
 int task_trange     PROTO((int, char **));
@@ -25 +26 @@
 
 static Command cmds[] = {  
-  {"controller", controller,   "controller commands"},
-  {"task",       task,         "define a schedulable task"},
-  {"host",       task_host,    "define host machine for a task"},
-  {"nmax",       task_nmax,    "define maximum number of jobs for a task"},
-  {"active",     task_active,  "define maximum number of jobs 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"},
-  {"command",    task_command, "define executed command for a task"},
-  {"options",    task_options, "define optional variables associated with the job task"},
-  {"periods",    task_periods, "define time scales for a task"},
-  {"stdout",     task_stdout,  "define a file for the job stdout dump"},
-  {"stderr",     task_stderr,  "define a file for the job stderr dump"},
-  {"run",        run,          "run the scheduler"},
-  {"stop",       stop,         "stop the scheduler (continue job harvesting)"},
-  {"halt",       halt,         "halt the scheduler (no job harvesting)"},
-  {"pulse",      pulse,        "set the scheduler update period"},
-  {"status",     status_sys,   "get system status"},
-  {"kill",       kill_job,     "kill job"},
-  {"delete",     delete_job,   "delete job"},
-  {"version",    version,      "show version information"},
-  {"verbose",    verbose,      "set/toggle verbose mode"},
+  {"controller", controller,    "controller commands"},
+  {"task",       task,          "define a schedulable task"},
+  {"host",       task_host,     "define host machine for a task"},
+  {"nmax",       task_nmax,     "define maximum number of jobs for a task"},
+  {"npending",   task_npending, "define maximum number of outstanding jobs for a task"},
+  {"active",     task_active,   "set the active state of 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"},
+  {"command",    task_command,  "define executed command for a task"},
+  {"options",    task_options,  "define optional variables associated with the job task"},
+  {"periods",    task_periods,  "define time scales for a task"},
+  {"stdout",     task_stdout,   "define a file for the job stdout dump"},
+  {"stderr",     task_stderr,   "define a file for the job stderr dump"},
+  {"run",        run,           "run the scheduler"},
+  {"stop",       stop,          "stop the scheduler (continue job harvesting)"},
+  {"halt",       halt,          "halt the scheduler (no job harvesting)"},
+  {"pulse",      pulse,         "set the scheduler update period"},
+  {"status",     status_sys,    "get system status"},
+  {"kill",       kill_job,      "kill job"},
+  {"delete",     delete_job,    "delete job"},
+  {"version",    version,       "show version information"},
+  {"verbose",    verbose,       "set/toggle verbose mode"},
   {"ipptool2book", ipptool2book, "convert queue with ipptool output to book"},
 };