[netperf-dev] netperf2 commit notice r147 - in trunk: . src
raj at netperf.org
raj at netperf.org
Wed Oct 17 14:20:44 PDT 2007
Author: raj
Date: 2007-10-17 14:20:43 -0700 (Wed, 17 Oct 2007)
New Revision: 147
Modified:
trunk/Release_Notes
trunk/configure
trunk/configure.ac
trunk/src/netlib.c
trunk/src/netlib.h
trunk/src/netserver.c
trunk/src/nettest_bsd.c
Log:
getting close to releasing 2.4.2
Modified: trunk/Release_Notes
===================================================================
--- trunk/Release_Notes 2007-10-17 01:11:41 UTC (rev 146)
+++ trunk/Release_Notes 2007-10-17 21:20:43 UTC (rev 147)
@@ -2,6 +2,11 @@
Things changed in this release:
+*) The LOC_CPU and REM_CPU tests will report their respective beliefs
+ as to the number of CPUs present when the verbosity is set to more
+ than one. This can be used when trying to diagnose issues with CPU
+ utilization.
+
*) A kind soul who wishes to remain anonymous provided a patch to
enable use of sendfile() on OSX.
Modified: trunk/configure
===================================================================
--- trunk/configure 2007-10-17 01:11:41 UTC (rev 146)
+++ trunk/configure 2007-10-17 21:20:43 UTC (rev 147)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for netperf 2.4.4pre3.
+# Generated by GNU Autoconf 2.61 for netperf 2.4.4.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -572,8 +572,8 @@
# Identity of this package.
PACKAGE_NAME='netperf'
PACKAGE_TARNAME='netperf'
-PACKAGE_VERSION='2.4.4pre3'
-PACKAGE_STRING='netperf 2.4.4pre3'
+PACKAGE_VERSION='2.4.4'
+PACKAGE_STRING='netperf 2.4.4'
PACKAGE_BUGREPORT=''
ac_unique_file="src/hist.h"
@@ -1218,7 +1218,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures netperf 2.4.4pre3 to adapt to many kinds of systems.
+\`configure' configures netperf 2.4.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1289,7 +1289,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of netperf 2.4.4pre3:";;
+ short | recursive ) echo "Configuration of netperf 2.4.4:";;
esac
cat <<\_ACEOF
@@ -1391,7 +1391,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-netperf configure 2.4.4pre3
+netperf configure 2.4.4
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1405,7 +1405,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by netperf $as_me 2.4.4pre3, which was
+It was created by netperf $as_me 2.4.4, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2171,7 +2171,7 @@
# Define the identity of the package.
PACKAGE='netperf'
- VERSION='2.4.4pre3'
+ VERSION='2.4.4'
cat >>confdefs.h <<_ACEOF
@@ -9713,7 +9713,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by netperf $as_me 2.4.4pre3, which was
+This file was extended by netperf $as_me 2.4.4, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -9766,7 +9766,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-netperf config.status 2.4.4pre3
+netperf config.status 2.4.4
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2007-10-17 01:11:41 UTC (rev 146)
+++ trunk/configure.ac 2007-10-17 21:20:43 UTC (rev 147)
@@ -2,11 +2,11 @@
# Process this file with autoconf to produce a configure script.
FULL-PACKAGE-NAME=netperf
-VERSION=2.4.4pre3
+VERSION=2.4.4
BUG-REPORT-ADDRESS=netperf-feedback at netperf.org
AC_PREREQ(2.59)
-AC_INIT(netperf, 2.4.4pre3)
+AC_INIT(netperf, 2.4.4)
# use the target version rather than host - one day we may want cross-compile
AC_CANONICAL_TARGET
AC_CONFIG_SRCDIR([src/hist.h])
Modified: trunk/src/netlib.c
===================================================================
--- trunk/src/netlib.c 2007-10-17 01:11:41 UTC (rev 146)
+++ trunk/src/netlib.c 2007-10-17 21:20:43 UTC (rev 147)
@@ -194,7 +194,8 @@
/* "long" integer type. raj 4/95. */
int
- lib_num_loc_cpus; /* the number of cpus in the system */
+ lib_num_loc_cpus, /* the number of cpus in the system */
+ lib_num_rem_cpus; /* how many we think are in the remote */
#define PAGES_PER_CHILD 2
@@ -3309,6 +3310,9 @@
bcopy((char *)netperf_response.content.test_specific_data,
(char *)&remrate,
sizeof(remrate));
+ bcopy((char *)netperf_response.content.test_specific_data + sizeof(remrate),
+ (char *)&lib_num_rem_cpus,
+ sizeof(lib_num_rem_cpus));
/* remrate = (float) netperf_response.content.test_specific_data[0]; */
return(remrate);
}
Modified: trunk/src/netlib.h
===================================================================
--- trunk/src/netlib.h 2007-10-17 01:11:41 UTC (rev 146)
+++ trunk/src/netlib.h 2007-10-17 21:20:43 UTC (rev 147)
@@ -441,6 +441,7 @@
extern int cpu_method;
extern int lib_num_loc_cpus;
+extern int lib_num_rem_cpus;
extern SOCKET server_sock;
extern int times_up;
extern FILE *where;
Modified: trunk/src/netserver.c
===================================================================
--- trunk/src/netserver.c 2007-10-17 01:11:41 UTC (rev 146)
+++ trunk/src/netserver.c 2007-10-17 21:20:43 UTC (rev 147)
@@ -255,9 +255,12 @@
bcopy((char *)&temp_rate,
(char *)netperf_response.content.test_specific_data,
sizeof(temp_rate));
+ bcopy((char *)&lib_num_loc_cpus,
+ (char *)netperf_response.content.test_specific_data + sizeof(temp_rate),
+ sizeof(lib_num_loc_cpus));
if (debug) {
fprintf(where,"netserver: sending CPU information:");
- fprintf(where,"rate is %g\n",temp_rate);
+ fprintf(where,"rate is %g num cpu %d\n",temp_rate,lib_num_loc_cpus);
fflush(where);
}
Modified: trunk/src/nettest_bsd.c
===================================================================
--- trunk/src/nettest_bsd.c 2007-10-17 01:11:41 UTC (rev 146)
+++ trunk/src/nettest_bsd.c 2007-10-17 21:20:43 UTC (rev 147)
@@ -7920,7 +7920,14 @@
fprintf(where,
"%g",
calibrate_local_cpu(0.0));
-
+
+ if (verbosity > 1)
+ fprintf(where,
+ "\nThere %s %d local %s\n",
+ (lib_num_loc_cpus > 1) ? "are" : "is",
+ lib_num_loc_cpus,
+ (lib_num_loc_cpus > 1) ? "cpus" : "cpu");
+
/* we need the cpu_start, cpu_stop in the looper case to kill the */
/* child proceses raj 4/95 */
@@ -7942,6 +7949,13 @@
"%g",
calibrate_remote_cpu());
+ if (verbosity > 1)
+ fprintf(where,
+ "\nThere %s %d remote %s\n",
+ (lib_num_rem_cpus > 1) ? "are" : "is",
+ lib_num_rem_cpus,
+ (lib_num_rem_cpus > 1) ? "cpus" : "cpu");
+
}
More information about the netperf-dev
mailing list