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

Timestamp:

Feb 19, 2007, 3:18:27 PM (19 years ago)

Author:

eugene

Message:

removed usleep from job and task threads; increased controller timeout; added verbosity; fixed quit controller; added check points to pcontrol thread

Location:

trunk/Ohana/src/opihi/pantasks

Files:

• CheckJobs.c (modified) (3 diffs)
• CheckTasks.c (modified) (6 diffs)
• ControllerOps.c (modified) (2 diffs)
• LocalJob.c (modified) (1 diff)
• TaskOps.c (modified) (2 diffs)
• controller_threads.c (modified) (1 diff)
• input_threads.c (modified) (1 diff)
• job_threads.c (modified) (1 diff)
• task_threads.c (modified) (1 diff)
• test/sleep.sh (modified) (1 diff)
• test/sleep2.sh (added)
• verbose.c (modified) (2 diffs)

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

@@ -11 +11 @@
   Queue *queue;
 
+  // int Ncheck;
+  // Ncheck = 0;
+
   /** test all jobs: ready to test?  finished? **/
   while ((job = NextJob ()) != NULL) {
+    // Ncheck ++;
 
     task = job[0].task;
 
     /* check poll period (ready to ask for status?) */
-    if (GetTaskTimer(job[0].last) < task[0].poll_period) continue;
+    if (GetTaskTimer(job[0].last, FALSE) < task[0].poll_period) continue;
 
     /* check current status */
@@ -135 +139 @@
      */
     if (job[0].mode == JOB_LOCAL) {
-      if (GetTaskTimer(job[0].start) < task[0].timeout_period) continue;
+      if (GetTaskTimer(job[0].start, FALSE) < task[0].timeout_period) continue;
       if (VerboseMode()) gprint (GP_LOG, "timeout on %s\n", task[0].name);
 
@@ -176 +180 @@
     /* reset polling clock */
     SetTaskTimer (&job[0].last);
-    if (TestElapsedCheck()) return (TRUE);
+    if (TestElapsedCheck()) {
+      // fprintf (stderr, "check %d jobs\n", Ncheck);
+      return (TRUE);
+    }
   }
+  // fprintf (stderr, "check %d jobs\n", Ncheck);
   return (TRUE);
 }

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

@@ -6 +6 @@
   Task *task;
   int status;
+  struct timeval now;
 
   /** test all tasks: ready to test? ready to run? **/
@@ -13 +14 @@
 
     /* ready to test? : check exec period */
-    if (GetTaskTimer(task[0].last) < task[0].exec_period) continue;
+    if (GetTaskTimer(task[0].last, FALSE) < task[0].exec_period) continue;
 
     /* need to check if the current time is within valid/invalid periods */
@@ -25 +26 @@
     }
     if (task[0].NpendingMax && (task[0].Npending >= task[0].NpendingMax)) {
-        fprintf (stderr, "npending: %d, max npending: %d\n", task[0].Npending, task[0].NpendingMax);
+        // fprintf (stderr, "npending: %d, max npending: %d\n", task[0].Npending, task[0].NpendingMax);
         gettimeofday (&task[0].last, (void *) NULL);
         continue;
     }
+
+    // gettimeofday (&now, (void *) NULL);
+    // fprintf (stderr, "t0: %d %6d  - \n", now.tv_sec, now.tv_usec);
 
     /* ready to run? : run task.exec macro */
@@ -39 +43 @@
     }
 
+    // gettimeofday (&now, (void *) NULL);
+    // fprintf (stderr, "t1: %d %6d  - \n", now.tv_sec, now.tv_usec);
+
     /* check if there are errors with this task */
     if (!ValidateTask (task, TRUE)) { 
@@ -44 +51 @@
         continue;
     }
+    
+    // gettimeofday (&now, (void *) NULL);
+    // fprintf (stderr, "t2: %d %6d  - \n", now.tv_sec, now.tv_usec);
 
     /* construct job from task */
     job = CreateJob (task);
 
+    // gettimeofday (&now, (void *) NULL);
+    // fprintf (stderr, "t3: %d %6d  - \n", now.tv_sec, now.tv_usec);
+
     /* execute job - XXX add status test */
     SubmitJob (job);
