Changeset 8192 for trunk/Ohana/src/opihi/pantasks/TaskOps.c

Timestamp:

Aug 5, 2006, 1:39:43 PM (20 years ago)

Author:

eugene

Message:

fixed up the trange concepts, fixed bugs in queuedrop/queuepop

File:

• trunk/Ohana/src/opihi/pantasks/TaskOps.c (modified) (4 diffs)

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

@@ -52 +52 @@
 void ListTasks (int verbose) {
 
-  int i, valid;
+  int i, j, valid;
+  char *start, *stop;
 
   gprint (GP_LOG, "\n");
@@ -78 +79 @@
       gprint (GP_LOG, "    spawn period: %f, polling period: %f, timeout period: %f\n", 
                tasks[i][0].exec_period, tasks[i][0].poll_period, tasks[i][0].timeout_period);
+      for (j = 0; j < tasks[i][0].Nranges; j++) {
+        switch (tasks[i][0].ranges[j].type) {
+          case RANGE_ABS:
+            start = sec_to_date (tasks[i][0].ranges[j].start);
+            stop  = sec_to_date (tasks[i][0].ranges[j].stop);
+            break;
+          case RANGE_DAY:
+            start = sec_to_hms (tasks[i][0].ranges[j].start);
+            stop  = sec_to_hms (tasks[i][0].ranges[j].stop);
+            break;
+          case RANGE_WEEK:
+            start = sec_to_day (tasks[i][0].ranges[j].start);
+            stop  = sec_to_day (tasks[i][0].ranges[j].stop);
+            break;
+          default:
+            abort ();
+        }
+        if (tasks[i][0].ranges[j].include) {
+          gprint (GP_LOG, "     active : %s - %s", start, stop);
+          if (tasks[i][0].ranges[j].Nmax) gprint (GP_LOG, " (%d of %d)", tasks[i][0].ranges[j].Nrun, tasks[i][0].ranges[j].Nmax);
+          gprint (GP_LOG, "\n");
+        } else {
+          gprint (GP_LOG, "     avoid  : %s - %s\n", start, stop);
+        }
+        free (start);
+        free (stop);
+      }
       if (tasks[i][0].host == NULL) {
         gprint (GP_LOG, "    task runs locally\n");
@@ -99 +127 @@
 int ShowTask (char *name) {
 
-  int i;
+  int i, j;
+  char *start, *stop
   Task *task;
 
@@ -138 +167 @@
 periods:
   gprint (GP_LOG, " time periods: exec: %f  poll: %f  timeout: %f\n", 
-           task[0].exec_period, task[0].poll_period, task[0].timeout_period);
+          task[0].exec_period, task[0].poll_period, task[0].timeout_period);
+
+  for (j = 0; j < tasks[i][0].Nranges; j++) {
+    switch (tasks[i][0].ranges[j].type) {
+      case RANGE_ABS:
+        start = sec_to_date (tasks[i][0].ranges[j].start);
+        stop  = sec_to_date (tasks[i][0].ranges[j].stop);
+        break;
+      case RANGE_DAY:
+        start = sec_to_hms (tasks[i][0].ranges[j].start);
+        stop  = sec_to_hms (tasks[i][0].ranges[j].stop);
+        break;
+      case RANGE_WEEK:
+        start = sec_to_day (tasks[i][0].ranges[j].start);
+        stop  = sec_to_day (tasks[i][0].ranges[j].stop);
+        break;
+      default:
+        abort ();
+    }
+    if (tasks[i][0].ranges[j].include) {
+      gprint (GP_LOG, "     active : %s - %s", start, stop);
+      if (tasks[i][0].ranges[j].Nmax) gprint (GP_LOG, " (%d of %d)", tasks[i][0].ranges[j].Nrun, tasks[i][0].ranges[j].Nmax);
+      gprint (GP_LOG, "\n");
+    } else {
+      gprint (GP_LOG, "     avoid  : %s - %s\n", start, stop);
+    }
+    free (start);
+    free (stop);
+  }
 
   gprint (GP_LOG, "\n pre-execute macro\n");