Changeset 2340

Timestamp:

Aug 9, 2011 8:10:45 PM (13 years ago)

Author:

gah

Message:

 

File:

• branches/blt4/packages/vizservers/nanoscale/server2.c (modified) (11 diffs)

branches/blt4/packages/vizservers/nanoscale/server2.c

@@ -3 +3 @@
 #include <unistd.h>
 #include <stdlib.h>
-#include <string.h>
 #include <signal.h>
 #include <sys/types.h>
@@ -15 +14 @@
 #include <getopt.h>
 #include <errno.h>
-
+#include <syslog.h>
+#include <stdarg.h>
+#include <tcl.h>
+
+#define TRUE    1
+#define FALSE   0
+#define DEF_SERVERS  "/opt/hubzero/rappture/render/lib/servers.cf"
+
+#define ERROR(...)      LogMessage(LOG_ERR, __FILE__, __LINE__, __VA_ARGS__)
+#ifdef WANT_TRACE
+#define TRACE(...)      LogMessage(LOG_DEBUG, __FILE__, __LINE__, __VA_ARGS__)
+#else
+#define TRACE(...) 
+#endif
+#define WARN(...)       LogMessage(LOG_WARNING, __FILE__, __LINE__, __VA_ARGS__)
+#define INFO(...)       LogMessage(LOG_INFO, __FILE__, __LINE__, __VA_ARGS__)
+
+typedef struct {
+    const char *name;                   /* Name of server. */
+    int port;                           /* Port to listen to. */
+    int argc;                           /* # of args in command.  */
+    char **argv;                        /* Command to execute for server. */
+    int listenerFd;                     /* Descriptor the of listener socket. */
+} RenderServer;
+
+static Tcl_HashTable serverTable;
+static int debugFlag = FALSE;
+
+void
+LogMessage(int priority, const char *path, int lineNum, const char* fmt, ...)
+{
+#define MSG_LEN (2047)
+    char message[MSG_LEN+1];
+    const char *s;
+    int length;
+    va_list lst;
+
+    va_start(lst, fmt);
+    s = strrchr(path, '/');
+    if (s == NULL) {
+        s = path;
+    } else {
+        s++;
+    }
+    length = snprintf(message, MSG_LEN, "line %d of \"%s\": ", lineNum, s);
+    length += vsnprintf(message + length, MSG_LEN - length, fmt, lst);
+    message[MSG_LEN] = '\0';
+    if (debugFlag) {
+        fprintf(stderr, "%s\n", message);
+    } else {
+        syslog(priority, message, length);
+    }
+}
 
 static void 
@@ -24 +75 @@
     exit(1);
 }
-
-typedef struct {
-    const char *name;
-    int port;
-    int argc;
-    char **argv;
-    int f;
-} RenderServer;
-
-static Tcl_HashTable serverTable;
 
 static int
@@ -78 +119 @@
   
     // If program is killed, drop the socket address reservation immediately.
-    bool = 1;
+    bool = TRUE;
     status = setsockopt(f, SOL_SOCKET, SO_REUSEADDR, &bool, sizeof(bool));
     if (status < 0) {
@@ -134 +175 @@
 
 int 
-main(int argc, char *argv[])
+main(int argc, char **argv)
 {
     int status;
     struct sockaddr_in recvAddr;
     int serverFds[FD_SETSIZE];
-    int recvPort;
     int n;
-    char displayVar[200];
+    char displaySetting[200];
     int maxCards;
     int dispNum;
     Tcl_HashEntry *hPtr;
     Tcl_HashSearch iter;
+    const char *fileName;
 
     dispNum = 0;
     maxCards = 1;
-    recvPort = 2000;
-    debug_flags = FALSE;
-    strcpy(displayVar, "DISPLAY=:0.0");
-    if (putenv(displayVar) < 0) {
+    fileName = DEF_SERVERS;
+    debugFlags = FALSE;
+    strcpy(displaySetting, "DISPLAY=:0.0");
+    if (putenv(displaySetting) < 0) {
         ERROR("can't set DISPLAY variable: ", strerror(errno));
         exit(1);
@@ -171 +212 @@
 
         switch(c) {
-        case 'x': /* Number of video cards */
+        case 'x':                       /* Number of video cards */
             maxCards = strtoul(optarg, 0, 0);
             if ((maxCards < 1) || (maxCards > 10)) {
@@ -178 +219 @@
             }
             break;
-        case 'd':
-            debug_flag = 1;
+        case 'd':                       /* Debug  */
+            debugFlag = 1;
             break;
-        case 'p':
-            recvPort = strtoul(optarg, 0, 0);
-            break;
-
-        case 'f':
+
+        case 'f':                       /* Server files */
             fileName = strdup(optarg);
             break;
@@ -191 +229 @@
         default:
             fprintf(stderr,"Don't know what option '%c'.\n", c);
-            help(argv[0]);
+            Help(argv[0]);
             return 1;
         }
     }
+
+    if (!ParseServersFile(fileName)) {
+        exit(1);
+    }    
 
     if (serverTable.numEntries == 0) {
@@ -201 +243 @@
     }
 
-    if (!ParseServersFile(fileName)) {
-        exit(1);
-    }    
-
-    // Bind this address to the socket.
-    recvAddr.sin_family = AF_INET;
-    recvAddr.sin_port = htons(recvPort);
-    recvAddr.sin_addr.s_addr = htonl(INADDR_ANY);
-
-    status = bind(sendFd, (struct sockaddr *)&recvAddr, sizeof(recvAddr));
-    if (status < 0) {
-        ERROR("can't bind to address: ", strerror(errno));
-        exit(1);
-    }
-
-    if (!debug_flag) {
+
+    if (!debugFlag) {
         if (daemon(0,1) < 0) {
             ERROR("can't daemonize nanoscale: ", strerror(errno));
@@ -273 +301 @@
 
                     /* Child process. */
-                    if (!debug_flag) {
+                    if (!debugFlag) {
                         /* Disassociate server from */
                         status = daemon(0,1);
@@ -288 +316 @@
                     }
                     if (maxCards > 1) {
-                        displayVar[11] = dispNum + '0';
+                        displaySetting[11] = dispNum + '0';
                     }
+                    INFO("%s: client %s connecting to display %d",  
+                        serverPtr->name, inet_ntoa(newaddr.sin_addr), dispNum);
                     status = execvp(serverPtr->argv[0], serverPtr->argv);
                     ERROR("can't execute \"", serverPtr->argv[0],