Changeset 2334 for trunk/packages/vizservers

Timestamp:

Aug 8, 2011 9:05:38 AM (13 years ago)

Author:

gah

Message:

 

File:

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

trunk/packages/vizservers/nanoscale/server.c

@@ -127 +127 @@
     }
   
-    printf("processes=%d, memory=%d, load=%f\n",
+    INFO("processes=%d, memory=%d, load=%f\n",
            children, memory_in_use, load);
 
@@ -139 +139 @@
             child_array[c].requests += value;
 #ifdef DEBUGGING
-            printf("Updating requests from pipefd %d to %f\n",
+            INFO("Updating requests from pipefd %d to %f\n",
                    child_array[c].pipefd,
                    child_array[c].requests);
@@ -406 +406 @@
                 }
               
-                printf("New connection from %s\n", inet_ntoa(newaddr.sin_addr));
+                INFO("New connection from %s\n", inet_ntoa(newaddr.sin_addr));
                 FD_SET(newfd, &saved_rfds);
                 maxfd = max(maxfd, newfd);
@@ -433 +433 @@
             float peer_load = ntohl(buffer[0]);
             int peer_procs = ntohl(buffer[1]);
-            //printf("Load for %s is %f (%d processes).\n",
+            //INFO("Load for %s is %f (%d processes).\n",
             //       inet_ntoa(peer_addr.sin_addr), peer_load, peer_procs);
             int h;
@@ -441 +441 @@
                 if (host_array[h].in_addr.s_addr == peer_addr.sin_addr.s_addr) {
                     if (host_array[h].children != peer_procs) {
-                        printf("Load for %s is %f (%d processes).\n",
+                        INFO("Load for %s is %f (%d processes).\n",
                                inet_ntoa(peer_addr.sin_addr), peer_load, peer_procs);
                     }
@@ -498 +498 @@
                 load += 2*INITIAL_LOAD;
                 INFO("Accepted new job with memory %d\n", newmemory);
-                //printf("My load is now %f\n", load);
+                //INFO("My load is now %f\n", load);
               
                 // accept the connection.
@@ -558 +558 @@
                                     ERROR("can't execute \"%s\": %s\n", 
                                           command_argv[n][0], strerror(errno));
-                                }
+                                } else {
+                                    INFO("started command \"%s\": %s\n", 
+                                          command_argv[n][0], strerror(errno));
+
                             }
                             _exit(errno);