Index: /trunk/Ohana/src/opihi/Makefile =================================================================== --- /trunk/Ohana/src/opihi/Makefile (revision 6688) +++ /trunk/Ohana/src/opihi/Makefile (revision 6689) @@ -10,5 +10,5 @@ dvo2: lib.data lib.shell cmd.basic cmd.data cmd.astro dvo: lib.data lib.shell cmd.basic cmd.data cmd.astro -psched: lib.data lib.shell cmd.basic cmd.data cmd.astro +pantasks: lib.data lib.shell cmd.basic cmd.data cmd.astro pclient: lib.data lib.shell cmd.basic pcontrol: lib.data lib.shell cmd.basic @@ -16,5 +16,5 @@ LIBS = lib.data lib.shell cmd.basic cmd.data cmd.astro -PROGRAM = mana dvo psched pclient pcontrol +PROGRAM = mana dvo pantasks pclient pcontrol EXTRAS = dimm dvo2 Index: /trunk/Ohana/src/opihi/doc/ChangeLog.txt =================================================================== --- /trunk/Ohana/src/opihi/doc/ChangeLog.txt (revision 6688) +++ /trunk/Ohana/src/opihi/doc/ChangeLog.txt (revision 6689) @@ -1,4 +1,29 @@ -- opihi 2.5 +2006.03.26: + + opihi-2-6 : added 'close' function for devices + added test framework + added tests to cmd.basic, cmd.data + added $?var syntax (variable existence test) + fixed broken a[3] = 5 assignment + added PopQueueMatch function + added periodogram.c + improvements to dimendown, peak + added fixwrap for roll-over on saturation + + dvo-0-4 added proper-motion, parallax + dropped _PS from Stars.R,D + fixed configuration flags for readline/curses + + mana-1-4 fixed configuration flags for readline/curses + pcontrol-0-4 fixed configuration flags for readline/curses + pclient-0-4 fixed configuration flags for readline/curses + + pantasks-0-4 fixed configuration flags for readline/curses + changed name from psched + + + +- opihi-2-5 * major work to switch to libkapa * revised init sequence (general_init, program_init, startup) Index: unk/Ohana/src/opihi/include/psched.h =================================================================== --- /trunk/Ohana/src/opihi/include/psched.h (revision 6688) +++ (revision ) @@ -1,184 +1,0 @@ -# include "data.h" -# include "basic.h" - -typedef enum { - JOB_NONE, - JOB_BUSY, - JOB_EXIT, - JOB_HUNG, - JOB_CRASH, - JOB_PENDING, -} JobStat; - -typedef enum { - JOB_LOCAL, - JOB_CONTROLLER, -} JobMode; - -typedef enum { - CONTROLLER_HUNG = -1, - CONTROLLER_DOWN = 0, - CONTROLLER_GOOD = 1, -} ControllerStat; - -enum {RANGE_ABS, RANGE_DAY, RANGE_WEEK}; - -enum {TASK_NONE, - TASK_EMPTY, - TASK_COMMENT, - TASK_NMAX, - TASK_TRANGE, - TASK_END, - TASK_HOST, - TASK_COMMAND, - TASK_PERIODS, - TASK_EXIT, - TASK_EXEC -} TaskHashResults; - -typedef struct { - time_t start; - time_t stop; - char type; - char keep; -} TimeRange; - -/* a task is a description of the wrapping of a job */ -typedef struct { - Macro *exec; /* name is 'exec' */ - Macro *crash; /* name is 'crash' */ - Macro *timeout; - Macro *defexit; - - int NEXIT; - int Nexit; - Macro **exit; /* name is exit status */ - - int argc; - char **argv; - char *host; - int host_required; - - char *name; - - int Nranges; - TimeRange *ranges; - - int Nmax; // only construct Ntotal jobs for this task - int Njobs; - - float poll_period; - float exec_period; - float timeout_period; - - struct timeval last; - - int Nsuccess; - int Nfailure; - int Ntimeout; - -} Task; - -// time period include/exclude periods: -// date ranges (e_time - e_time) -// time ranges (e_time - e_time) (use e_time % 86400) -// time-of-week ranges (e_time - e_time -// -trange Mon Fri (inclusive on days -- end defaults to Fri@23:59:59) -// -trange 08:00 - 17:00 -// -trange 2005/12/24 2005/12/31 -// be careful of HST! -// type: day, week, date -// keep: TRUE: perform action within this time period -// keep: FALSE: do not perform action within this time period - -typedef struct { - int JobID; /* internal ID for job */ - int pid; /* external ID for job */ - - struct timeval last; - struct timeval start; - int state; - int exit_status; - - int argc; - char **argv; - Task *task; - - IOBuffer stdout; /* stdout storage buffer */ - IOBuffer stderr; /* stderr storage buffer */ - JobMode mode; /* local or controller? */ - - int stdout_size; /* size of pending stdout buffer (controller) */ - int stderr_size; /* size of pending stderr buffer (controller) */ - int stdout_fd; /* stdout pipe (local only) */ - int stderr_fd; /* stderr pipe (local only) */ -} Job; - -# define CONTROLLER_PROMPT "pcontrol:" - -/* scheduler prototypes */ - -void InitPsched (); -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 RequireStatic); -int RegisterNewTask (); -int DeleteNewTask (); -Task *GetNewTask (); -Task *GetActiveTask (); -void SetTaskTimer (struct timeval *timer); -double GetTaskTimer (struct timeval start); -void InitTaskTimers (); -int TaskHash (char *input); -int RemoveTask (Task *task); -Task *SetNewTask (Task *task); - -int NextJobID (); -int InitJobIDs (); -int FreeJobID (int ID); - -void InitJobs (); -Job *NextJob (); -Job *FindJob (int JobID); -void ListJobs (); -Job *CreateJob (Task *task); -int SubmitJob (Job *job); -int CheckJob (Job *job); -int DeleteJob (Job *job); -void FreeJob (Job *job); - -int CheckJobs (); -int CheckTasks (); -int CheckSystem (); -int CheckController (); -int CheckTimeRanges (TimeRange *ranges, int Nranges); -int GetJobOutput (char *channel, int pid, IOBuffer *buffer, int Nbytes); -int CheckControllerJob (Job *job); -int CheckControllerJobStatus (Job *job); -int SubmitControllerJob (Job *job); -int DeleteControllerJob (Job *job); -Job *FindControllerJob (int JobID); -int StartController (); -int ControllerCommand (char *command, char *response, IOBuffer *buffer); -int SubmitLocalJob (Job *job); -int CheckLocalJob (Job *job); -int CheckLocalJobStatus (Job *job); -void InitTaskTimers (); -CommandF *FindControllerCommand (char *cmd); -int QuitController (); -int StopController (); -int VerboseMode (); -int KillLocalJob (Job *job); -int CheckControllerOutput (); -int PrintControllerOutput (); - -int KillControllerJob (Job *job); -int CheckControllerStatus (); -int TestElapsedCheck (); -void gotsignal (int signum); - Index: unk/Ohana/src/opihi/pantasks/psched.c =================================================================== --- /trunk/Ohana/src/opihi/pantasks/psched.c (revision 6688) +++ (revision ) @@ -1,55 +1,0 @@ -# include "psched.h" - -# define opihi_name "psched" -# define opihi_prompt "psched: " -# define opihi_description "parallel task scheduler\n" -# define opihi_history ".psched" -# define opihi_rcfile ".pschedrc" - -/* program-dependent initialization */ -void program_init (int *argc, char **argv) { - - auto_break = TRUE; - - /* load the commands used by this implementation */ - InitBasic (); - InitData (); - InitPsched (); - - rl_readline_name = opihi_name; - rl_attempted_completion_function = command_completer; - rl_event_hook = NULL; - rl_set_keyboard_input_timeout (100000); - - set_str_variable ("HISTORY", opihi_history); - set_str_variable ("PROMPT", opihi_prompt); - set_str_variable ("RCFILE", opihi_rcfile); - -# ifdef HELPDIR_DEFAULT - set_str_variable ("HELPDIR", MACRO_NAME(HELPDIR_DEFAULT)); -# endif - - signal (SIGPIPE, gotsignal); - signal (SIGTSTP, gotsignal); - signal (SIGTTIN, gotsignal); - return; -} - -/* standard welcome message */ -void welcome () { - fprintf (stderr, "\n"); - fprintf (stderr, "Welcome to %s - %s\n\n", opihi_name, opihi_description); -} - -/* add program-dependent exit functions here */ -void cleanup () { - QuitImage (); - QuitGraph (); - QuitController (); - return; -} - -void gotsignal (int signum) { - fprintf (stderr, "got signal : %d\n", signum); - return; -} Index: /trunk/Ohana/src/opihi/pcontrol/pulse.c =================================================================== --- /trunk/Ohana/src/opihi/pcontrol/pulse.c (revision 6688) +++ /trunk/Ohana/src/opihi/pcontrol/pulse.c (revision 6689) @@ -1,3 +1,3 @@ -# include "psched.h" +# include "pantasks.h" int pulse (int argc, char **argv) {