Changeset 10694

Timestamp:

Dec 13, 2006, 8:55:19 AM (20 years ago)

Author:

eugene

Message:

added active state to tasks

Location:

trunk/Ohana/src/opihi

Files:

• include/pantasks.h (modified) (2 diffs)
• pantasks/CheckTasks.c (modified) (1 diff)
• pantasks/Makefile (modified) (1 diff)
• pantasks/TaskOps.c (modified) (2 diffs)
• pantasks/controller.c (modified) (1 diff)
• pantasks/controller_run.c (modified) (3 diffs)
• pantasks/init.c (modified) (2 diffs)
• pantasks/task.c (modified) (1 diff)

trunk/Ohana/src/opihi/include/pantasks.h

@@ -33 +33 @@
       TASK_COMMENT, 
       TASK_NMAX, 
+      TASK_ACTIVE, 
       TASK_TRANGE, 
       TASK_END, 
@@ -94 +95 @@
   int Nfailure;
   int Ntimeout;
+
+  int active;
 
 } Task;

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

@@ -9 +9 @@
   /** test all tasks: ready to test? ready to run? **/
   while ((task = NextTask ()) != NULL) {
+
+    if (!task[0].active) continue;
 
     /* ready to test? : check exec period */

trunk/Ohana/src/opihi/pantasks/Makefile

@@ -50 +50 @@
 $(SDIR)/task_host.$(ARCH).o \
 $(SDIR)/task_nmax.$(ARCH).o \
+$(SDIR)/task_active.$(ARCH).o \
 $(SDIR)/task_macros.$(ARCH).o \
 $(SDIR)/task_trange.$(ARCH).o \

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

@@ -310 +310 @@
   NewTask[0].Nfailure = 0;
   NewTask[0].Ntimeout = 0;
+
+  NewTask[0].active = TRUE;
   return (NewTask);
 }
@@ -419 +421 @@
   if (!strcasecmp (command, "HOST"))      hash = TASK_HOST;
   if (!strcasecmp (command, "NMAX"))      hash = TASK_NMAX;
+  if (!strcasecmp (command, "ACTIVE"))    hash = TASK_ACTIVE;
   if (!strcasecmp (command, "TRANGE"))    hash = TASK_TRANGE;
   if (!strcasecmp (command, "STDOUT"))    hash = TASK_STDOUT;

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

@@ -14 +14 @@
   {"host",   controller_host,   "define host for controller"},
   {"check",  controller_check,  "check controller host/job"},
-  {"run",    controller_run,    "start controller operation"},
-  {"stop",   controller_stop,   "stop controller (no disconnect)"},
+  {"run",    controller_run,    "start controller operation / set run levels"},
+  {"stop",   controller_run,    "stop controller (no disconnect)"},
   {"status", controller_status, "check controller status"},
   {"output", controller_output, "print controller output"},

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

@@ -7 +7 @@
   IOBuffer buffer;
 
-  if (argc != 1) {
-    gprint (GP_ERR, "USAGE: controller run\n");
+  if ((argc > 2) ||
+      get_argument (argc, argv, "help") ||
+      get_argument (argc, argv, "-h") ||
+      get_argument (argc, argv, "--help")) 
+  {
+    if (!strcmp (argv[0], "run")) {
+      gprint (GP_ERR, "USAGE: controller run [level]\n");
+      gprint (GP_ERR, "  allowed levels:\n");
+      gprint (GP_ERR, "  all (default) : manage machines, spawn jobs, harvest jobs\n");
+      gprint (GP_ERR, "  reap          : manage machines, harvest jobs\n");
+      gprint (GP_ERR, "  hosts         : manage machines, not jobs\n");
+      gprint (GP_ERR, "  none          : all stop\n");
+    } else {
+      gprint (GP_ERR, "USAGE: controller stop (immediate processing halt)\n");
+    }
     return (FALSE);
   }
@@ -19 +32 @@
   }
 
-  sprintf (command, "run");
+  if (argc == 1) {
+    strcpy (command, argv[0]);
+  } else {
+    sprintf (command, "run %s", argv[1]);
+  }
+
   InitIOBuffer (&buffer, 0x100);
   status = ControllerCommand (command, CONTROLLER_PROMPT, &buffer);
@@ -30 +48 @@
   return (TRUE);
 }
-
-int controller_stop (int argc, char **argv) {
-
-  int status;
-  char command[1024];
-  IOBuffer buffer;
-
-  if (argc != 1) {
-    gprint (GP_ERR, "USAGE: controller stop\n");
-    return (FALSE);
-  }
-
-  /* check if controller is running */
-  status = CheckControllerStatus ();
-  if (!status) {
-    gprint (GP_LOG, "controller is not active\n");
-    return (TRUE);
-  }
-
-  sprintf (command, "stop");
-  InitIOBuffer (&buffer, 0x100);
-  status = ControllerCommand (command, CONTROLLER_PROMPT, &buffer);
-  if (status) {
-    gwrite (buffer.buffer, 1, buffer.Nbuffer, GP_LOG);
-  } else {
-    gprint (GP_LOG, "controller is not responding\n");
-  }
-  FreeIOBuffer (&buffer);
-  return (TRUE);
-}

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

@@ -5 +5 @@
 int task_host       PROTO((int, char **));
 int task_nmax       PROTO((int, char **));
+int task_active     PROTO((int, char **));
 int task_trange     PROTO((int, char **));
 int task_macros     PROTO((int, char **));
@@ -26 +27 @@
   {"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"},

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

@@ -96 +96 @@
       case TASK_OPTIONS:
       case TASK_PERIODS:
+      case TASK_ACTIVE:
         status = command (input, &outline, TRUE);
         if (outline != NULL) free (outline);