Changeset 32585

Timestamp:

Oct 28, 2011, 10:06:45 AM (15 years ago)

Author:

eugene

Message:

add nice levels to pantasks / pcontrol / pclient

Location:

branches/eam_branches/ipp-20110906/Ohana/src/opihi

Files:

• include/pantasks.h (modified) (1 diff)
• pantasks/Makefile (modified) (1 diff)
• pantasks/TaskOps.c (modified) (1 diff)
• pantasks/init.c (modified) (2 diffs)
• pantasks/init_server.c (modified) (1 diff)
• pantasks/task.c (modified) (1 diff)
• pantasks/task_nice.c (modified) (1 diff)
• pantasks/test/nice.sh (added)
• pantasks/test/nice_remote.sh (added)
• pclient/job.c (modified) (1 diff)
• pcontrol/JobOps.c (modified) (3 diffs)
• pcontrol/job.c (modified) (1 diff)
• pcontrol/status.c (modified) (1 diff)

branches/eam_branches/ipp-20110906/Ohana/src/opihi/include/pantasks.h

@@ -40 +40 @@
       TASK_END, 
       TASK_HOST, 
+      TASK_NICE, 
       TASK_STDOUT, 
       TASK_STDERR, 

branches/eam_branches/ipp-20110906/Ohana/src/opihi/pantasks/Makefile

@@ -83 +83 @@
 $(SRC)/task.$(ARCH).o \
 $(SRC)/task_host.$(ARCH).o \
+$(SRC)/task_nice.$(ARCH).o \
 $(SRC)/task_nmax.$(ARCH).o \
 $(SRC)/task_active.$(ARCH).o \

branches/eam_branches/ipp-20110906/Ohana/src/opihi/pantasks/TaskOps.c

@@ -596 +596 @@
   if (!strcasecmp (command, "END"))       hash = TASK_END;
   if (!strcasecmp (command, "HOST"))      hash = TASK_HOST;
+  if (!strcasecmp (command, "NICE"))      hash = TASK_NICE;
   if (!strcasecmp (command, "NMAX"))      hash = TASK_NMAX;
   if (!strcasecmp (command, "ACTIVE"))    hash = TASK_ACTIVE;

branches/eam_branches/ipp-20110906/Ohana/src/opihi/pantasks/init.c

@@ -4 +4 @@
 int task            PROTO((int, char **));
 int task_host       PROTO((int, char **));
+int task_nice       PROTO((int, char **));
 int task_nmax       PROTO((int, char **));
 int task_npending   PROTO((int, char **));
@@ -33 +34 @@
   {1, "halt",       halt,          "halt the scheduler (no job harvesting)"},
   {1, "host",       task_host,     "define host machine for a task"},
+  {1, "nice",       task_nice,     "set nice priority level for a task"},
   {1, "ipptool2book", ipptool2book, "convert queue with ipptool output to book"},
   {1, "kill",       kill_job,      "kill job"},

branches/eam_branches/ipp-20110906/Ohana/src/opihi/pantasks/init_server.c

@@ -34 +34 @@
   {1, "delete",     delete_job,    "delete job"},
   {1, "host",       task_host,     "define host machine for a task"},
+  {1, "nice",       task_nice,     "set nice priority level for a task"},
   {1, "ipptool2book", ipptool2book, "convert queue with ipptool output to book"},
   {1, "kill",       kill_job,      "kill job"},

branches/eam_branches/ipp-20110906/Ohana/src/opihi/pantasks/task.c

@@ -72 +72 @@
       case TASK_NMAX:
       case TASK_HOST:
+      case TASK_NICE:
       case TASK_EXIT:
       case TASK_EXEC:

branches/eam_branches/ipp-20110906/Ohana/src/opihi/pantasks/task_nice.c

@@ -7 +7 @@
   Task *task;
 
-  if (argc != 3) {
+  if (argc != 2) {
     gprint (GP_ERR, "USAGE: nice (priority)\n");
     return (FALSE);

branches/eam_branches/ipp-20110906/Ohana/src/opihi/pclient/job.c

@@ -3 +3 @@
 int job (int argc, char **argv) {
 
-  int i, pid, status, priority;
+  int i, N, pid, status, priority;
   char **targv;
 

branches/eam_branches/ipp-20110906/Ohana/src/opihi/pcontrol/JobOps.c

@@ -272 +272 @@
 }
 
+/*** ResortJobStack can be used to adjust priorities based on some info we supply.  This
+     is not finished -- to finish this, I need to define the metric of interest and
+     arrange for that to be passed to the jobs in pcontrol
+
 void ResortJobStack (int StackID) {
 
@@ -277 +281 @@
   LockStack (stack);
 
-# define SWAPFUNC(A,B){ \
-  void *tmpObject = stack[0].object[A]; \
-  stack[0].object[A] = stack[0].object[B]; \
-  stack[0].object[B] = tmpObject; \
-  void *tmpName = stack[0].name[A]; \
-  stack[0].name[A] = stack[0].name[B]; \
-  stack[0].name[B] = tmpName; \
-  void *tmpID = stack[0].id[A]; \
-  stack[0].id[A] = stack[0].id[B]; \
-  stack[0].id[B] = tmpID; \
-}
+# define SWAPFUNC(A,B){                         \
+    void *tmpObject = stack[0].object[A];       \
+    stack[0].object[A] = stack[0].object[B];    \
+    stack[0].object[B] = tmpObject;             \
+    void *tmpName = stack[0].name[A];           \
+    stack[0].name[A] = stack[0].name[B];        \
+    stack[0].name[B] = tmpName;                 \
+    void *tmpID = stack[0].id[A];               \
+    stack[0].id[A] = stack[0].id[B];            \
+    stack[0].id[B] = tmpID;                     \
+  }
 
 # define COMPARE(A,B)(((Job *)stack[0].object[A]).VALUE < ((Job *)stack[0].object[B]).VALUE)
 
-  OHANA_SORT (N, COMPARE, SWAPFUNC);
+  OHANA_SORT (stack[0].Nobject, COMPARE, SWAPFUNC);
 
 # undef SWAPFUNC
@@ -298 +302 @@
   UnlockStack (stack);
 }
+
+***/

branches/eam_branches/ipp-20110906/Ohana/src/opihi/pcontrol/job.c

@@ -67 +67 @@
   }
 
-  if (argc < 2) {
-    FREE (Host);
-    goto usage;
-  }
+  if (argc < 2) goto usage;
   
   targc = argc - 1;

branches/eam_branches/ipp-20110906/Ohana/src/opihi/pcontrol/status.c

@@ -59 +59 @@
     }
 
+    PrintID (GP_LOG, job[0].JobID);
+    gprint (GP_LOG, " %2d ", job[0].priority);
     for (j = 0; j < job[0].argc; j++) {
       gprint (GP_LOG, "%s ", job[0].argv[j]);
     }
-    PrintID (GP_LOG, job[0].JobID);
     gprint (GP_LOG, "\n");
   }