Better output in batcher

Author: j-woz

lb/code/apps/batcher.c

@@ -51,12 +51,14 @@ put_commands(int argc, char** argv)
     ADLB_Fail(-1);
   }
 
-  printf("command file is %s\n", argv[1]);
+  printf("command file is '%s'\n", argv[1]);
+  fflush(stdout);
 
   FILE* fp = fopen(argv[1], "r");
   if (fp == NULL)
   {
     printf("could not open command file\n");
+    fflush(stdout);
     ADLB_Fail(-1);
   }
 
@@ -70,10 +72,11 @@ put_commands(int argc, char** argv)
       /* put command into adlb here */
       int rc = ADLB_Put(cmdbuffer, strlen(cmdbuffer)+1, ADLB_RANK_ANY,
                     -1, CMDLINE, ADLB_DEFAULT_PUT_OPTS);
-      printf("put cmd, rc = %d\n", rc);
+      // printf("put cmd, rc = %d\n", rc);
     }
   }
   printf("\nall commands submitted\n");
+  fflush(stdout);
   fclose(fp);
 }
 
@@ -106,12 +109,12 @@ worker_loop(void)
 
     if (rc == ADLB_SHUTDOWN)
     {
-      printf("All jobs done\n");
       break;
     }
 
     chomp(payload);
     printf("executing command line '%s'\n", (char*) payload);
+    fflush(stdout);
     rc = system(payload);
     if (payload != buffer)
       free(payload);
@@ -132,9 +135,6 @@ main(int argc, char *argv[])
   int num_types = 1;
   int type_vect[2] = { CMDLINE };
 
-
-  printf("batcher...\n");
-
   rc = MPI_Init( &argc, &argv );
   assert(rc == MPI_SUCCESS);
 
@@ -156,7 +156,9 @@ main(int argc, char *argv[])
   if (am_server)
   {
     // server rank
+    printf("batcher server...\n");
     ADLB_Server(3000000);
+    printf("batcher server done.\n");
   }
   else
   {
@@ -172,7 +174,7 @@ main(int argc, char *argv[])
     if (worker_rank == 0)
     {
       double end_time = MPI_Wtime();
-      printf("TOOK: %.3f\n", end_time-start_time);
+      printf("worker time: %.3f\n", end_time-start_time);
     }
   }