Changeset 33415 for branches/meh_branches/ppstack_test/Ohana/src/opihi/pcontrol/JobOps.c

Timestamp:

Mar 5, 2012, 5:19:48 PM (14 years ago)

Author:

mhuber

Message:

merging latest r33407 trunk changes to meh_branches/ppstack_test

Location:

branches/meh_branches/ppstack_test

Files:

• . (modified) (1 prop)
• Ohana/src/opihi/pcontrol/JobOps.c (modified) (3 diffs)

branches/meh_branches/ppstack_test/Ohana/src/opihi/pcontrol/JobOps.c

@@ -195 +195 @@
 }
 
-IDtype AddJob (char *hostname, JobMode mode, int timeout, int argc, char **argv, int Nxhosts, char **xhosts) {
+IDtype AddJob (char *hostname, JobMode mode, int timeout, int priority, int argc, char **argv, int Nxhosts, char **xhosts) {
 
   int JobID;
@@ -220 +220 @@
 
   job[0].mode     = mode;
+  job[0].priority = priority;
 
   job[0].state = 0;
@@ -270 +271 @@
   FREE (job);
 }
+
+/*** 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) {
+
+  Stack *stack = GetJobStack (StackID);
+  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 COMPARE(A,B)(((Job *)stack[0].object[A]).VALUE < ((Job *)stack[0].object[B]).VALUE)
+
+  OHANA_SORT (stack[0].Nobject, COMPARE, SWAPFUNC);
+
+# undef SWAPFUNC
+# undef COMPARE
+
+  UnlockStack (stack);
+}
+
+***/