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

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/pantasks/ControllerOps.c (modified) (1 diff)
• Ohana/src/opihi/pantasks/JobOps.c (modified) (1 diff)
• Ohana/src/opihi/pantasks/LocalJob.c (modified) (1 diff)
• Ohana/src/opihi/pantasks/TaskOps.c (modified) (1 diff)
• Ohana/src/opihi/pantasks/init.c (modified) (1 diff)
• Ohana/src/opihi/pantasks/init_server.c (modified) (1 diff)
• Ohana/src/opihi/pantasks/task_nice.c (modified) (2 diffs)

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

@@ -259 +259 @@
   }
   
-  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 (cmd, tmp);
   }

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

@@ -107 +107 @@
     job[0].mode = JOB_CONTROLLER;
   }
-  job[0].priority = task[0].priority;
+  job[0].nicelevel = task[0].nicelevel;
 
   /* we need our own copy of task[0].argv argc is the number of valid args, like the usual command line.  we

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

@@ -162 +162 @@
 
   /* set nice level for the child process -- maybe I should not exit here... */
-  if (job[0].priority) {
-      status = setpriority (PRIO_PROCESS, pid, job[0].priority);
+  if (job[0].nicelevel) {
+      status = setpriority (PRIO_PROCESS, pid, job[0].nicelevel);
       if (status == -1) {
-          gprint (GP_ERR, "error setting priority\n");
+          gprint (GP_ERR, "error setting nice level\n");
           perror ("setpriority: ");
           exit (2);

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

@@ -487 +487 @@
 
   NewTask[0].active = TRUE;
-  NewTask[0].priority = 0;
+  NewTask[0].nicelevel = 0;
   return (NewTask);
 }

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

@@ -34 +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, "nice",       task_nice,     "set nice level for a task"},
   {1, "ipptool2book", ipptool2book, "convert queue with ipptool output to book"},
   {1, "kill",       kill_job,      "kill job"},

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

@@ -35 +35 @@
   {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, "nice",       task_nice,     "set nice level for a task"},
   {1, "ipptool2book", ipptool2book, "convert queue with ipptool output to book"},
   {1, "kill",       kill_job,      "kill job"},

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

@@ -4 +4 @@
 
   char *endptr = NULL;
-  int priority;
+  int nicelevel;
   Task *task;
 
   if (argc != 2) {
-    gprint (GP_ERR, "USAGE: nice (priority)\n");
+    gprint (GP_ERR, "USAGE: nice (nicelevel)\n");
     return (FALSE);
   }
@@ -20 +20 @@
   }
 
-  priority = strtol (argv[1], &endptr, 10);
+  nicelevel = strtol (argv[1], &endptr, 10);
   if (*endptr) goto fail;
-  if (priority < 0) goto fail;
-  if (priority > 20) goto fail;
+  if (nicelevel < 0) goto fail;
+  if (nicelevel > 20) goto fail;
 
-  task[0].priority = priority;
+  task[0].nicelevel = nicelevel;
   JobTaskUnlock();
   return (TRUE);
 
 fail:
-    gprint (GP_ERR, "ERROR: nice (priority) -- priority must be an integer 0 to 20\n");
+    gprint (GP_ERR, "ERROR: nice (nicelevel) -- nicelevel must be an integer 0 to 20\n");
     return (FALSE);
 }