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

Timestamp:

Aug 2, 2005, 9:40:50 AM (21 years ago)

Author:

eugene

Message:

psched bugfixes, moved IOBuffers and queues

File:

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

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

@@ -68 +68 @@
       fprintf (stderr, "- ");
     }
-    fprintf (stderr, "%-15s %4d   %-20s\n", tasks[i][0].name, tasks[i][0].Njobs, tasks[i][0].argv[0]);
+    if (tasks[i][0].argv == NULL) {
+      fprintf (stderr, "%-15s %4d   %-20s\n", tasks[i][0].name, tasks[i][0].Njobs, "dynamic");
+    } else {
+      fprintf (stderr, "%-15s %4d   %-20s\n", tasks[i][0].name, tasks[i][0].Njobs, tasks[i][0].argv[0]);
+    }
     if (verbose) {
       fprintf (stderr, "    spawn period: %f, polling period: %f, timeout period: %f\n", 
@@ -209 +213 @@
 }
 
-int ValidateTask (Task *task) {
-
-  if (task[0].argc == 0) {
+int ValidateTask (Task *task, int RequireStatic) {
+
+  int i, hash;
+
+  /* is a static command defined? */
+  if (task[0].argc != 0) {
+    if (task[0].argv == NULL) {
+      fprintf (stderr, "task command arguments not defined (programming error)\n");
+      return (FALSE);
+    }
+    return (TRUE);
+  }
+  if (RequireStatic) {
     fprintf (stderr, "task command not defined\n");
     return (FALSE);
   }
-  if (task[0].argv == NULL) {
-    fprintf (stderr, "task command arguments not defined (programming error)\n");
-    return (FALSE);
-  }
-  return (TRUE);
+
+  /* no static command; dynamic command? */
+  if (task[0].exec != NULL) {
+    for (i = 0; i < task[0].exec[0].Nlines; i++) {
+      hash = TaskHash (task[0].exec[0].line[i]);
+      if (hash == TASK_COMMAND) return (TRUE);
+    }
+  }
+  fprintf (stderr, "task command not defined\n");
+  return (FALSE);
 }
 
@@ -250 +269 @@
 }
 
+Task *GetActiveTask () {
+  Task *task;
+  if (ActiveTask < 0) return (NULL);
+  task = tasks[ActiveTask];
+  return (task);
+}
+
+int TaskHash (char *input) {
+  
+  int hash;
+  char *command;
+
+  hash = TASK_NONE;
+
+  command = thisword (input);
+  if (command == NULL) return (TASK_EMPTY);
+
+  if (command[0] == '#')                  hash = TASK_COMMENT;
+  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;
+  if (!strcasecmp (command, "TASK.EXIT")) hash = TASK_EXIT;
+  if (!strcasecmp (command, "TASK.EXEC")) hash = TASK_EXEC;
+
+  free (command);
+  return (hash);
+}
+
 /*** task timer functions ***/