Index: trunk/Ohana/src/opihi/include/scheduler.h
===================================================================
--- trunk/Ohana/src/opihi/include/scheduler.h	(revision 4603)
+++ trunk/Ohana/src/opihi/include/scheduler.h	(revision 4684)
@@ -1,7 +1,3 @@
-# include "external.h"
-# include "shell.h"
-# include "dvomath.h"
-# include "convert.h"
-# include "display.h"
+# include "opihi.h"
 # include <sys/types.h>
 # include <sys/wait.h>
@@ -11,4 +7,5 @@
   JOB_BUSY, 
   JOB_EXIT, 
+  JOB_HUNG,
   JOB_CRASH,
   JOB_PENDING,
@@ -113,30 +110,36 @@
 
 /* scheduler prototypes */
-void InitTasks ();
-void ListTasks ();
-Task *FindTask (char *name);
-Task *CreateTask (char *name);
-void SetCurrentTask (char *name);
-char *GetCurrentTask ();
-int DeleteTask (Task *task);
-Task *NextTask ();
-int TaskHash (char *input);
-int ShowTask (char *name);
+
 char *memstr (char *m1, char *m2, int n);
 
+void InitTasks ();
+Task *NextTask ();
+Task *FindTask (char *name);
+void ListTasks (int verbose);
+int ShowTask (char *name);
+int FreeTask (Task *task);
+Task *CreateTask (char *name);
+int ValidateTask (Task *task);
+int RegisterNewTask ();
+int DeleteNewTask ();
+Task *GetNewTask ();
+void SetTaskTimer (struct timeval *timer);
+double GetTaskTimer (struct timeval start);
+void InitTaskTimers ();
+int TaskHash (char *input);
+
+int NextJobID ();
+int InitJobIDs ();
+int FreeJobID (int ID);
+
+void InitJobs ();
 Job *NextJob ();
-void InitJobs ();
-int NextJobID ();
+Job *FindJob (int JobID);
 void ListJobs ();
-Job *FindJob (int JobID);
 Job *CreateJob (Task *task);
-void SetCurrentJob (char *name);
-char *GetCurrentJob ();
 int SubmitJob (Job *job);
 int CheckJob (Job *job);
 int DeleteJob (Job *job);
 void FreeJob (Job *job);
-void SetTaskTimer (struct timeval *timer);
-double GetTaskTimer (struct timeval start);
 
 int CheckJobs ();