+
+    // fprintf (stderr, "nl: %d %6d  - ",
+    // task[0].last.tv_sec, task[0].last.tv_usec);
 
     /* reset timer on task (don't do this if Create/Submit fails) (why not??) */
@@ -55 +71 @@
     task[0].Njobs ++;
     task[0].Npending ++;
+
+    // fprintf (stderr, "%d %6d\n", 
+    // task[0].last.tv_sec, task[0].last.tv_usec);
 
     /* increment Nrun for inclusive ranges with Nmax */

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

@@ -352 +352 @@
   }
   
+  /* for commands which don't return a prompt, don't look for one */
+  if (response == NULL) {
+      return (TRUE);
+  }
+
   /* watch for response - wait up to 1 second */
   line = NULL;
@@ -456 +461 @@
   sprintf (cmd, "quit");
   InitIOBuffer (&buffer, 0x100);
-  status = ControllerCommand (cmd, "", &buffer);
-  FreeIOBuffer (&buffer);
-
-  /* the quit command does not return a prompt, so we always 
-     get an error on the controller here */
+  status = ControllerCommand (cmd, NULL, &buffer);
+  FreeIOBuffer (&buffer);
+
+  /* the quit command does not return a prompt, 
+     check that the controller exited */
   StopController ();
   return (TRUE);

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

@@ -97 +97 @@
         exit (1);
       }
-      job[0].dtime = GetTaskTimer (job[0].start);
+      job[0].dtime = GetTaskTimer (job[0].start, FALSE);
       break;
   }

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

@@ -547 +547 @@
 /*** task timer functions ***/
 
-double GetTaskTimer (struct timeval start) {
+double GetTaskTimer (struct timeval start, int verbose) {
 
   double dtime;
@@ -555 +555 @@
   dtime = DTIME (now, start);
   
+  if (verbose) {
+      fprintf (stderr, "tt: %d %6d  - %d %6d : %f\n", 
+               now.tv_sec, now.tv_usec, 
+               start.tv_sec, start.tv_usec, dtime);
+  }
+
   return (dtime);
 }

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

@@ -28 +28 @@
     CheckControllerOutput ();
     SerialThreadUnlock ();
-    usleep (10000); // allow other threads a chance to run
+    if (VerboseMode() == 2) fprintf (stderr, "C");
+    // fprintf (stderr, "**** C ****");
+    usleep (500000); // allow other threads a chance to run
   }
 }

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

@@ -27 +27 @@
     CheckInputs ();
     SerialThreadUnlock ();
-    fprintf (stderr, "I");
-    usleep (10000); // allow other threads a chance to run
+    if (VerboseMode() == 2) fprintf (stderr, "I");
+    // usleep (10000); // allow other threads a chance to run
   }
 }

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

@@ -27 +27 @@
     CheckJobs ();
     SerialThreadUnlock ();
-    usleep (10000); // allow other threads a chance to run
+    if (VerboseMode() == 2) fprintf (stderr, "J");
+    // fprintf (stderr, "J");
+    // usleep (10000); // allow other threads a chance to run
   }
 }

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

@@ -27 +27 @@
     CheckTasks ();
     SerialThreadUnlock ();
-    usleep (10000); // allow other threads a chance to run
+    if (VerboseMode() == 2) fprintf (stderr, "T");
+    // fprintf (stderr, "T");
+    // usleep (1000); // allow other threads a chance to run
   }
 }

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

@@ -6 +6 @@
 
   periods      -poll 0.1
-  periods      -exec 1.0
+  periods      -exec 0.2
   periods      -timeout 20
-  npending 2
+  npending 5
   
   stdout tmp.txt
   stderr tmp.txt
+
+  task.exec
+    echo "create command"
+  end
 
   # success

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

@@ -23 +23 @@
       return (TRUE);
     }
+    if (!strcasecmp (argv[1], "THREADS")) {
+      VERBOSE = 2;
+      return (TRUE);
+    }
     if (!strcasecmp (argv[1], "TOGGLE")) {
       VERBOSE = ~VERBOSE;
@@ -29 +33 @@
   }
 
-  gprint (GP_ERR, "USAGE: verbose (on/off/toggle)\n");
+  gprint (GP_ERR, "USAGE: verbose (on/off/threads/toggle)\n");
   return (FALSE);
 }