Changeset 7952

Timestamp:

Jul 23, 2006, 3:05:21 PM (20 years ago)

Author:

eugene

Message:

adding working threads to server/client mode

Location:

trunk/Ohana/src/opihi

Files:

• cmd.data/lookup.c (modified) (1 diff)
• doc/pantasks.txt (modified) (2 diffs)
• include/pantasks.h (modified) (1 diff)
• pantasks/InputQueue.c (added)
• pantasks/Makefile (modified) (1 diff)
• pantasks/pantasks_server.c (modified) (3 diffs)
• pantasks/server.c (modified) (2 diffs)
• pantasks/server_load.c (added)
• pantasks/server_run.c (added)
• pantasks/server_threads.c (added)
• pantasks/status.c (modified) (1 diff)

trunk/Ohana/src/opihi/cmd.data/lookup.c

@@ -3 +3 @@
 int lookup (int argc, char **argv) {
   
-  int i, Nbins, bin, N, Normalize;
-  float start, end, delta;
-  float *V, *K, *O, *NV;
-  Vector *val, *key, *out;
+  int i, j;
+  float *ip, *op, *xp, *yp;
+  Vector *in, *out, *xv, *yv;
 
   if (argc != 5) {

trunk/Ohana/src/opihi/doc/pantasks.txt

@@ +1 @@
+
+- todo:
+
+  - create the processing threads:
+    - check tasks
+    - check jobs
+    - check controller  
+    - load inputs
 
 - additional issues:
-
-  - missing dependency for shell.h?
-  - should not return an error message in client if command is not found
   - server input needs to place files for input on a stack which is 
     actually loaded by the RunScheduler loop
@@ -10 +15 @@
     be running multicommand, but it probably does not hurt.
     (the client is not allowed to send ';' to the server)
-  - the multicommand needs to be available in the 'for' and other loops
-    this probably means unifying the client and non-client forms.  
-    how does multiclient get the value of the server?  I tend to use
-    globals for things like that, which is probably not the best 
-    practice.  is the client form of the tool generic? are there other
-    circumstances which would use a client/server beyond pantasks?
-    maybe pcontrol?  
 
-    the two pieces of information which need to be carried to the
-    multicommand and command functions in client/server mode are the 
-    server socket and the verbosity of the error messages.  these could
-    be defined on startup with globals and an init function of some sort.
+  - pantasks input: this passes an 'input' command to the server, which
+    performs the input in a different thread.  is this the same thread
+    as the scheduler loop?  another option within the scheduler loop?
 
-I need to do some serious work on the output messages in order 
-to support the client/server interactions.  In client/server mode,
-all of the output messages to be sent back to the client need to be
-saved in a buffer and then pushed back to the client after the command
-is executed.  Currently, I can select only the output file pointer.
-this is not sufficient.  I need to supply a function which will write to 
-an internal buffer until a 'dump' function is called, or something
-equivalent.  
-
-in client/server mode, the commands issues by the client (except as noted 
-below) all return immediately.  The output produced by those commands
-is saved by the server until the command is finished, then the
-resulting buffered data is pushed back to the client.  There a few
-commands which behave a bit differently.  these commands are in the
-background thread of the scheduler.  the resulting output is sent to
-the logger device of the scheduler rather than back to any specific
-client.  should there be a way for the client(s) to examine the
-scheduler output? 
-
-- pantasks input: this passes an 'input' command to the server, which
-  performs the input in a different thread.  is this the same thread
-  as the scheduler loop?  another option within the scheduler loop?
-
-- run

trunk/Ohana/src/opihi/include/pantasks.h

@@ -213 +213 @@
 int gprintf (char *format, ...);
 */
+
+// functions related to the server threads
+void CheckTasksSetState (int state);
+int CheckTasksGetState ();
+void CheckTasksThread ();
+void CheckJobsSetState (int state);
+int CheckJobsGetState ();
+void CheckJobsThread ();
+void CheckControllerSetState (int state);
+int CheckControllerGetState ();
+void CheckControllerThread ();
+void CheckInputsSetState (int state);
+int CheckInputsGetState ();
+void CheckInputsThread ();
+
+// functions related to the queue of input files
+void InitInputs ();
+void AddNewInput (char *input);
+int DeleteInput (char *input);
+void CheckInputs ();
+
+void SerialThreadLock ();
+void SerialThreadUnlock ();

trunk/Ohana/src/opihi/pantasks/Makefile

@@ -74 +74 @@
 server = \
 $(SDIR)/pantasks_server.$(ARCH).o \
+$(SDIR)/server_threads.$(ARCH).o \
+$(SDIR)/server_run.$(ARCH).o \
+$(SDIR)/server_load.$(ARCH).o \
+$(SDIR)/InputQueue.$(ARCH).o \
 $(SDIR)/ListenClients.$(ARCH).o \
 $(SDIR)/CheckPassword.$(ARCH).o

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

@@ -16 +16 @@
 int main (int argc, char **argv) {
   
-  pthread_t thread;
+  pthread_t clientsThread;
+  pthread_t tasksThread;
+  pthread_t jobsThread;
+  pthread_t inputsThread;
+  pthread_t controllerThread;
   int InitSocket, BindSocket;
   SockAddress Address;
@@ -32 +36 @@
   
   gprintInit ();  // each thread needs to init the printing system
+  InitInputs ();
 
   signal (SIGPIPE, gotsignal);
@@ -38 +43 @@
   signal (SIGINT, SIG_DFL);
 
-  // startup (&argc, argv);
-
-  /* set up mechanisms for sharing data between the threads */
-  // init_data_handling ();
+  startup (&argc, argv);
 
   /* start up the background threads here */
-  pthread_create (&thread, NULL, &ListenClients, NULL);
-
-  // pthread_create (&thread, NULL, &RunScheduler, NULL);
-  // pthread_create (&thread, NULL, &RunController, NULL);
+  pthread_create (&clientsThread,    NULL, &ListenClients,         NULL);
+  pthread_create (&tasksThread,      NULL, &CheckTasksThread,      NULL);
+  pthread_create (&jobsThread,       NULL, &CheckJobsThread,       NULL);
+  pthread_create (&controllerThread, NULL, &CheckControllerThread, NULL);
+  pthread_create (&inputsThread,     NULL, &CheckInputsThread,     NULL);
 
   /* in this loop, we listen for incoming connections, validate, and

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

@@ -4 +4 @@
 int quit            PROTO((int, char **));
 int input           PROTO((int, char **));
+int server_load     PROTO((int, char **));
+int server_run      PROTO((int, char **));
+int server_stop     PROTO((int, char **));
 int cd              PROTO((int, char **));
 int pwd             PROTO((int, char **));
@@ -14 +17 @@
   {"quit",   quit,   "shutdown server"},
   {"input",  input,  "load input file on server"},
+  {"load",   server_load, "load input file on server"},
+  {"run",    server_run,  "run scheduler"},
+  {"stop",   server_stop, "stop scheduler"},
   {"cd",     cd,     "set local directory"},
   {"pwd",    pwd,    "check local directory"},

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

@@ -9 +9 @@
     gprint (GP_LOG, " Scheduler is running\n");
   }
-  if (CheckControllerStatus ()) {
+  if (CheckControllerStatus()) {
+    gprint (GP_LOG, " Controller is running\n");
+  } else {
+    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 {