[netperf-dev] netperf2 commit notice r301 - in trunk: . src src/NetPerfDir src/NetServerDir
raj at netperf.org
raj at netperf.org
Mon Jun 1 11:04:40 PDT 2009
Author: raj
Date: 2009-06-01 11:04:38 -0700 (Mon, 01 Jun 2009)
New Revision: 301
Modified:
trunk/configure
trunk/configure.ac
trunk/src/NetPerfDir/sources
trunk/src/NetServerDir/sources
trunk/src/netlib.c
trunk/src/netsys_hpux11i.c
trunk/src/nettest_bsd.c
Log:
sooo close to release
Modified: trunk/configure
===================================================================
--- trunk/configure 2009-05-27 21:49:42 UTC (rev 300)
+++ trunk/configure 2009-06-01 18:04:38 UTC (rev 301)
@@ -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.5pre2.
+# Generated by GNU Autoconf 2.61 for netperf 2.4.5pre3.
#
# 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.5pre2'
-PACKAGE_STRING='netperf 2.4.5pre2'
+PACKAGE_VERSION='2.4.5pre3'
+PACKAGE_STRING='netperf 2.4.5pre3'
PACKAGE_BUGREPORT=''
ac_unique_file="src/hist.h"
@@ -1223,7 +1223,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.5pre2 to adapt to many kinds of systems.
+\`configure' configures netperf 2.4.5pre3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1294,7 +1294,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of netperf 2.4.5pre2:";;
+ short | recursive ) echo "Configuration of netperf 2.4.5pre3:";;
esac
cat <<\_ACEOF
@@ -1408,7 +1408,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-netperf configure 2.4.5pre2
+netperf configure 2.4.5pre3
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1422,7 +1422,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.5pre2, which was
+It was created by netperf $as_me 2.4.5pre3, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2188,7 +2188,7 @@
# Define the identity of the package.
PACKAGE='netperf'
- VERSION='2.4.5pre2'
+ VERSION='2.4.5pre3'
cat >>confdefs.h <<_ACEOF
@@ -11220,7 +11220,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.5pre2, which was
+This file was extended by netperf $as_me 2.4.5pre3, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -11273,7 +11273,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-netperf config.status 2.4.5pre2
+netperf config.status 2.4.5pre3
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 2009-05-27 21:49:42 UTC (rev 300)
+++ trunk/configure.ac 2009-06-01 18:04:38 UTC (rev 301)
@@ -2,11 +2,11 @@
# Process this file with autoconf to produce a configure script.
FULL-PACKAGE-NAME=netperf
-VERSION=2.4.5pre2
+VERSION=2.4.5pre3
BUG-REPORT-ADDRESS=netperf-feedback at netperf.org
AC_PREREQ(2.59)
-AC_INIT(netperf, 2.4.5pre2)
+AC_INIT(netperf, 2.4.5pre3)
# 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/NetPerfDir/sources
===================================================================
--- trunk/src/NetPerfDir/sources 2009-05-27 21:49:42 UTC (rev 300)
+++ trunk/src/NetPerfDir/sources 2009-06-01 18:04:38 UTC (rev 301)
@@ -23,6 +23,7 @@
..\netlib.c \
..\netsh.c \
..\nettest_bsd.c \
- ..\netperf.c
+ ..\netperf.c \
+ ..\inet_ntop.c
Modified: trunk/src/NetServerDir/sources
===================================================================
--- trunk/src/NetServerDir/sources 2009-05-27 21:49:42 UTC (rev 300)
+++ trunk/src/NetServerDir/sources 2009-06-01 18:04:38 UTC (rev 301)
@@ -23,5 +23,6 @@
..\netlib.c \
..\netsh.c \
..\nettest_bsd.c \
- ..\netserver.c
+ ..\netserver.c \
+ ..\inet_ntop.c
Modified: trunk/src/netlib.c
===================================================================
--- trunk/src/netlib.c 2009-05-27 21:49:42 UTC (rev 300)
+++ trunk/src/netlib.c 2009-06-01 18:04:38 UTC (rev 301)
@@ -943,9 +943,9 @@
times_up = 1;
- // Give the other threads time to notice that times_up
- // has changed state before taking the harsh step of
- // closing the sockets.
+ /* Give the other threads time to notice that times_up has
+ changed state before taking the harsh step of closing the
+ sockets. */
if (WaitForSingleObject(hAlarm, PAD_TIME/2*1000) ==
WAIT_TIMEOUT) {
@@ -962,7 +962,7 @@
closesocket(win_kludge_socket);
}
if (win_kludge_socket2 != INVALID_SOCKET) {
- HandlesClosedFlags |= 1;
+ HandlesClosedFlags |= 2;
closesocket(win_kludge_socket2);
}
}
Modified: trunk/src/netsys_hpux11i.c
===================================================================
--- trunk/src/netsys_hpux11i.c 2009-05-27 21:49:42 UTC (rev 300)
+++ trunk/src/netsys_hpux11i.c 2009-06-01 18:04:38 UTC (rev 301)
@@ -34,7 +34,7 @@
0);
if (ret > 0) {
-#ifdef PAP_MAX_CACHE_LEVELS
+#ifdef PSP_MAX_CACHE_LEVELS
/* we can get it "directly" but to help make things reconcile with
what other tools/platforms support, we shouldn't do a simple
integer divide - instead, we should do our division in floating
Modified: trunk/src/nettest_bsd.c
===================================================================
--- trunk/src/nettest_bsd.c 2009-05-27 21:49:42 UTC (rev 300)
+++ trunk/src/nettest_bsd.c 2009-06-01 18:04:38 UTC (rev 301)
@@ -5778,7 +5778,7 @@
/* return WSAEINTR with the test is over. anything that will run on */
/* 95 and NT and is closer to what netperf expects from Unix signals */
/* and such would be appreciated raj 1/96 */
- win_kludge_socket = recv_socket;
+ win_kludge_socket = send_socket;
#endif /* WIN32 */
/* Data Socket set-up is finished. If there were problems, either the */
@@ -6496,12 +6496,12 @@
}
#ifdef WIN32
- /* this is used so the timer thread can close the socket out from
- under us, which to date is the easiest/cleanest/least
- Windows-specific way I can find to force the winsock calls to
- return WSAEINTR with the test is over. anything that will run on
- 95 and NT and is closer to what netperf expects from Unix
- signals and such would be appreciated raj 1/96 */
+ /* this is used so the timer thread can close the socket out from */
+ /* under us, which to date is the easiest/cleanest/least */
+ /* Windows-specific way I can find to force the winsock calls to */
+ /* return WSAEINTR with the test is over. anything that will run on */
+ /* 95 and NT and is closer to what netperf expects from Unix signals */
+ /* and such would be appreciated raj 1/96 */
win_kludge_socket = data_socket;
#endif /* WIN32 */
@@ -7432,6 +7432,16 @@
perror("netperf: data socket connect failed");
exit(1);
}
+
+#ifdef WIN32
+ /* this is used so the timer thread can close the socket out from */
+ /* under us, which to date is the easiest/cleanest/least */
+ /* Windows-specific way I can find to force the winsock calls to */
+ /* return WSAEINTR with the test is over. anything that will run on */
+ /* 95 and NT and is closer to what netperf expects from Unix signals */
+ /* and such would be appreciated raj 1/96 */
+ win_kludge_socket = send_socket;
+#endif /* WIN32 */
/* Data Socket set-up is finished. If there were problems, either the */
/* connect would have failed, or the previous response would have */
@@ -8378,6 +8388,7 @@
/* 95 and NT and is closer to what netperf expects from Unix signals */
/* and such would be appreciated raj 1/96 */
win_kludge_socket = s_data;
+ win_kludge_socket2 = INVALID_SOCKET;
#endif /* WIN32 */
if (debug) {
@@ -11014,16 +11025,6 @@
win_kludge_socket = send_socket;
#endif /* WIN32 */
-#ifdef WIN32
- /* this is used so the timer thread can close the socket out from */
- /* under us, which to date is the easiest/cleanest/least */
- /* Windows-specific way I can find to force the winsock calls to */
- /* return WSAEINTR with the test is over. anything that will run on */
- /* 95 and NT and is closer to what netperf expects from Unix signals */
- /* and such would be appreciated raj 1/96 */
- win_kludge_socket = send_socket;
-#endif /* WIN32 */
-
/* Data Socket set-up is finished. If there were problems, either the */
/* connect would have failed, or the previous response would have */
/* indicated a problem. I failed to see the value of the extra */
@@ -12646,7 +12647,6 @@
/* 95 and NT and is closer to what netperf expects from Unix signals */
/* and such would be appreciated raj 1/96 */
win_kludge_socket = s_data;
- win_kludge_socket2 = INVALID_SOCKET;
#endif /* WIN32 */
if (debug) {
More information about the netperf-dev
mailing list