[netperf-dev] netperf4 commit notice r56 - trunk/src

[burger at netperf.org]

Author: burger
Date: 2006-01-30 11:40:36 -0800 (Mon, 30 Jan 2006)
New Revision: 56

Modified:
   trunk/src/netlib.c
Log:
submit changes to not reference bsd counters in report_test_state.

Stephen Burger




Modified: trunk/src/netlib.c
===================================================================
--- trunk/src/netlib.c	2006-01-27 05:09:12 UTC (rev 55)
+++ trunk/src/netlib.c	2006-01-30 19:40:36 UTC (rev 56)
@@ -335,26 +335,15 @@
   char        current[8];
   char        requested[8];
   char        reported[8];
-  double       a=-1.0,b=-1.0,c=-1.0,d=-1.0;
 
-  my_data = (bsd_data_t *)test->test_specific_data;
-  /* of course, there can be times when we don't yet have a my_data?
-     so, we best not be trying to dereference that pointer had we?!?
-     raj 2005-10-27 */
-  if (my_data) {
-    a    = my_data->stats.counter[0];
-    b    = my_data->stats.counter[1];
-    c    = my_data->stats.counter[2];
-    d    = my_data->stats.counter[3];
-  }
       
   test_state_to_string(test->state,     reported );
   test_state_to_string(test->new_state, current  );
   test_state_to_string(test->state_req, requested);
 
-  fprintf(where,"%4s %4s %15s %4s %4s %4s %8g %8g %8g %8g %d\n",
+  fprintf(where,"%4s %4s %15s  %4s %4s %4s\n",
           test->server_id,test->id,test->test_name,
-          reported, current, requested, a, b, c, d, test->tid);
+          reported, current, requested);
   fflush(where);
 }
 
@@ -366,9 +355,8 @@
   test_t      *test;
   int          i;
 
-  fprintf(where,"\n\n%4s %4s %15s %4s %4s %4s %8s %8s %8s %8s\n",
-          "srvr","tst","test_name","CURR","TEST","RQST",
-          "cnt1","cnt2","cnt3","cnt4");
+  fprintf(where,"\n\n%4s %4s %15s  %4s %4s %4s\n",
+          "srvr","tst","test_name","CURR","TEST","RQST");
   for (i = 0; i < TEST_HASH_BUCKETS; i ++) {
     h = &test_hash[i];
     ret = pthread_mutex_lock(&h->hash_lock);