[Pkg-ofed-commits] [librdmacm] 12/18: Imported Upstream version 1.0.14.1

Ana Beatriz Guerrero López ana at moszumanska.debian.org
Wed Jul 2 13:58:24 UTC 2014


This is an automated email from the git hooks/post-receive script.

ana pushed a commit to branch master
in repository librdmacm.

commit 8181742e46736fb32c47d0a2a325bde26fb92539
Author: Ana Guerrero López <ana at ekaia.org>
Date:   Wed Jul 2 15:58:07 2014 +0200

    Imported Upstream version 1.0.14.1
---
 configure         | 20 ++++++++++----------
 configure.in      |  4 ++--
 examples/rping.c  | 10 +++++-----
 librdmacm.spec    |  4 ++--
 librdmacm.spec.in |  2 +-
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/configure b/configure
index 161d7ef..b8c4833 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.59 for librdmacm 1.0.14.
+# Generated by GNU Autoconf 2.59 for librdmacm 1.0.14.1.
 #
 # Report bugs to <general at lists.openfabrics.org>.
 #
@@ -423,8 +423,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='librdmacm'
 PACKAGE_TARNAME='librdmacm'
-PACKAGE_VERSION='1.0.14'
-PACKAGE_STRING='librdmacm 1.0.14'
+PACKAGE_VERSION='1.0.14.1'
+PACKAGE_STRING='librdmacm 1.0.14.1'
 PACKAGE_BUGREPORT='general at lists.openfabrics.org'
 
 ac_unique_file="src/cma.c"
@@ -954,7 +954,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 librdmacm 1.0.14 to adapt to many kinds of systems.
+\`configure' configures librdmacm 1.0.14.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1020,7 +1020,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of librdmacm 1.0.14:";;
+     short | recursive ) echo "Configuration of librdmacm 1.0.14.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1162,7 +1162,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-librdmacm configure 1.0.14
+librdmacm configure 1.0.14.1
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1176,7 +1176,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by librdmacm $as_me 1.0.14, which was
+It was created by librdmacm $as_me 1.0.14.1, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1833,7 +1833,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=librdmacm
- VERSION=1.0.14
+ VERSION=1.0.14.1
 
 
 cat >>confdefs.h <<_ACEOF
@@ -21164,7 +21164,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by librdmacm $as_me 1.0.14, which was
+This file was extended by librdmacm $as_me 1.0.14.1, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -21227,7 +21227,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-librdmacm config.status 1.0.14
+librdmacm config.status 1.0.14.1
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/configure.in b/configure.in
index d4ae89f..927a6ea 100644
--- a/configure.in
+++ b/configure.in
@@ -1,12 +1,12 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.57)
-AC_INIT(librdmacm, 1.0.14, general at lists.openfabrics.org)
+AC_INIT(librdmacm, 1.0.14.1, general at lists.openfabrics.org)
 AC_CONFIG_SRCDIR([src/cma.c])
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_MACRO_DIR(config)
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(librdmacm, 1.0.14)
+AM_INIT_AUTOMAKE(librdmacm, 1.0.14.1)
 
 AM_PROG_LIBTOOL
 
diff --git a/examples/rping.c b/examples/rping.c
index ee292ec..2d4c2de 100644
--- a/examples/rping.c
+++ b/examples/rping.c
@@ -280,11 +280,12 @@ static int rping_cq_event_handler(struct rping_cb *cb)
 		ret = 0;
 
 		if (wc.status) {
-			if (wc.status != IBV_WC_WR_FLUSH_ERR)
+			if (wc.status != IBV_WC_WR_FLUSH_ERR) {
 				fprintf(stderr,
 					"cq completion failed status %d\n",
 					wc.status);
-			ret = -1;
+				ret = -1;
+			}
 			goto error;
 		}
 
@@ -801,9 +802,10 @@ static void *rping_persistent_server_thread(void *arg)
 
 	rping_test_server(cb);
 	rdma_disconnect(cb->child_cm_id);
-	pthread_join(cb->cqthread, NULL);
 	rping_free_buffers(cb);
 	rping_free_qp(cb);
+	pthread_cancel(cb->cqthread);
+	pthread_join(cb->cqthread, NULL);
 	rdma_destroy_id(cb->child_cm_id);
 	free_cb(cb);
 	return NULL;
@@ -888,7 +890,6 @@ static int rping_run_server(struct rping_cb *cb)
 
 	rping_test_server(cb);
 	rdma_disconnect(cb->child_cm_id);
-	pthread_join(cb->cqthread, NULL);
 	rdma_destroy_id(cb->child_cm_id);
 err2:
 	rping_free_buffers(cb);
@@ -1056,7 +1057,6 @@ static int rping_run_client(struct rping_cb *cb)
 
 	rping_test_client(cb);
 	rdma_disconnect(cb->cm_id);
-	pthread_join(cb->cqthread, NULL);
 err2:
 	rping_free_buffers(cb);
 err1:
diff --git a/librdmacm.spec b/librdmacm.spec
index 65eff40..7bbbdb9 100644
--- a/librdmacm.spec
+++ b/librdmacm.spec
@@ -1,7 +1,7 @@
-%define ver 1.0.14
+%define ver 1.0.14.1
 
 Name: librdmacm
-Version: 1.0.14
+Version: 1.0.14.1
 Release: 1%{?dist}
 Summary: Userspace RDMA Connection Manager
 
diff --git a/librdmacm.spec.in b/librdmacm.spec.in
index fccca3b..0044a2d 100644
--- a/librdmacm.spec.in
+++ b/librdmacm.spec.in
@@ -1,7 +1,7 @@
 %define ver @VERSION@
 
 Name: librdmacm
-Version: 1.0.14
+Version: 1.0.14.1
 Release: 1%{?dist}
 Summary: Userspace RDMA Connection Manager
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ofed/librdmacm.git



More information about the Pkg-ofed-commits mailing list