Index: /branches/eam_branches/eam_branch_20090322/Ohana/src/opihi/include/pantasks.h
===================================================================
--- /branches/eam_branches/eam_branch_20090322/Ohana/src/opihi/include/pantasks.h	(revision 23517)
+++ /branches/eam_branches/eam_branch_20090322/Ohana/src/opihi/include/pantasks.h	(revision 23518)
@@ -244,4 +244,5 @@
 int CheckControllerOutput (void);
 int PrintControllerOutput (void);
+void PrintControllerBusyJobs ();
 
 int AddHost (char *hostname, int max_threads);
@@ -260,11 +261,14 @@
 
 // functions related to the server threads
+void *CheckJobsAndTasksThread (void *data);
+
 void CheckTasksSetState (int state);
 int CheckTasksGetState (void);
-void *CheckTasksThread (void *data);
 
 void CheckJobsSetState (int state);
 int CheckJobsGetState (void);
-void *CheckJobsThread (void *data);
+
+// void *CheckTasksThread (void *data);
+// void *CheckJobsThread (void *data);
 
 void CheckControllerSetState (int state);
@@ -283,6 +287,12 @@
 void CheckInputs (void);
 
-void SerialThreadLock (void);
-void SerialThreadUnlock (void);
+void ClientThreadLock (void);
+void ClientThreadUnlock (void);
+void CommandThreadLock (void);
+void CommandThreadUnlock (void);
+void ControlThreadLock (void);
+void ControlThreadUnlock (void);
+void JobTaskThreadLock (void);
+void JobTaskThreadUnlock (void);
 
 int InitPassword (void);
Index: /branches/eam_branches/eam_branch_20090322/Ohana/src/opihi/pantasks/notes.txt
===================================================================
--- /branches/eam_branches/eam_branch_20090322/Ohana/src/opihi/pantasks/notes.txt	(revision 23517)
+++ /branches/eam_branches/eam_branch_20090322/Ohana/src/opihi/pantasks/notes.txt	(revision 23518)
@@ -4,16 +4,26 @@
     CheckControllerJob
       CheckController
+        controller_threads (controlThread)
   StartController
   ControllerCommand
     CheckController
-    controller_check
-    controller_host
-    controller_jobstack
-    controller_run
-    controller_status
-    controller_verbose
+      controller_threads (controlThread)
+    controller_check (clientThread)
+    controller_host (clientThread)
+    controller_jobstack (clientThread)
+    controller_run (clientThread)
+    controller_status (clientThread)
+    controller_verbose (clientThread)
     DeleteControllerJob
+      CheckControllerJob
+        CheckController
+	  controller_threads (controlThread)
     CheckControllerJobStatus
+      CheckControllerJob
+        CheckController
+	  controller_threads (controlThread)
     SubmitControllerJob
+      SubmitJob
+        CheckTasks (JobTaskThread)
     PrintControllerBusyJobs
     KillControllerJob
@@ -21,6 +31,6 @@
     RestartController    
   CheckControllerOutput
-    controller_output
-    controller_threads
+    controller_output (clientThread)
+    controller_threads (controlThread)