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

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/pantasks

Files:

• InputQueue.c (added)
• Makefile (modified) (1 diff)
• pantasks_server.c (modified) (3 diffs)
• server.c (modified) (2 diffs)
• server_load.c (added)
• server_run.c (added)
• server_threads.c (added)
• status.c (modified) (1 diff)

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 {