Changeset 36623 for trunk/Ohana/src/opihi/pcontrol

Timestamp:

Mar 31, 2014, 2:36:01 PM (12 years ago)

Author:

eugene

Message:

add lensing moments to psphot; allow up to 6x6 psf and aperture residuals in psphot

Location:

trunk

Files:

• . (modified) (1 prop)
• Ohana/src/opihi/pcontrol/JobOps.c (modified) (2 diffs)
• Ohana/src/opihi/pcontrol/StartJob.c (modified) (1 diff)
• Ohana/src/opihi/pcontrol/job.c (modified) (4 diffs)
• Ohana/src/opihi/pcontrol/status.c (modified) (1 diff)

trunk/Ohana/src/opihi/pcontrol/JobOps.c

@@ -207 +207 @@
 }
 
-IDtype AddJob (char *hostname, JobMode mode, int timeout, int priority, int argc, char **argv, int Nxhosts, char **xhosts) {
+IDtype AddJob (char *hostname, JobMode mode, int timeout, int nicelevel, int argc, char **argv, int Nxhosts, char **xhosts) {
 
   int JobID;
@@ -232 +232 @@
 
   job[0].mode     = mode;
-  job[0].priority = priority;
+  job[0].nicelevel = nicelevel;
 
   job[0].state = 0;

trunk/Ohana/src/opihi/pcontrol/StartJob.c

@@ -25 +25 @@
   bzero (line, Nline);
   strcpy (line, "job");
-  if (job[0].priority) {
+  if (job[0].nicelevel) {
     char tmp[64];
-    snprintf (tmp, 64, " -nice %d", job[0].priority);
+    snprintf (tmp, 64, " -nice %d", job[0].nicelevel);
     strcat (line, tmp);
   }

trunk/Ohana/src/opihi/pcontrol/job.c

@@ -5 +5 @@
   char *Host = NULL;
   char **targv = NULL;
-  int i, N, Mode, targc, Timeout, priority;
+  int i, N, Mode, targc, Timeout, nicelevel;
   IDtype JobID;
   char **xhosts = NULL;
@@ -43 +43 @@
   }
 
-  priority = 0;
+  nicelevel = 0;
   if ((N = get_argument (argc, argv, "-nice"))) {
     remove_argument (N, &argc, argv);
-    priority = atoi (argv[N]);
+    nicelevel = atoi (argv[N]);
     remove_argument (N, &argc, argv);
   }
@@ -76 +76 @@
 
   // a JobID < 0 mean the job was not accepted
-  JobID = AddJob (Host, Mode, Timeout, priority, targc, targv, Nxhosts, xhosts);
+  JobID = AddJob (Host, Mode, Timeout, nicelevel, targc, targv, Nxhosts, xhosts);
   gprint (GP_LOG, "JobID: %d\n", (int) JobID);
   return (TRUE);
@@ -82 +82 @@
  usage:
     gprint (GP_ERR, "USAGE: job [options] (arg0) (arg1) ... (argN)\n");
-    gprint (GP_ERR, "  options: -host, +host, -timeout, -xhost (host)\n");
+    gprint (GP_ERR, "  options: -host, +host, -timeout, -xhost (host) -nice (level)\n");
     gprint (GP_ERR, "  arguments of the form @MAX_THREADS@ will be replaced when the job is launched\n");
 

trunk/Ohana/src/opihi/pcontrol/status.c

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