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

Timestamp:

Oct 27, 2015, 4:49:06 PM (11 years ago)

Author:

eugene

Message:

extensive work on relphot, relastro, uniphot, dvomerge aiming to the construction and calibration of PV3

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/opihi/pantasks (modified) (1 prop)
• src/opihi/pantasks/CheckJobs.c (modified) (4 diffs)
• src/opihi/pantasks/CheckTasks.c (modified) (2 diffs)
• src/opihi/pantasks/TaskOps.c (modified) (1 diff)
• src/opihi/pantasks/pantasks_server.c.in (modified) (3 diffs)
• src/opihi/pantasks/test/local.sh (modified) (2 diffs)

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

@@ -1 +1 @@
 # include "pantasks.h"
+static int Ncheck = 0;
 
 float CheckJobs () {
@@ -12 +13 @@
   float time_running, next_timeout;
 
-  // int Ncheck;
-  // Ncheck = 0;
+  Ncheck ++;
 
   // actual maximum delay is controlled in job_threads.c
@@ -21 +21 @@
   /** test all jobs: ready to test?  finished? **/
   while ((job = NextJob ()) != NULL) {
-    // Ncheck ++;
 
     task = job[0].task;
@@ -220 +219 @@
     SetTaskTimer (&job[0].last);
   }
-  // fprintf (stderr, "check %d jobs\n", Ncheck);
+
   JobTaskUnlock();
   return (next_timeout);

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

@@ -1 +1 @@
 # include "pantasks.h"
+static int Ncheck = 0; 
 
 float CheckTasks () {
@@ -7 +8 @@
   int status;
   float time_running, next_timeout, fuzz;
+
+  Ncheck ++;
 
   // actual maximum delay is controlled in job_threads.c

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

@@ -22 +22 @@
 void FreeTasks () {
   int i;
-  for (i = 0; i < Ntasks; i++) {
+  int ntasks = Ntasks;
+  Ntasks = 0;
+  for (i = 0; i < ntasks; i++) {
     FreeTask (tasks[i]);
   }

trunk/Ohana/src/opihi/pantasks/pantasks_server.c.in

@@ -19 +19 @@
   
   char hostname[256], portinfo[256];
-  char log_stdout[1024], log_stderr[1024];
+  char log_stdout[1024], log_stderr[1024], tmpname[1024];
   pthread_t JobsAndTasksThread;
   pthread_t clientsThread;
@@ -34 +34 @@
   stdin = freopen ("/dev/zero", "r", stdin);
 
-  // this block redirects the actual stderr, stdout steams to the output files
-  if (VarConfig ("PANTASKS_SERVER_STDOUT", "%s", log_stdout) != NULL) {
+  // this block redirects the actual stderr, stdout streams to the output files
+  if (VarConfig ("PANTASKS_SERVER_STDOUT", "%s", tmpname) != NULL) {
+    strcpy (log_stdout, tmpname);
     if (strcmp (log_stdout, "stdout")) {
       stdout = freopen (log_stdout, "a", stdout);
@@ -44 +45 @@
     }
   }
-  if (VarConfig ("PANTASKS_SERVER_STDERR", "%s", log_stderr) != NULL) {
+  if (VarConfig ("PANTASKS_SERVER_STDERR", "%s", tmpname) != NULL) {
+    strcpy (log_stderr, tmpname);
     if (strcmp (log_stderr, "stderr")) {
       stderr = freopen (log_stderr, "a", stderr);

trunk/Ohana/src/opihi/pantasks/test/local.sh

@@ -1 +1 @@
 
 ## a basic test of memory allocation
+if (not($?VERBOSE)) set VERBOSE = 0
 
 exec rm -f tmp.txt
@@ -38 +39 @@
  $startmem = $word:1
 end
+
 macro memcheck
  list word -x "ps -p $PID -o rss"