Changeset 2336 for trunk

Timestamp:

Aug 8, 2011, 11:25:03 AM (13 years ago)

Author:

gah

Message:

 

Location:

trunk/packages/vizservers

Files:

• nanoscale/server.c (modified) (7 diffs)
• pymolproxy/pymolproxy.c (modified) (1 diff)

trunk/packages/vizservers/nanoscale/server.c

@@ -127 +127 @@
     }
   
-    INFO("processes=%d, memory=%d, load=%f\n",
-           children, memory_in_use, load);
+    INFO("processes=%d, memory=%d, load=%f\n", children, memory_in_use, load);
 
 }
@@ -159 +158 @@
 help(const char *argv0)
 {
-    INFO("Syntax: %s [-d] -b <broadcast port> -l <listen port> -s <subnet> -c 'command'\n",
+    printf("Syntax: %s [-d] -b <broadcast port> -l <listen port> -s <subnet> -c 'command'\n",
             argv0);
     exit(1);
@@ -433 +432 @@
             float peer_load = ntohl(buffer[0]);
             int peer_procs = ntohl(buffer[1]);
-            //INFO("Load for %s is %f (%d processes).\n",
-            //       inet_ntoa(peer_addr.sin_addr), peer_load, peer_procs);
             int h;
             int free_index=-1;
@@ -441 +438 @@
                 if (host_array[h].in_addr.s_addr == peer_addr.sin_addr.s_addr) {
                     if (host_array[h].children != peer_procs) {
-                        INFO("Load for %s is %f (%d processes).\n",
-                               inet_ntoa(peer_addr.sin_addr), peer_load, peer_procs);
+                        INFO("Load for %s is %f (%d processes).\n", inet_ntoa(peer_addr.sin_addr), peer_load, peer_procs);
                     }
                     host_array[h].load = peer_load;
@@ -498 +494 @@
                 load += 2*INITIAL_LOAD;
                 INFO("Accepted new job with memory %d\n", newmemory);
-                //INFO("My load is now %f\n", load);
               
                 // accept the connection.
@@ -560 +555 @@
                                 } else {
                                     INFO("started command \"%s\": %s\n", 
-                                          command_argv[n][0], strerror(errno));
-
+                                        command_argv[n][0], strerror(errno));
+                                }
                             }
                             _exit(errno);
@@ -567 +562 @@
                     }
                     _exit(EINVAL);
-                  
                 } else {
                     int c;

trunk/packages/vizservers/pymolproxy/pymolproxy.c

@@ -96 +96 @@
 
 static FILE *flog;
-static int debug = FALSE;
+static int debug = TRUE;
 static FILE *scriptFile;
 static int savescript = FALSE;