[netperf-dev] netperf4 commit notice r228 - in trunk: . src

[raj at netperf.org]

Author: raj
Date: 2007-07-11 13:25:58 -0700 (Wed, 11 Jul 2007)
New Revision: 228

Modified:
   trunk/AUTHORS
   trunk/config.h.in
   trunk/src/netsysstats_linux.c
Log:
misc fixes and cleanups

Modified: trunk/AUTHORS
===================================================================
--- trunk/AUTHORS	2007-06-14 22:54:52 UTC (rev 227)
+++ trunk/AUTHORS	2007-07-11 20:25:58 UTC (rev 228)
@@ -28,4 +28,7 @@
 For consumate patience in matters concerning glib-2.0 under Windows
 
 Daniel Veillard
-For consumate patience in patters concerning libxml2 in general
\ No newline at end of file
+For consumate patience in patters concerning libxml2 in general
+
+Preethi Natarajan
+Various bug fixes
\ No newline at end of file

Modified: trunk/config.h.in
===================================================================
--- trunk/config.h.in	2007-06-14 22:54:52 UTC (rev 227)
+++ trunk/config.h.in	2007-07-11 20:25:58 UTC (rev 228)
@@ -39,9 +39,6 @@
 /* Define to 1 if you have the `gettimeofday' function. */
 #undef HAVE_GETTIMEOFDAY
 
-/* Define to one to include ICSC-EXS tests. */
-#undef HAVE_ICSC_EXS
-
 /* Define to 1 if you have the `inet_ntoa' function. */
 #undef HAVE_INET_NTOA
 
@@ -51,9 +48,6 @@
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
-/* Define to 1 if you have the `exs' library (-lexs). */
-#undef HAVE_LIBEXS
-
 /* Define to 1 if you have the `kstat' library (-lkstat). */
 #undef HAVE_LIBKSTAT
 
@@ -69,15 +63,9 @@
 /* Define to 1 if you have the `perfstat' library (-lperfstat). */
 #undef HAVE_LIBPERFSTAT
 
-/* Define to 1 if you have the `sctp' library (-lsctp). */
-#undef HAVE_LIBSCTP
-
 /* Define to 1 if you have the `socket' library (-lsocket). */
 #undef HAVE_LIBSOCKET
 
-/* Define to 1 if you have the `xti' library (-lxti). */
-#undef HAVE_LIBXTI
-
 /* Define to 1 if you have the <limits.h> header file. */
 #undef HAVE_LIMITS_H
 
@@ -105,9 +93,6 @@
 /* Define to 1 if you have the <netinet/in.h> header file. */
 #undef HAVE_NETINET_IN_H
 
-/* Define to 1 if you have the <netinet/sctp.h> header file. */
-#undef HAVE_NETINET_SCTP_H
-
 /* Define to 1 if you have the <netinet/tcp.h> header file. */
 #undef HAVE_NETINET_TCP_H
 
@@ -210,9 +195,6 @@
 /* Define to 1 if you have the <sys/uio.h> header file. */
 #undef HAVE_SYS_UIO_H
 
-/* Define to 1 if you have the `uname' function. */
-#undef HAVE_UNAME
-
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
@@ -282,9 +264,6 @@
 /* Define to one to enable demo support. May affect results. */
 #undef WANT_DEMO
 
-/* Define to one to include DLPI tests. */
-#undef WANT_DLPI
-
 /* Define to one to enable initial _RR burst support. May affect results. */
 #undef WANT_FIRST_BURST
 
@@ -294,15 +273,6 @@
 /* Define to one to enable paced operation support. May affect results. */
 #undef WANT_INTERVALS
 
-/* Define to one to include SCTP tests. */
-#undef WANT_SCTP
-
-/* Define to one to include Unix Domain socket tests. */
-#undef WANT_UNIX
-
-/* Define to one to include XTI tests. */
-#undef WANT_XTI
-
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const
 

Modified: trunk/src/netsysstats_linux.c
===================================================================
--- trunk/src/netsysstats_linux.c	2007-06-14 22:54:52 UTC (rev 227)
+++ trunk/src/netsysstats_linux.c	2007-07-11 20:25:58 UTC (rev 228)
@@ -179,10 +179,18 @@
   }
   /* Skip first line (total) on SMP */
   if (tsd->num_cpus > 1) p = strchr (p, '\n');
+
+  /* PN:
+   * p points to '\n'. Move to next char for per cpu info 
+   */
+  p++; 
   
-  
   for (i = 0; i < tsd->num_cpus; i++) {
-    records = sscanf(proc_stat_buf,
+    /* PN:
+     * p points to the right record, not proc_stat_buf
+     */
+    /* records = sscanf(proc_stat_buf, */
+    records = sscanf(p,
 		     "%s %lld %lld %lld %lld",
 		     cpunam,
 		     &(res[i].user),
@@ -222,5 +230,9 @@
 	      res[i].interrupt);
     }
     p = strchr(p, '\n');
+    /* PN:
+     * p points to the right record, not proc_stat_buf
+     */
+    p++;
   }
 }