[Pkg-ofed-commits] r410 - in /branches/ofed-1.4.2/qperf/branches/upstream/curren...
gmpc-guest at alioth.debian.org
gmpc-guest at alioth.debian.org
Fri Aug 7 11:46:31 UTC 2009
Author: gmpc-guest
Date: Fri Aug 7 11:46:31 2009
New Revision: 410
URL: http://svn.debian.org/wsvn/pkg-ofed/?sc=1&rev=410
Log:
[svn-upgrade] Integrating new upstream version, qperf (0.4.6)
Modified:
branches/ofed-1.4.2/qperf/branches/upstream/current/README
branches/ofed-1.4.2/qperf/branches/upstream/current/autom4te.cache/output.0
branches/ofed-1.4.2/qperf/branches/upstream/current/autom4te.cache/output.1
branches/ofed-1.4.2/qperf/branches/upstream/current/autom4te.cache/traces.0
branches/ofed-1.4.2/qperf/branches/upstream/current/autom4te.cache/traces.1
branches/ofed-1.4.2/qperf/branches/upstream/current/configure
branches/ofed-1.4.2/qperf/branches/upstream/current/configure.in
branches/ofed-1.4.2/qperf/branches/upstream/current/qperf.spec
branches/ofed-1.4.2/qperf/branches/upstream/current/src/qperf.c
branches/ofed-1.4.2/qperf/branches/upstream/current/src/rdma.c
branches/ofed-1.4.2/qperf/branches/upstream/current/src/support.c
Modified: branches/ofed-1.4.2/qperf/branches/upstream/current/README
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.4.2/qperf/branches/upstream/current/README?rev=410&op=diff
==============================================================================
--- branches/ofed-1.4.2/qperf/branches/upstream/current/README (original)
+++ branches/ofed-1.4.2/qperf/branches/upstream/current/README Fri Aug 7 11:46:31 2009
@@ -5,8 +5,11 @@
make
Changing version
- * Change VER_MAJ, VER_MIN and VER_INC as appropriate in src/qperf.c
- * Change version also in qperf.spec and configure.in
+ * src/qperf.c: Change VER_MAJ, VER_MIN and VER_INC.
+ * configure.in: Change in AC_INIT and AM_INIT_AUTOMAKE
+ * qperf.spec: Change line beginning with Version:
+ * Note ensure that qperf.spec is modified last so that cleanup does not
+ delete it.
Notes
* If the library ibverbs is not found, a version of qperf is built that
Modified: branches/ofed-1.4.2/qperf/branches/upstream/current/autom4te.cache/output.0
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.4.2/qperf/branches/upstream/current/autom4te.cache/output.0?rev=410&op=diff
==============================================================================
--- branches/ofed-1.4.2/qperf/branches/upstream/current/autom4te.cache/output.0 (original)
+++ branches/ofed-1.4.2/qperf/branches/upstream/current/autom4te.cache/output.0 Fri Aug 7 11:46:31 2009
@@ -1,6 +1,6 @@
@%:@! /bin/sh
@%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.59 for qperf 0.4.4.
+@%:@ Generated by GNU Autoconf 2.59 for qperf 0.4.6.
@%:@
@%:@ Report bugs to <general at lists.openfabrics.org>.
@%:@
@@ -269,8 +269,8 @@
# Identity of this package.
PACKAGE_NAME='qperf'
PACKAGE_TARNAME='qperf'
-PACKAGE_VERSION='0.4.4'
-PACKAGE_STRING='qperf 0.4.4'
+PACKAGE_VERSION='0.4.6'
+PACKAGE_STRING='qperf 0.4.6'
PACKAGE_BUGREPORT='general at lists.openfabrics.org'
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE RDMA_TRUE RDMA_FALSE LIB@&t at OBJS LTLIBOBJS'
@@ -738,7 +738,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 qperf 0.4.4 to adapt to many kinds of systems.
+\`configure' configures qperf 0.4.6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -800,7 +800,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of qperf 0.4.4:";;
+ short | recursive ) echo "Configuration of qperf 0.4.6:";;
esac
cat <<\_ACEOF
@@ -917,7 +917,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-qperf configure 0.4.4
+qperf configure 0.4.6
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -931,7 +931,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by qperf $as_me 0.4.4, which was
+It was created by qperf $as_me 0.4.6, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1574,7 +1574,7 @@
# Define the identity of the package.
PACKAGE=qperf
- VERSION=0.4.4
+ VERSION=0.4.6
cat >>confdefs.h <<_ACEOF
@@ -3370,7 +3370,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by qperf $as_me 0.4.4, which was
+This file was extended by qperf $as_me 0.4.6, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3428,7 +3428,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-qperf config.status 0.4.4
+qperf config.status 0.4.6
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
Modified: branches/ofed-1.4.2/qperf/branches/upstream/current/autom4te.cache/output.1
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.4.2/qperf/branches/upstream/current/autom4te.cache/output.1?rev=410&op=diff
==============================================================================
--- branches/ofed-1.4.2/qperf/branches/upstream/current/autom4te.cache/output.1 (original)
+++ branches/ofed-1.4.2/qperf/branches/upstream/current/autom4te.cache/output.1 Fri Aug 7 11:46:31 2009
@@ -1,6 +1,6 @@
@%:@! /bin/sh
@%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.59 for qperf 0.4.4.
+@%:@ Generated by GNU Autoconf 2.59 for qperf 0.4.6.
@%:@
@%:@ Report bugs to <general at lists.openfabrics.org>.
@%:@
@@ -269,8 +269,8 @@
# Identity of this package.
PACKAGE_NAME='qperf'
PACKAGE_TARNAME='qperf'
-PACKAGE_VERSION='0.4.4'
-PACKAGE_STRING='qperf 0.4.4'
+PACKAGE_VERSION='0.4.6'
+PACKAGE_STRING='qperf 0.4.6'
PACKAGE_BUGREPORT='general at lists.openfabrics.org'
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE RDMA_TRUE RDMA_FALSE LIB@&t at OBJS LTLIBOBJS'
@@ -738,7 +738,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 qperf 0.4.4 to adapt to many kinds of systems.
+\`configure' configures qperf 0.4.6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -800,7 +800,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of qperf 0.4.4:";;
+ short | recursive ) echo "Configuration of qperf 0.4.6:";;
esac
cat <<\_ACEOF
@@ -917,7 +917,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-qperf configure 0.4.4
+qperf configure 0.4.6
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -931,7 +931,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by qperf $as_me 0.4.4, which was
+It was created by qperf $as_me 0.4.6, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1574,7 +1574,7 @@
# Define the identity of the package.
PACKAGE=qperf
- VERSION=0.4.4
+ VERSION=0.4.6
cat >>confdefs.h <<_ACEOF
@@ -3370,7 +3370,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by qperf $as_me 0.4.4, which was
+This file was extended by qperf $as_me 0.4.6, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3428,7 +3428,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-qperf config.status 0.4.4
+qperf config.status 0.4.6
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
Modified: branches/ofed-1.4.2/qperf/branches/upstream/current/autom4te.cache/traces.0
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.4.2/qperf/branches/upstream/current/autom4te.cache/traces.0?rev=410&op=diff
==============================================================================
--- branches/ofed-1.4.2/qperf/branches/upstream/current/autom4te.cache/traces.0 (original)
+++ branches/ofed-1.4.2/qperf/branches/upstream/current/autom4te.cache/traces.0 Fri Aug 7 11:46:31 2009
@@ -480,7 +480,7 @@
AC_SUBST([am__tar])
AC_SUBST([am__untar])
])
-m4trace:configure.in:1: -1- AC_INIT([qperf], [0.4.4], [general at lists.openfabrics.org])
+m4trace:configure.in:1: -1- AC_INIT([qperf], [0.4.6], [general at lists.openfabrics.org])
m4trace:configure.in:1: -1- m4_pattern_forbid([^_?A[CHUM]_])
m4trace:configure.in:1: -1- m4_pattern_forbid([_AC_])
m4trace:configure.in:1: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS'])
@@ -533,7 +533,7 @@
m4trace:configure.in:1: -1- AC_SUBST([ECHO_N])
m4trace:configure.in:1: -1- AC_SUBST([ECHO_T])
m4trace:configure.in:1: -1- AC_SUBST([LIBS])
-m4trace:configure.in:2: -1- AM_INIT_AUTOMAKE([qperf], [0.4.4])
+m4trace:configure.in:2: -1- AM_INIT_AUTOMAKE([qperf], [0.4.6])
m4trace:configure.in:2: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$])
m4trace:configure.in:2: -1- AM_SET_CURRENT_AUTOMAKE_VERSION
m4trace:configure.in:2: -1- AM_AUTOMAKE_VERSION([1.9.6])
@@ -543,7 +543,7 @@
m4trace:configure.in:2: -1- AC_SUBST([INSTALL_DATA])
m4trace:configure.in:2: -1- AC_SUBST([CYGPATH_W])
m4trace:configure.in:2: -1- AC_SUBST([PACKAGE], [qperf])
-m4trace:configure.in:2: -1- AC_SUBST([VERSION], [0.4.4])
+m4trace:configure.in:2: -1- AC_SUBST([VERSION], [0.4.6])
m4trace:configure.in:2: -1- _AM_IF_OPTION([no-define], [], [AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])
m4trace:configure.in:2: -2- _AM_MANGLE_OPTION([no-define])
Modified: branches/ofed-1.4.2/qperf/branches/upstream/current/autom4te.cache/traces.1
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.4.2/qperf/branches/upstream/current/autom4te.cache/traces.1?rev=410&op=diff
==============================================================================
--- branches/ofed-1.4.2/qperf/branches/upstream/current/autom4te.cache/traces.1 (original)
+++ branches/ofed-1.4.2/qperf/branches/upstream/current/autom4te.cache/traces.1 Fri Aug 7 11:46:31 2009
@@ -1,4 +1,4 @@
-m4trace:configure.in:1: -1- AC_INIT([qperf], [0.4.4], [general at lists.openfabrics.org])
+m4trace:configure.in:1: -1- AC_INIT([qperf], [0.4.6], [general at lists.openfabrics.org])
m4trace:configure.in:1: -1- m4_pattern_forbid([^_?A[CHUM]_])
m4trace:configure.in:1: -1- m4_pattern_forbid([_AC_])
m4trace:configure.in:1: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS'])
@@ -51,7 +51,7 @@
m4trace:configure.in:1: -1- AC_SUBST([ECHO_N])
m4trace:configure.in:1: -1- AC_SUBST([ECHO_T])
m4trace:configure.in:1: -1- AC_SUBST([LIBS])
-m4trace:configure.in:2: -1- AM_INIT_AUTOMAKE([qperf], [0.4.4])
+m4trace:configure.in:2: -1- AM_INIT_AUTOMAKE([qperf], [0.4.6])
m4trace:configure.in:2: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$])
m4trace:configure.in:2: -1- AM_AUTOMAKE_VERSION([1.9.6])
m4trace:configure.in:2: -1- AC_PROG_INSTALL
@@ -60,7 +60,7 @@
m4trace:configure.in:2: -1- AC_SUBST([INSTALL_DATA])
m4trace:configure.in:2: -1- AC_SUBST([CYGPATH_W])
m4trace:configure.in:2: -1- AC_SUBST([PACKAGE], [qperf])
-m4trace:configure.in:2: -1- AC_SUBST([VERSION], [0.4.4])
+m4trace:configure.in:2: -1- AC_SUBST([VERSION], [0.4.6])
m4trace:configure.in:2: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE])
m4trace:configure.in:2: -1- AH_OUTPUT([PACKAGE], [/* Name of package */
#undef PACKAGE])
Modified: branches/ofed-1.4.2/qperf/branches/upstream/current/configure
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.4.2/qperf/branches/upstream/current/configure?rev=410&op=diff
==============================================================================
--- branches/ofed-1.4.2/qperf/branches/upstream/current/configure (original)
+++ branches/ofed-1.4.2/qperf/branches/upstream/current/configure Fri Aug 7 11:46:31 2009
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for qperf 0.4.4.
+# Generated by GNU Autoconf 2.59 for qperf 0.4.6.
#
# Report bugs to <general at lists.openfabrics.org>.
#
@@ -269,8 +269,8 @@
# Identity of this package.
PACKAGE_NAME='qperf'
PACKAGE_TARNAME='qperf'
-PACKAGE_VERSION='0.4.4'
-PACKAGE_STRING='qperf 0.4.4'
+PACKAGE_VERSION='0.4.6'
+PACKAGE_STRING='qperf 0.4.6'
PACKAGE_BUGREPORT='general at lists.openfabrics.org'
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE RDMA_TRUE RDMA_FALSE LIBOBJS LTLIBOBJS'
@@ -738,7 +738,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 qperf 0.4.4 to adapt to many kinds of systems.
+\`configure' configures qperf 0.4.6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -800,7 +800,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of qperf 0.4.4:";;
+ short | recursive ) echo "Configuration of qperf 0.4.6:";;
esac
cat <<\_ACEOF
@@ -917,7 +917,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-qperf configure 0.4.4
+qperf configure 0.4.6
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -931,7 +931,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by qperf $as_me 0.4.4, which was
+It was created by qperf $as_me 0.4.6, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1574,7 +1574,7 @@
# Define the identity of the package.
PACKAGE=qperf
- VERSION=0.4.4
+ VERSION=0.4.6
cat >>confdefs.h <<_ACEOF
@@ -3370,7 +3370,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by qperf $as_me 0.4.4, which was
+This file was extended by qperf $as_me 0.4.6, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3428,7 +3428,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-qperf config.status 0.4.4
+qperf config.status 0.4.6
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
Modified: branches/ofed-1.4.2/qperf/branches/upstream/current/configure.in
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.4.2/qperf/branches/upstream/current/configure.in?rev=410&op=diff
==============================================================================
--- branches/ofed-1.4.2/qperf/branches/upstream/current/configure.in (original)
+++ branches/ofed-1.4.2/qperf/branches/upstream/current/configure.in Fri Aug 7 11:46:31 2009
@@ -1,5 +1,5 @@
-AC_INIT(qperf, 0.4.4, general at lists.openfabrics.org)
-AM_INIT_AUTOMAKE(qperf, 0.4.4)
+AC_INIT(qperf, 0.4.6, general at lists.openfabrics.org)
+AM_INIT_AUTOMAKE(qperf, 0.4.6)
AC_PROG_CC
AC_CHECK_LIB(ibverbs, ibv_open_device, RDMA=1)
AC_CHECK_LIB(rdmacm, rdma_create_id)
Modified: branches/ofed-1.4.2/qperf/branches/upstream/current/qperf.spec
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.4.2/qperf/branches/upstream/current/qperf.spec?rev=410&op=diff
==============================================================================
--- branches/ofed-1.4.2/qperf/branches/upstream/current/qperf.spec (original)
+++ branches/ofed-1.4.2/qperf/branches/upstream/current/qperf.spec Fri Aug 7 11:46:31 2009
@@ -1,10 +1,10 @@
Name: qperf
Summary: Measure socket and RDMA performance
-Version: 0.4.4
-Release: 1.ofed1.4.1
+Version: 0.4.6
+Release: 1.ofed1.4.2
License: BSD 3-Clause, GPL v2
Group: Networking/Diagnostic
-Source: http://www.openfabrics.org/downloads/qperf-0.4.4.tar.gz
+Source: http://www.openfabrics.org/downloads/qperf-0.4.6.tar.gz
Url: http://www.openfabrics.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: libibverbs-devel
Modified: branches/ofed-1.4.2/qperf/branches/upstream/current/src/qperf.c
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.4.2/qperf/branches/upstream/current/src/qperf.c?rev=410&op=diff
==============================================================================
--- branches/ofed-1.4.2/qperf/branches/upstream/current/src/qperf.c (original)
+++ branches/ofed-1.4.2/qperf/branches/upstream/current/src/qperf.c Fri Aug 7 11:46:31 2009
@@ -62,7 +62,7 @@
*/
#define VER_MAJ 0 /* Major version */
#define VER_MIN 4 /* Minor version */
-#define VER_INC 4 /* Incremental version */
+#define VER_INC 6 /* Incremental version */
#define LISTENQ 5 /* Size of listen queue */
#define BUFSIZE 1024 /* Size of buffers */
@@ -673,10 +673,10 @@
set_signals(void)
{
struct sigaction act ={
- .sa_sigaction = sig_alrm,
.sa_flags = SA_SIGINFO
};
+ act.sa_sigaction = sig_alrm;
sigaction(SIGALRM, &act, 0);
sigaction(SIGPIPE, &act, 0);
@@ -1776,10 +1776,11 @@
static void
run_server_quit(void)
{
+ int z;
char buf[1];
sync_test();
- read(RemoteFD, buf, sizeof(buf));
+ z = read(RemoteFD, buf, sizeof(buf));
kill(getppid(), SIGQUIT);
exit(0);
}
@@ -1812,7 +1813,11 @@
debug("starting timer for %d seconds", seconds);
itimerval.it_value.tv_sec = seconds;
- itimerval.it_interval.tv_usec = 1;
+ /*
+ * SLES11 has high precision timers; too low an interval will cause timer
+ * to fire extremely rapidly after first occurrence. We set it to 10 ms.
+ */
+ itimerval.it_interval.tv_usec = 10000;
setitimer(ITIMER_REAL, &itimerval, 0);
}
Modified: branches/ofed-1.4.2/qperf/branches/upstream/current/src/rdma.c
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.4.2/qperf/branches/upstream/current/src/rdma.c?rev=410&op=diff
==============================================================================
--- branches/ofed-1.4.2/qperf/branches/upstream/current/src/rdma.c (original)
+++ branches/ofed-1.4.2/qperf/branches/upstream/current/src/rdma.c Fri Aug 7 11:46:31 2009
@@ -326,6 +326,18 @@
/*
+ * This routine is never called and is solely to avoid compiler warnings for
+ * functions that are not currently being used.
+ */
+void
+rdma_not_called(void)
+{
+ if (0)
+ ib_migrate(NULL);
+}
+
+
+/*
* Measure RC bi-directional bandwidth (client side).
*/
void
@@ -1319,9 +1331,9 @@
int i;
int slots;
DEVICE dev;
- uint64_t args[2];
int head = 0;
int tail = 0;
+ uint64_t args[2] = {0};
rd_params(IBV_QPT_RC, K64, 1, 1);
rd_open(&dev, IBV_QPT_RC, NCQE, 0);
@@ -1349,8 +1361,8 @@
if (n > LStat.max_cqes)
LStat.max_cqes = n;
for (i = 0; i < n; ++i) {
- uint64_t want;
uint64_t seen;
+ uint64_t want = 0;
int x = wc[i].wr_id;
int status = wc[i].status;
Modified: branches/ofed-1.4.2/qperf/branches/upstream/current/src/support.c
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.4.2/qperf/branches/upstream/current/src/support.c?rev=410&op=diff
==============================================================================
--- branches/ofed-1.4.2/qperf/branches/upstream/current/src/support.c (original)
+++ branches/ofed-1.4.2/qperf/branches/upstream/current/src/support.c Fri Aug 7 11:46:31 2009
@@ -357,6 +357,7 @@
}
len -= n;
ioc += n;
+ buf += n;
}
return ioc;
}
@@ -418,6 +419,7 @@
void
urgent(void)
{
+ int z;
char *p, *q;
char buffer[256];
@@ -469,7 +471,7 @@
remote_failure_error();
if (s)
break;
- read(RemoteFD, p, q-p);
+ z = read(RemoteFD, p, q-p);
}
while (p < q) {
@@ -482,7 +484,7 @@
timeout_end();
buf_end(&p, q);
- write(2, buffer, p+1-buffer);
+ z = write(2, buffer, p+1-buffer);
die();
}
@@ -503,6 +505,7 @@
static void
remote_failure_error(void)
{
+ int z;
char buffer[256];
char *p = buffer;
char *q = p + sizeof(buffer);
@@ -510,7 +513,7 @@
buf_app(&p, q, remote_name());
buf_app(&p, q, " failure");
buf_end(&p, q);
- write(2, buffer, p+1-buffer);
+ z = write(2, buffer, p+1-buffer);
die();
}
@@ -536,6 +539,7 @@
int
error(int actions, char *fmt, ...)
{
+ int z;
va_list alist;
char buffer[256];
char *p = buffer;
@@ -557,7 +561,7 @@
if (RemoteFD >= 0) {
send(RemoteFD, "?", 1, MSG_OOB);
- write(RemoteFD, buffer, p-buffer);
+ z = write(RemoteFD, buffer, p-buffer);
shutdown(RemoteFD, SHUT_WR);
timeout_set(ERROR_TIMEOUT, sig_alrm_die);
while (read(RemoteFD, buffer, sizeof(buffer)) > 0)
@@ -659,6 +663,7 @@
vfprintf(stderr, fmt, alist);
va_end(alist);
fprintf(stderr, "\n");
+ fflush(stderr);
}
More information about the Pkg-ofed-commits
mailing list