[netperf-dev] netperf4 commit notice r115 - branches/glib_migration/src

[raj at netperf.org]

Author: raj
Date: 2006-03-29 22:13:37 -0800 (Wed, 29 Mar 2006)
New Revision: 115

Modified:
   branches/glib_migration/src/netperf.c
   branches/glib_migration/src/netserver.c
Log:
Minor output cleanup


Modified: branches/glib_migration/src/netperf.c
===================================================================
--- branches/glib_migration/src/netperf.c	2006-03-30 05:54:34 UTC (rev 114)
+++ branches/glib_migration/src/netperf.c	2006-03-30 06:13:37 UTC (rev 115)
@@ -771,10 +771,6 @@
 			error->message);
 	      g_clear_error(&error);
 	    }
-	    g_fprintf(where,
-		      "status after set flags %d new_server->source %p\n",
-		      status,
-		      new_server->source);
     
 	    status = g_io_channel_set_encoding(new_server->source,NULL,&error);
 	    if (error) {
@@ -2061,8 +2057,6 @@
      end of default command file commands */
 
   /* parse command file */
-  fprintf(where,"parsing command file %s\n",iname);
-  fflush(where);
   commands = parse_xml_file(iname, (const xmlChar *)"commands", &doc);
 
   /* execute commands and events in a loop */

Modified: branches/glib_migration/src/netserver.c
===================================================================
--- branches/glib_migration/src/netserver.c	2006-03-30 05:54:34 UTC (rev 114)
+++ branches/glib_migration/src/netserver.c	2006-03-30 06:13:37 UTC (rev 115)
@@ -1118,7 +1118,6 @@
 		error->message);
       g_clear_error(&error);
     }
-    g_fprintf(where,"status after set flags %d control_channel %p\n",status,control_channel);
     
     status = g_io_channel_set_encoding(control_channel,NULL,&error);
     if (error) {
@@ -1129,8 +1128,6 @@
       g_clear_error(&error);
     }
     
-    g_fprintf(where,"status after set_encoding %d\n",status);
-    
     g_io_channel_set_buffered(control_channel,FALSE);
     
     /* loop is passed just to have something passed */
@@ -1138,11 +1135,8 @@
 			      G_IO_IN | G_IO_PRI | G_IO_ERR | G_IO_HUP,
 			      accept_connection,
 			      global_state_ptr);
-    g_fprintf(where,"added watch id %d\n",watch_id);
 
-    g_fprintf(where,"Starting loop to accept stuff...\n");
     g_main_loop_run(loop);
-    g_fprintf(where,"Came out of the main loop\n");
 
   }
   else {
@@ -1163,7 +1157,6 @@
 		error->message);
       g_clear_error(&error);
     }
-    g_fprintf(where,"status after set flags %d control_channel %p\n",status,control_channel);
     
     status = g_io_channel_set_encoding(control_channel,NULL,&error);
     if (error) {
@@ -1174,8 +1167,6 @@
       g_clear_error(&error);
     }
     
-    g_fprintf(where,"status after set_encoding %d\n",status);
-    
     g_io_channel_set_buffered(control_channel,FALSE);
     
     /* loop is passed just to have something passed */
@@ -1183,14 +1174,11 @@
 			      G_IO_IN | G_IO_PRI | G_IO_ERR | G_IO_HUP,
 			      read_from_control_connection,
 			      global_state_ptr);
-    g_fprintf(where,"added watch id %d\n",watch_id);
 
-    g_fprintf(where,"Starting loop to process stuff...\n");
     g_timeout_add(1000,
 		  (GSourceFunc)check_test_state_callback,
 		  global_state_ptr);
     g_main_loop_run(loop);
-    g_fprintf(where,"Came out of the main loop\n");
   }
   return(0);
 }