[Pkg-ofed-commits] [qperf] 03/11: New upstream version 0.4.8
Ana Beatriz Guerrero López
ana at moszumanska.debian.org
Mon Aug 29 12:37:05 UTC 2016
This is an automated email from the git hooks/post-receive script.
ana pushed a commit to branch master
in repository qperf.
commit a4bf01a632881eea7bf00fa0b148606f67eceb21
Author: Ana Guerrero López <ana at ekaia.org>
Date: Mon Aug 29 14:28:19 2016 +0200
New upstream version 0.4.8
---
autom4te.cache/output.0 | 20 ++++++++++----------
autom4te.cache/output.1 | 20 ++++++++++----------
autom4te.cache/traces.0 | 2 +-
autom4te.cache/traces.1 | 6 +++---
configure | 20 ++++++++++----------
configure.in | 4 ++--
qperf.spec | 7 ++++---
qperf.spec.in | 3 ++-
src/qperf.c | 2 +-
src/rds.c | 44 ++++++++++++++++++++++++++++++++++++++++++--
10 files changed, 85 insertions(+), 43 deletions(-)
diff --git a/autom4te.cache/output.0 b/autom4te.cache/output.0
index 59bd01d..14dc15a 100644
--- a/autom4te.cache/output.0
+++ b/autom4te.cache/output.0
@@ -1,6 +1,6 @@
@%:@! /bin/sh
@%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.63 for qperf 0.4.7.
+@%:@ Generated by GNU Autoconf 2.63 for qperf 0.4.8.
@%:@
@%:@ Report bugs to <general at lists.openfabrics.org>.
@%:@
@@ -596,8 +596,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='qperf'
PACKAGE_TARNAME='qperf'
-PACKAGE_VERSION='0.4.7'
-PACKAGE_STRING='qperf 0.4.7'
+PACKAGE_VERSION='0.4.8'
+PACKAGE_STRING='qperf 0.4.8'
PACKAGE_BUGREPORT='general at lists.openfabrics.org'
ac_subst_vars='LTLIBOBJS
@@ -1247,7 +1247,7 @@ if test "$ac_init_help" = "long"; then
# 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.7 to adapt to many kinds of systems.
+\`configure' configures qperf 0.4.8 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1313,7 +1313,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of qperf 0.4.7:";;
+ short | recursive ) echo "Configuration of qperf 0.4.8:";;
esac
cat <<\_ACEOF
@@ -1399,7 +1399,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-qperf configure 0.4.7
+qperf configure 0.4.8
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1413,7 +1413,7 @@ cat >config.log <<_ACEOF
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.7, which was
+It was created by qperf $as_me 0.4.8, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2129,7 +2129,7 @@ fi
# Define the identity of the package.
PACKAGE=qperf
- VERSION=0.4.7
+ VERSION=0.4.8
cat >>confdefs.h <<_ACEOF
@@ -4091,7 +4091,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by qperf $as_me 0.4.7, which was
+This file was extended by qperf $as_me 0.4.8, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4145,7 +4145,7 @@ Report bugs to <bug-autoconf at gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-qperf config.status 0.4.7
+qperf config.status 0.4.8
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/autom4te.cache/output.1 b/autom4te.cache/output.1
index 59bd01d..14dc15a 100644
--- a/autom4te.cache/output.1
+++ b/autom4te.cache/output.1
@@ -1,6 +1,6 @@
@%:@! /bin/sh
@%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.63 for qperf 0.4.7.
+@%:@ Generated by GNU Autoconf 2.63 for qperf 0.4.8.
@%:@
@%:@ Report bugs to <general at lists.openfabrics.org>.
@%:@
@@ -596,8 +596,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='qperf'
PACKAGE_TARNAME='qperf'
-PACKAGE_VERSION='0.4.7'
-PACKAGE_STRING='qperf 0.4.7'
+PACKAGE_VERSION='0.4.8'
+PACKAGE_STRING='qperf 0.4.8'
PACKAGE_BUGREPORT='general at lists.openfabrics.org'
ac_subst_vars='LTLIBOBJS
@@ -1247,7 +1247,7 @@ if test "$ac_init_help" = "long"; then
# 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.7 to adapt to many kinds of systems.
+\`configure' configures qperf 0.4.8 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1313,7 +1313,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of qperf 0.4.7:";;
+ short | recursive ) echo "Configuration of qperf 0.4.8:";;
esac
cat <<\_ACEOF
@@ -1399,7 +1399,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-qperf configure 0.4.7
+qperf configure 0.4.8
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1413,7 +1413,7 @@ cat >config.log <<_ACEOF
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.7, which was
+It was created by qperf $as_me 0.4.8, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2129,7 +2129,7 @@ fi
# Define the identity of the package.
PACKAGE=qperf
- VERSION=0.4.7
+ VERSION=0.4.8
cat >>confdefs.h <<_ACEOF
@@ -4091,7 +4091,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by qperf $as_me 0.4.7, which was
+This file was extended by qperf $as_me 0.4.8, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4145,7 +4145,7 @@ Report bugs to <bug-autoconf at gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-qperf config.status 0.4.7
+qperf config.status 0.4.8
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/autom4te.cache/traces.0 b/autom4te.cache/traces.0
index b0ddb64..8bbb9a1 100644
--- a/autom4te.cache/traces.0
+++ b/autom4te.cache/traces.0
@@ -539,7 +539,7 @@ m4trace:configure.in:1: -1- m4_pattern_allow([^LIBS$])
m4trace:configure.in:1: -1- m4_pattern_allow([^build_alias$])
m4trace:configure.in:1: -1- m4_pattern_allow([^host_alias$])
m4trace:configure.in:1: -1- m4_pattern_allow([^target_alias$])
-m4trace:configure.in:2: -1- AM_INIT_AUTOMAKE([qperf], [0.4.7])
+m4trace:configure.in:2: -1- AM_INIT_AUTOMAKE([qperf], [0.4.8])
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.10.1])
diff --git a/autom4te.cache/traces.1 b/autom4te.cache/traces.1
index e857a88..1ace945 100644
--- a/autom4te.cache/traces.1
+++ b/autom4te.cache/traces.1
@@ -1,4 +1,4 @@
-m4trace:configure.in:1: -1- AC_INIT([qperf], [0.4.7], [general at lists.openfabrics.org])
+m4trace:configure.in:1: -1- AC_INIT([qperf], [0.4.8], [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'])
@@ -139,7 +139,7 @@ m4trace:configure.in:1: -1- m4_pattern_allow([^host_alias$])
m4trace:configure.in:1: -1- AC_SUBST([target_alias])
m4trace:configure.in:1: -1- AC_SUBST_TRACE([target_alias])
m4trace:configure.in:1: -1- m4_pattern_allow([^target_alias$])
-m4trace:configure.in:2: -1- AM_INIT_AUTOMAKE([qperf], [0.4.7])
+m4trace:configure.in:2: -1- AM_INIT_AUTOMAKE([qperf], [0.4.8])
m4trace:configure.in:2: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$])
m4trace:configure.in:2: -1- AM_AUTOMAKE_VERSION([1.10.1])
m4trace:configure.in:2: -1- AC_REQUIRE_AUX_FILE([install-sh])
@@ -162,7 +162,7 @@ m4trace:configure.in:2: -1- m4_pattern_allow([^CYGPATH_W$])
m4trace:configure.in:2: -1- AC_SUBST([PACKAGE], [qperf])
m4trace:configure.in:2: -1- AC_SUBST_TRACE([PACKAGE])
m4trace:configure.in:2: -1- m4_pattern_allow([^PACKAGE$])
-m4trace:configure.in:2: -1- AC_SUBST([VERSION], [0.4.7])
+m4trace:configure.in:2: -1- AC_SUBST([VERSION], [0.4.8])
m4trace:configure.in:2: -1- AC_SUBST_TRACE([VERSION])
m4trace:configure.in:2: -1- m4_pattern_allow([^VERSION$])
m4trace:configure.in:2: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE])
diff --git a/configure b/configure
index 9efab07..b4a943f 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for qperf 0.4.7.
+# Generated by GNU Autoconf 2.63 for qperf 0.4.8.
#
# Report bugs to <general at lists.openfabrics.org>.
#
@@ -596,8 +596,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='qperf'
PACKAGE_TARNAME='qperf'
-PACKAGE_VERSION='0.4.7'
-PACKAGE_STRING='qperf 0.4.7'
+PACKAGE_VERSION='0.4.8'
+PACKAGE_STRING='qperf 0.4.8'
PACKAGE_BUGREPORT='general at lists.openfabrics.org'
ac_subst_vars='LTLIBOBJS
@@ -1247,7 +1247,7 @@ if test "$ac_init_help" = "long"; then
# 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.7 to adapt to many kinds of systems.
+\`configure' configures qperf 0.4.8 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1313,7 +1313,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of qperf 0.4.7:";;
+ short | recursive ) echo "Configuration of qperf 0.4.8:";;
esac
cat <<\_ACEOF
@@ -1399,7 +1399,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-qperf configure 0.4.7
+qperf configure 0.4.8
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1413,7 +1413,7 @@ cat >config.log <<_ACEOF
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.7, which was
+It was created by qperf $as_me 0.4.8, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2129,7 +2129,7 @@ fi
# Define the identity of the package.
PACKAGE=qperf
- VERSION=0.4.7
+ VERSION=0.4.8
cat >>confdefs.h <<_ACEOF
@@ -4091,7 +4091,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by qperf $as_me 0.4.7, which was
+This file was extended by qperf $as_me 0.4.8, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4145,7 +4145,7 @@ Report bugs to <bug-autoconf at gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-qperf config.status 0.4.7
+qperf config.status 0.4.8
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/configure.in b/configure.in
index e17412c..6bd5b0b 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
-AC_INIT(qperf, 0.4.7, general at lists.openfabrics.org)
-AM_INIT_AUTOMAKE(qperf, 0.4.7)
+AC_INIT(qperf, 0.4.8, general at lists.openfabrics.org)
+AM_INIT_AUTOMAKE(qperf, 0.4.8)
AC_PROG_CC
AC_CHECK_LIB(ibverbs, ibv_open_device, RDMA=1)
AC_CHECK_LIB(ibverbs, ibv_open_xrc_domain, HAS_XRC=1)
diff --git a/qperf.spec b/qperf.spec
index 46d0c0b..75e7c27 100644
--- a/qperf.spec
+++ b/qperf.spec
@@ -1,13 +1,14 @@
Name: qperf
Summary: Measure socket and RDMA performance
-Version: 0.4.7
-Release: 0.2.gf3f7001
+Version: 0.4.8
+Release: 1
License: BSD 3-Clause, GPL v2
Group: Networking/Diagnostic
-Source: http://www.openfabrics.org/downloads/qperf-0.4.7-0.2.gf3f7001.tar.gz
+Source: http://www.openfabrics.org/downloads/qperf/%{name}-%{version}.tar.gz
Url: http://www.openfabrics.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: libibverbs-devel
+BuildRequires: librdmacm-devel
%description
Measure socket and RDMA performance.
diff --git a/qperf.spec.in b/qperf.spec.in
index 3b3a77d..4fd4f0a 100644
--- a/qperf.spec.in
+++ b/qperf.spec.in
@@ -4,10 +4,11 @@ Version: @VERSION@
Release: 1
License: BSD 3-Clause, GPL v2
Group: Networking/Diagnostic
-Source: http://www.openfabrics.org/downloads/%{name}-%{version}.tar.gz
+Source: http://www.openfabrics.org/downloads/qperf/%{name}-%{version}.tar.gz
Url: http://www.openfabrics.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@RDMA_TRUE at BuildRequires: libibverbs-devel
+ at RDMA_TRUE@BuildRequires: librdmacm-devel
%description
Measure socket and RDMA performance.
diff --git a/src/qperf.c b/src/qperf.c
index 3d92763..897b0ff 100644
--- a/src/qperf.c
+++ b/src/qperf.c
@@ -62,7 +62,7 @@
*/
#define VER_MAJ 0 /* Major version */
#define VER_MIN 4 /* Minor version */
-#define VER_INC 7 /* Incremental version */
+#define VER_INC 8 /* Incremental version */
#define LISTENQ 5 /* Size of listen queue */
#define BUFSIZE 1024 /* Size of buffers */
diff --git a/src/rds.c b/src/rds.c
index 5a2491d..c9b6023 100644
--- a/src/rds.c
+++ b/src/rds.c
@@ -1,6 +1,7 @@
/*
* qperf - handle RDS tests.
*
+ * Copyright (c) 2012 Intel Corporation. All rights reserved.
* Copyright (c) 2002-2009 Johann George. All rights reserved.
* Copyright (c) 2006-2009 QLogic Corporation. All rights reserved.
*
@@ -48,7 +49,46 @@
/*
* Parameters.
*/
-#define AF_INET_RDS 28 /* Family for RDS */
+#ifndef AF_RDS
+/*
+ * Before RDS was part of the Linux kernel, it was a module that picked
+ * an address famiy value and exported it via /proc. Use the /proc
+ * value, if present, otherwise fall back to the actual value.
+ */
+#define DEFAULT_AF_RDS 21 /* actual value for AF_RDS */
+static int get_af_rds(void)
+{
+ static int af_rds = -1;
+
+ if (af_rds == -1) {
+ FILE *fp;
+ int read_fail = 0;
+
+ if ((fp = fopen("/proc/sys/net/rds/pf_rds", "r")) != NULL) {
+ int n, val;
+
+ n = fscanf(fp, "%d", &val);
+ fclose(fp);
+ if ((n == 1)) {
+ /* success */
+ af_rds = val;
+ } else {
+ read_fail = 1;
+ goto read_fail;
+ }
+ } else {
+read_fail:
+ error(RET, "AF_RDS not defined. Unable to %s "
+ "/proc/sys/net/rds/pf_rds. Using %d.\n",
+ read_fail ? "read":"open", DEFAULT_AF_RDS);
+ af_rds = DEFAULT_AF_RDS;
+ }
+ }
+
+ return af_rds;
+}
+#define AF_RDS get_af_rds()
+#endif
/*
@@ -352,7 +392,7 @@ rds_socket(char *host, int port)
SS sockaddr;
socklen_t socklen;
- sockfd = socket(AF_INET_RDS, SOCK_SEQPACKET, 0);
+ sockfd = socket(AF_RDS, SOCK_SEQPACKET, 0);
if (sockfd < 0)
error(SYS, "socket failed");
setsockopt_one(sockfd, SO_REUSEADDR);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ofed/not-in-debian/qperf.git
More information about the Pkg-ofed-commits
mailing list