Changeset 2333

Timestamp:

Aug 5, 2011, 3:23:31 PM (13 years ago)

Author:

gah

Message:

 

File:

• trunk/packages/vizservers/nanoscale/server.c (modified) (11 diffs)

trunk/packages/vizservers/nanoscale/server.c

@@ -76 +76 @@
 
 
+#include <syslog.h>
+#include <stdarg.h>
+
+#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__)
+
+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';
+    syslog(priority, message, length);
+}
+
 static void
 close_child(int pipe_fd)
@@ -125 +159 @@
 help(const char *argv0)
 {
-    fprintf(stderr,
-            "Syntax: %s [-d] -b <broadcast port> -l <listen port> -s <subnet> -c 'command'\n",
+    INFO("Syntax: %s [-d] -b <broadcast port> -l <listen port> -s <subnet> -c 'command'\n",
             argv0);
     exit(1);
@@ -183 +216 @@
             maxCards = strtoul(optarg, 0, 0);
             if ((maxCards < 1) || (maxCards > 10)) {
-                fprintf(stderr, "bad number of max videocards specified\n");
+                ERROR("bad number of max videocards specified\n");
                 return 1;
             }
@@ -197 +230 @@
 
             if (listen_port[nservices] == -1) {
-                fprintf(stderr,"Must specify -l port before each -c command.\n");
+                ERROR("Must specify -l port before each -c command.\n");
                 return 1;
             }
@@ -210 +243 @@
             send_addr.sin_addr.s_addr = htonl(inet_network(optarg));
             if (send_addr.sin_addr.s_addr == -1) {
-                fprintf(stderr,"Invalid subnet broadcast address");
+                ERROR("Invalid subnet broadcast address");
                 return 1;
             }
             break;
         default:
-            fprintf(stderr,"Don't know what option '%c'.\n", c);
+            ERROR("Don't know what option '%c'.\n", c);
             return 1;
         }
@@ -224 +257 @@
         int i;
         for (i = 0; i < argc; i++) {
-            fprintf(stderr, "argv[%d]=(%s)\n", i, argv[i]);
+            INFO("argv[%d]=(%s)\n", i, argv[i]);
         }
         help(argv[0]);
@@ -395 +428 @@
             }
             if (status != 8) {
-                fprintf(stderr,"Bogus message from %s\n",
-                        inet_ntoa(peer_addr.sin_addr));
+                ERROR("Bogus message from %s\n", inet_ntoa(peer_addr.sin_addr));
                 continue;
             }
@@ -453 +485 @@
                 status = read(i, &msg, 4);
                 if (status != 4) {
-                    fprintf(stderr,"Bad status on read (%d).", status);
+                    ERROR("Bad status on read (%d).", status);
                     FD_CLR(i, &saved_rfds);
                     clear_service_fd(i);
@@ -465 +497 @@
                 memory_in_use += newmemory;
                 load += 2*INITIAL_LOAD;
-                printf("Accepted new job with memory %d\n", newmemory);
+                INFO("Accepted new job with memory %d\n", newmemory);
                 //printf("My load is now %f\n", load);
               
@@ -471 +503 @@
                 msg = 0;
                 if (write(i, &msg, 4) != 4) {
-                    fprintf(stderr, "short write for hostname\n");
+                    ERROR("short write for hostname\n");
                 }
               
@@ -521 +553 @@
                                     displayVar[11] = dispNum + '0';
                                 }
-                                execvp(command_argv[n][0], command_argv[n]);
+                                if (execvp(command_argv[n][0], command_argv[n]) < 1) {
+                                    extern int errno;
+
+                                    ERROR("can't execute \"%s\": %s\n", 
+                                          command_argv[n][0], strerror(errno));
+                                }
                             }
                             _exit(errno);