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

Timestamp:

Jul 24, 2006, 3:15:49 PM (20 years ago)

Author:

eugene

Message:

updates to pantasks client/server; new API for command

Location:

trunk/Ohana/src/opihi/pantasks

Files:

• Makefile (modified) (2 diffs)
• init.c (modified) (2 diffs)
• init_server.c (added)
• pantasks.c (modified) (2 diffs)
• server_threads.c (modified) (4 diffs)
• status.c (modified) (1 diff)
• status_server.c (added)
• task.c (modified) (1 diff)

trunk/Ohana/src/opihi/pantasks/Makefile

@@ -48 +48 @@
 $(SDIR)/kill.$(ARCH).o \
 $(SDIR)/delete.$(ARCH).o \
-$(SDIR)/server.$(ARCH).o \
 $(SDIR)/verbose.$(ARCH).o \
 $(SDIR)/controller.$(ARCH).o \
@@ -79 +78 @@
 $(SDIR)/InputQueue.$(ARCH).o \
 $(SDIR)/ListenClients.$(ARCH).o \
+$(SDIR)/server.$(ARCH).o \
+$(SDIR)/status_server.$(ARCH).o \
+$(SDIR)/init_server.$(ARCH).o \
 $(SDIR)/CheckPassword.$(ARCH).o
 

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

@@ -38 +38 @@
 }; 
 
-/* these are functions which duplicate actions on the 
-   controller.  these could simply pass the command along 
-   to the controller (and should then be in 'controller'),
-   or they could add / modify the jobs in the scheduler
-   job stack 
-
-  {"job",        job,          "add job"},
-  {"kill",       kill_sh,      "kill job"},
-  {"delete",     delete,       "delete job"},
-  {"stdout",     stdout_sh,    "get stdout buffer for job"},
-  {"stderr",     stderr_sh,    "get stderr buffer for job"},
-*/
-
 void InitPantasks () {
   
@@ -62 +49 @@
     AddCommand (&cmds[i]);
   }
-
 }
-
-int server         PROTO((int, char **));
-
-static Command server_cmds[] = {  
-  {"server",  server,   "server-specific commands"},
-}; 
-
-void InitPantasksServer () {
-  
-  int i;
-
-  InitTasks ();
-  InitJobs ();
-  InitJobIDs ();
-
-  for (i = 0; i < sizeof (cmds) / sizeof (Command); i++) {
-    AddCommand (&cmds[i]);
-  }
-  for (i = 0; i < sizeof (server_cmds) / sizeof (Command); i++) {
-    AddCommand (&server_cmds[i]);
-  }
-
-}

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

@@ -16 +16 @@
   InitData ();
   InitPantasks ();
+
+  gprintInit ();
 
   rl_readline_name = opihi_name;
@@ -54 +56 @@
   return;
 }
+
+/* call to opihi shell */
+int main (int argc, char **argv) {
+  int status;
+  status = opihi (argc, argv);
+  exit (status);
+}

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

@@ -24 +24 @@
 }
 
-void CheckTasksThread () {
+void CheckTasksThread (void *data) {
 
   gprintInit ();  // each thread needs to init the printing system
@@ -55 +55 @@
 }
 
-void CheckJobsThread () {
+void CheckJobsThread (void *data) {
 
   gprintInit ();  // each thread needs to init the printing system
@@ -86 +86 @@
 }
 
-void CheckControllerThread () {
+void CheckControllerThread (void *data) {
 
   gprintInit ();  // each thread needs to init the printing system
@@ -118 +118 @@
 }
 
-void CheckInputsThread () {
+void CheckInputsThread (void *data) {
 
   gprintInit ();  // each thread needs to init the printing system

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

@@ -14 +14 @@
     gprint (GP_LOG, " Controller is stopped\n");
   }
-  if (CheckTasksGetState()) {
-    gprint (GP_LOG, " Scheduler is running\n");
-  } else {
-    gprint (GP_LOG, " Scheduler is stopped\n");
-  }
-  if (CheckControllerGetState()) {
-    gprint (GP_LOG, " Controller is running\n");
-  } else {
-    gprint (GP_LOG, " Controller is stopped\n");
-  }
   ListTasks (FALSE);
   ListJobs ();
   return (TRUE);
 }
-

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

@@ -96 +96 @@
       case TASK_COMMAND:
       case TASK_PERIODS:
-        status = command (input, &outline);
+        status = command (input, &outline, TRUE);
         if (outline != NULL) free (outline);
         /* what to do if command is invalid?