Changeset 16903

Timestamp:

Mar 9, 2008, 11:05:49 AM (18 years ago)

Author:

eugene

Message:

better handling for client / server connect / disconnect / shutdown

Location:

trunk/Ohana/src/opihi

Files:

• lib.shell/multicommand.c (modified) (3 diffs)
• pantasks/ListenClients.c (modified) (1 diff)
• pantasks/Makefile (modified) (1 diff)
• pantasks/init_client.c (modified) (1 diff)
• pantasks/init_server.c (modified) (2 diffs)
• pantasks/server_connect.c (added)
• pantasks/server_disconnect.c (added)
• pantasks/server_shutdown.c (added)

trunk/Ohana/src/opihi/lib.shell/multicommand.c

@@ -3 +3 @@
 static int server = 0;
 static int bufferPending = FALSE;
+
+int getServer () {
+  return (server);
+}
 
 // XXX this is rather pantasks-specific...
@@ -28 +32 @@
   SendCommand (server, strlen(PASSWORD), PASSWORD);
   
+  return;
+}
+
+// close connection with remote server
+void multicommand_StopServer () {
+
+  if (!server) return;
+  close (server);
+  server = 0;
   return;
 }
@@ -58 +71 @@
       if (bufferPending) {
         // flush old messages
-        while (ExpectMessage (server, 0.2, &message));
+        ExpectMessage (server, 0.2, &message);
         bufferPending = FALSE;
       }

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

@@ -1 +1 @@
 # include "pantasks.h"
-# define DEBUG 0
+# define DEBUG 1
 
 static int NCLIENTS;

trunk/Ohana/src/opihi/pantasks/Makefile

@@ -23 +23 @@
 $(SRC)/client_shell.$(ARCH).o \
 $(SRC)/invalid.$(ARCH).o \
+$(SRC)/server_shutdown.$(ARCH).o \
+$(SRC)/server_disconnect.$(ARCH).o \
+$(SRC)/server_connect.$(ARCH).o \
 $(SRC)/init_client.$(ARCH).o
 

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

@@ -1 +1 @@
 # include "pantasks.h"
 
-int invalid         PROTO((int, char **));
+int invalid           PROTO((int, char **));
+int server_shutdown   PROTO((int, char **));
+int server_disconnect PROTO((int, char **));
+int server_connect    PROTO((int, char **));
 
-/* we list here commands which are not valid for the client, 
-   but represent valid pantasks commands.  these are caught 
-   by the client and sent to the 'invalid' function */
+/* we also list here commands which are not valid for the client, but represent valid
+   pantasks commands.  these are caught by the client and sent to the 'invalid'
+   function */
 
 static Command cmds[] = {  
-  {1, "task",       invalid,  "define a schedulable task"},
-  {1, "task.exit",  invalid,  "define exit macros for a task"},
-  {1, "task.exec",  invalid,  "define pre-exec macro for a task"},
+  {1, "task",       invalid,     "define a schedulable task"},
+  {1, "task.exit",  invalid,     "define exit macros for a task"},
+  {1, "task.exec",  invalid,     "define pre-exec macro for a task"},
+
+  {1, "shutdown",   server_shutdown,   "send exit signal to server"},
+  {1, "disconnect", server_disconnect, "close connection to server"},
+  {1, "connect",    server_connect,    "open connection to server"},
+
 }; 
 

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

@@ -25 +25 @@
 int ipptool2book    PROTO((int, char **));
 
+int server_run      PROTO((int, char **));
+int server_stop     PROTO((int, char **));
+int server_halt     PROTO((int, char **));
+
 static Command cmds[] = {  
   {1, "active",     task_active,   "set the active state of a task"},
@@ -50 +54 @@
   {1, "verbose",    verbose,       "set/toggle verbose mode"},
   {1, "version",    version,       "show version information"},
+
+  {1, "run",        server_run,    "run scheduler"},
+  {1, "stop",       server_stop,   "stop scheduler"},
+  {1, "halt",       server_halt,   "halt scheduler"},
 };