Changeset 6623 for nanoscale

Timestamp:

Nov 14, 2016 1:17:38 PM (8 years ago)

Author:

ldelgass

Message:

Merge selected nanoscale changes from trunk (by hand)

Location:

nanoscale/branches/1.0

Files:

• Makefile.in (modified) (4 diffs)
• server.c (modified) (10 diffs)

nanoscale/branches/1.0/Makefile.in

@@ +1 @@
+WANT_TRACE      = #yes
 
 CC              = @CC@
@@ -33 +34 @@
 SVN_VERSION     = $(shell svnversion $(srcdir) | sed 's/Unversioned directory/unknown/')
 
-DEFINES         = -DSERVERSFILE=\"$(libdir)/renderservers.tcl\" \
+ifdef WANT_TRACE
+DEFINES         = -DWANT_TRACE
+endif
+CONFIGFILE      = renderservers.tcl
+DEFINES         += -DSERVERSFILE=\"$(libdir)/$(CONFIGFILE)\" \
                 -DSVN_VERSION=\"$(SVN_VERSION)\" \
                 -DLOGDIR=\"$(LOGDIR)\" 
@@ -49 +54 @@
         $(CC) $(CC_SWITCHES) -o $@ $^ $(LIBS)
 
-install: nanoscale renderservers.tcl start_nanoscale.sh
+install: nanoscale $(CONFIGFILE) start_nanoscale.sh
         $(INSTALL_PROGRAM) -D nanoscale $(bindir)/nanoscale
         $(INSTALL_PROGRAM) start_nanoscale.sh $(bindir)/start_nanoscale.sh
-        $(INSTALL_SCRIPT) renderservers.tcl $(libdir)
+        $(INSTALL_DATA) $(CONFIGFILE) $(libdir)
 
 client: $(CLIENT_OBJS)
@@ -64 +69 @@
 distclean: clean
         $(RM) -r autom4te.cache
-        $(RM) Makefile config.cache config.log config.status config.h renderservers.tcl start_nanoscale.sh
+        $(RM) Makefile config.cache config.log config.status config.h $(CONFIGFILE) start_nanoscale.sh
 

nanoscale/branches/1.0/server.c

@@ -1 +1 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /* ======================================================================
- *  Copyright (c) 2004-2014  HUBzero Foundation, LLC
+ *  Copyright (c) 2004-2016  HUBzero Foundation, LLC
  * ----------------------------------------------------------------------
  *  See the file "license.terms" for information on usage and
@@ -40 +40 @@
 
 #define ERROR(...)      SysLog(LOG_ERR, __FILE__, __LINE__, __VA_ARGS__)
-#define TRACE(...)      SysLog(LOG_DEBUG, __FILE__, __LINE__, __VA_ARGS__)
 #define WARN(...)       SysLog(LOG_WARNING, __FILE__, __LINE__, __VA_ARGS__)
 #define INFO(...)       SysLog(LOG_INFO, __FILE__, __LINE__, __VA_ARGS__)
+#ifdef WANT_TRACE
+#define TRACE(...)      SysLog(LOG_DEBUG, __FILE__, __LINE__, __VA_ARGS__)
+#else
+#define TRACE(...) 
+#endif
 
 static const char *syslogLevels[] = {
@@ -90 +94 @@
 
 static void
+Help(const char *program)
+{
+    fprintf(stderr,
+        "Syntax: %s [-d] [-f serversFile] [-x numVideoCards]\n", program);
+    exit(1);
+}
+
+static void
+InitLog()
+{
+    openlog("nanoscale", LOG_CONS | LOG_PID, LOG_USER);
+}
+
+static void
 SysLog(int priority, const char *path, int lineNum, const char* fmt, ...)
 {
@@ -105 +123 @@
         s++;
     }
-    length = snprintf(message, MSG_LEN, "nanoscale (%d %d) %s: %s:%d ",
-        serverPid, getpid(), syslogLevels[priority],  s, lineNum);
+    if (serverPid != getpid()) {
+        length = snprintf(message, MSG_LEN, "(%d) %s: %s:%d ",
+                          serverPid, syslogLevels[priority], s, lineNum);
+    } else {
+        length = snprintf(message, MSG_LEN, "%s: %s:%d ",
+                          syslogLevels[priority], s, lineNum);
+    }
     length += vsnprintf(message + length, MSG_LEN - length, fmt, lst);
     message[MSG_LEN] = '\0';
@@ -114 +137 @@
         syslog(priority, message, length);
     }
-}
-
-static void
-Help(const char *program)
-{
-    fprintf(stderr,
-        "Syntax: %s [-d] [-f serversFile] [-x numVideoCards]\n", program);
-    exit(1);
 }
 
@@ -360 +375 @@
     Tcl_DeleteInterp(interp);
     return TRUE;
+}
+
+static void
+InitServerTable()
+{
+    Tcl_InitHashTable(&serverTable, TCL_ONE_WORD_KEYS);
 }
 
@@ -388 +409 @@
 
     strcpy(display, ":0.0");
-    Tcl_InitHashTable(&serverTable, TCL_ONE_WORD_KEYS);
+    InitLog();
+    InitServerTable();
 
     /* Process command line switches. */
@@ -438 +460 @@
     serverPid = getpid();
     if (!ParseServersFile(fileName)) {
+        ERROR("Exiting on invalid configuration");
         exit(1);
     }
@@ -645 +668 @@
                 /* Set the configured environment */
                 for (i = 0; i < serverPtr->numEnvArgs; i += 2) {
+                    INFO("Env: %s=%s", serverPtr->envArgs[i],
+                         serverPtr->envArgs[i+1]);
                     setenv(serverPtr->envArgs[i], serverPtr->envArgs[i+1], 1);
                 }
-                { 
+                {
                     char *cmd;
 
@@ -655 +680 @@
                          serverPtr->name, inet_ntoa(newaddr.sin_addr),
                          cmd, serverPtr->inputFd, serverPtr->outputFd, display);
+                    Tcl_Free(cmd);
                     /* Replace the current process with the render server. */
                     execvp(serverPtr->cmdArgs[0], serverPtr->cmdArgs);
-                    ERROR("Can't execute \"%s\": %s", cmd, strerror(errno));
-                    Tcl_Free(cmd);
+                    ERROR("Can't execute \"%s\": %s", serverPtr->cmdArgs[0],
+                          strerror(errno));
                     exit(1);
                 }