[Pkg-ofed-commits] r717 - in /branches/ofed-1.5.1lenny/librdmacm/trunk: ./ debia...
gmpc-guest at alioth.debian.org
gmpc-guest at alioth.debian.org
Wed May 5 14:57:07 UTC 2010
Author: gmpc-guest
Date: Wed May 5 14:57:03 2010
New Revision: 717
URL: http://svn.debian.org/wsvn/pkg-ofed/?sc=1&rev=717
Log:
OFED 1.5.1 release
Modified:
branches/ofed-1.5.1lenny/librdmacm/trunk/configure
branches/ofed-1.5.1lenny/librdmacm/trunk/configure.in
branches/ofed-1.5.1lenny/librdmacm/trunk/debian/changelog
branches/ofed-1.5.1lenny/librdmacm/trunk/examples/cmatose.c
branches/ofed-1.5.1lenny/librdmacm/trunk/examples/mckey.c
branches/ofed-1.5.1lenny/librdmacm/trunk/librdmacm.spec
branches/ofed-1.5.1lenny/librdmacm/trunk/librdmacm.spec.in
branches/ofed-1.5.1lenny/librdmacm/trunk/man/mckey.1
Modified: branches/ofed-1.5.1lenny/librdmacm/trunk/configure
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5.1lenny/librdmacm/trunk/configure?rev=717&op=diff
==============================================================================
--- branches/ofed-1.5.1lenny/librdmacm/trunk/configure (original)
+++ branches/ofed-1.5.1lenny/librdmacm/trunk/configure Wed May 5 14:57:03 2010
@@ -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.10.
+# Generated by GNU Autoconf 2.59 for librdmacm 1.0.11.
#
# Report bugs to <general at lists.openfabrics.org>.
#
@@ -423,8 +423,8 @@
# Identity of this package.
PACKAGE_NAME='librdmacm'
PACKAGE_TARNAME='librdmacm'
-PACKAGE_VERSION='1.0.10'
-PACKAGE_STRING='librdmacm 1.0.10'
+PACKAGE_VERSION='1.0.11'
+PACKAGE_STRING='librdmacm 1.0.11'
PACKAGE_BUGREPORT='general at lists.openfabrics.org'
ac_unique_file="src/cma.c"
@@ -954,7 +954,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 librdmacm 1.0.10 to adapt to many kinds of systems.
+\`configure' configures librdmacm 1.0.11 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1020,7 +1020,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of librdmacm 1.0.10:";;
+ short | recursive ) echo "Configuration of librdmacm 1.0.11:";;
esac
cat <<\_ACEOF
@@ -1161,7 +1161,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-librdmacm configure 1.0.10
+librdmacm configure 1.0.11
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1175,7 +1175,7 @@
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.10, which was
+It was created by librdmacm $as_me 1.0.11, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1821,7 +1821,7 @@
# Define the identity of the package.
PACKAGE=librdmacm
- VERSION=1.0.10
+ VERSION=1.0.11
cat >>confdefs.h <<_ACEOF
@@ -20908,7 +20908,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by librdmacm $as_me 1.0.10, which was
+This file was extended by librdmacm $as_me 1.0.11, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -20971,7 +20971,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-librdmacm config.status 1.0.10
+librdmacm config.status 1.0.11
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
Modified: branches/ofed-1.5.1lenny/librdmacm/trunk/configure.in
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5.1lenny/librdmacm/trunk/configure.in?rev=717&op=diff
==============================================================================
--- branches/ofed-1.5.1lenny/librdmacm/trunk/configure.in (original)
+++ branches/ofed-1.5.1lenny/librdmacm/trunk/configure.in Wed May 5 14:57:03 2010
@@ -1,11 +1,11 @@
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.57)
-AC_INIT(librdmacm, 1.0.10, general at lists.openfabrics.org)
+AC_INIT(librdmacm, 1.0.11, general at lists.openfabrics.org)
AC_CONFIG_SRCDIR([src/cma.c])
AC_CONFIG_AUX_DIR(config)
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(librdmacm, 1.0.10)
+AM_INIT_AUTOMAKE(librdmacm, 1.0.11)
AM_PROG_LIBTOOL
Modified: branches/ofed-1.5.1lenny/librdmacm/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5.1lenny/librdmacm/trunk/debian/changelog?rev=717&op=diff
==============================================================================
--- branches/ofed-1.5.1lenny/librdmacm/trunk/debian/changelog (original)
+++ branches/ofed-1.5.1lenny/librdmacm/trunk/debian/changelog Wed May 5 14:57:03 2010
@@ -1,3 +1,9 @@
+librdmacm (1.0.11-1) unstable; urgency=low
+
+ * New upstream release (OFED 1.5.1)
+
+ -- Guy Coates <gmpc at sanger.ac.uk> Wed, 05 May 2010 15:56:14 +0100
+
librdmacm (1.0.10-1) unstable; urgency=low
* New upstream release (OFED 1.5)
Modified: branches/ofed-1.5.1lenny/librdmacm/trunk/examples/cmatose.c
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5.1lenny/librdmacm/trunk/examples/cmatose.c?rev=717&op=diff
==============================================================================
--- branches/ofed-1.5.1lenny/librdmacm/trunk/examples/cmatose.c (original)
+++ branches/ofed-1.5.1lenny/librdmacm/trunk/examples/cmatose.c Wed May 5 14:57:03 2010
@@ -75,10 +75,7 @@
int connects_left;
int disconnects_left;
- struct sockaddr_in dst_in;
- struct sockaddr *dst_addr;
- struct sockaddr_in src_in;
- struct sockaddr *src_addr;
+ struct rdma_addr addr;
};
static struct cmatest test;
@@ -505,7 +502,7 @@
return ret;
}
-static int get_addr(char *dst, struct sockaddr_in *addr)
+static int get_addr(char *dst, struct sockaddr *addr)
{
struct addrinfo *res;
int ret;
@@ -516,15 +513,15 @@
return ret;
}
- if (res->ai_family != PF_INET) {
+ if (res->ai_family == PF_INET)
+ memcpy(addr, res->ai_addr, sizeof(struct sockaddr_in));
+ else if (res->ai_family == PF_INET6)
+ memcpy(addr, res->ai_addr, sizeof(struct sockaddr_in6));
+ else
ret = -1;
- goto out;
- }
-
- *addr = *(struct sockaddr_in *) res->ai_addr;
-out:
- freeaddrinfo(res);
- return ret;
+
+ freeaddrinfo(res);
+ return ret;
}
static int run_server(void)
@@ -540,14 +537,21 @@
}
if (src_addr) {
- ret = get_addr(src_addr, &test.src_in);
+ ret = get_addr(src_addr, &test.addr.src_addr);
if (ret)
goto out;
- } else
- test.src_in.sin_family = PF_INET;
-
- test.src_in.sin_port = port;
- ret = rdma_bind_addr(listen_id, test.src_addr);
+ if (test.addr.src_addr.sa_family == AF_INET)
+ ((struct sockaddr_in *) &test.addr.src_addr)->sin_port = port;
+ else
+ ((struct sockaddr_in6 *) &test.addr.src_addr)->sin6_port = port;
+
+ } else {
+ test.addr.src_addr.sa_family = PF_INET;
+ ((struct sockaddr_in *) &test.addr.src_addr)->sin_port = port;
+ }
+
+ ret = rdma_bind_addr(listen_id, &test.addr.src_addr);
+
if (ret) {
perror("cmatose: bind address failed");
goto out;
@@ -614,22 +618,25 @@
printf("cmatose: starting client\n");
if (src_addr) {
- ret = get_addr(src_addr, &test.src_in);
+ ret = get_addr(src_addr, &test.addr.src_addr);
if (ret)
return ret;
}
- ret = get_addr(dst_addr, &test.dst_in);
+ ret = get_addr(dst_addr, &test.addr.dst_addr);
if (ret)
return ret;
- test.dst_in.sin_port = port;
+ if (test.addr.dst_addr.sa_family == AF_INET)
+ ((struct sockaddr_in *) &test.addr.dst_addr)->sin_port = port;
+ else
+ ((struct sockaddr_in6 *) &test.addr.dst_addr)->sin6_port = port;
printf("cmatose: connecting\n");
for (i = 0; i < connections; i++) {
ret = rdma_resolve_addr(test.nodes[i].cma_id,
- src_addr ? test.src_addr : NULL,
- test.dst_addr, 2000);
+ src_addr ? &test.addr.src_addr : NULL,
+ &test.addr.dst_addr, 2000);
if (ret) {
perror("cmatose: failure getting addr");
connect_error();
@@ -717,8 +724,6 @@
}
}
- test.dst_addr = (struct sockaddr *) &test.dst_in;
- test.src_addr = (struct sockaddr *) &test.src_in;
test.connects_left = connections;
test.disconnects_left = connections;
Modified: branches/ofed-1.5.1lenny/librdmacm/trunk/examples/mckey.c
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5.1lenny/librdmacm/trunk/examples/mckey.c?rev=717&op=diff
==============================================================================
--- branches/ofed-1.5.1lenny/librdmacm/trunk/examples/mckey.c (original)
+++ branches/ofed-1.5.1lenny/librdmacm/trunk/examples/mckey.c Wed May 5 14:57:03 2010
@@ -62,6 +62,7 @@
struct cmatest {
struct rdma_event_channel *channel;
+ pthread_t cmathread;
struct cmatest_node *nodes;
int conn_index;
int connects_left;
@@ -273,7 +274,8 @@
char buf[40];
inet_ntop(AF_INET6, param->ah_attr.grh.dgid.raw, buf, 40);
- printf("mckey: joined dgid: %s\n", buf);
+ printf("mckey: joined dgid: %s mlid 0x%x sl %d\n", buf,
+ param->ah_attr.dlid, param->ah_attr.sl);
node->remote_qpn = param->qp_num;
node->remote_qkey = param->qkey;
@@ -319,6 +321,33 @@
return ret;
}
+static void *cma_thread(void *arg)
+{
+ struct rdma_cm_event *event;
+ int ret;
+
+ while (1) {
+ ret = rdma_get_cm_event(test.channel, &event);
+ if (ret) {
+ perror("rdma_get_cm_event");
+ break;
+ }
+
+ switch (event->event) {
+ case RDMA_CM_EVENT_MULTICAST_ERROR:
+ case RDMA_CM_EVENT_ADDR_CHANGE:
+ printf("mckey: event: %s, status: %d\n",
+ rdma_event_str(event->event), event->status);
+ break;
+ default:
+ break;
+ }
+
+ rdma_ack_cm_event(event);
+ }
+ return NULL;
+}
+
static void destroy_node(struct cmatest_node *node)
{
if (!node->cma_id)
@@ -474,6 +503,8 @@
ret = connect_events();
if (ret)
goto out;
+
+ pthread_create(&test.cmathread, NULL, cma_thread, NULL);
/*
* Pause to give SM chance to configure switches. We don't want to
@@ -556,6 +587,12 @@
}
}
+ if (unmapped_addr && !src_addr) {
+ printf("unmapped multicast address requires binding "
+ "to source address\n");
+ exit(1);
+ }
+
test.dst_addr = (struct sockaddr *) &test.dst_in;
test.connects_left = connections;
Modified: branches/ofed-1.5.1lenny/librdmacm/trunk/librdmacm.spec
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5.1lenny/librdmacm/trunk/librdmacm.spec?rev=717&op=diff
==============================================================================
--- branches/ofed-1.5.1lenny/librdmacm/trunk/librdmacm.spec (original)
+++ branches/ofed-1.5.1lenny/librdmacm/trunk/librdmacm.spec Wed May 5 14:57:03 2010
@@ -1,7 +1,7 @@
-%define ver 1.0.10
+%define ver 1.0.11
Name: librdmacm
-Version: 1.0.10
+Version: 1.0.11
Release: 1%{?dist}
Summary: Userspace RDMA Connection Manager
Modified: branches/ofed-1.5.1lenny/librdmacm/trunk/librdmacm.spec.in
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5.1lenny/librdmacm/trunk/librdmacm.spec.in?rev=717&op=diff
==============================================================================
--- branches/ofed-1.5.1lenny/librdmacm/trunk/librdmacm.spec.in (original)
+++ branches/ofed-1.5.1lenny/librdmacm/trunk/librdmacm.spec.in Wed May 5 14:57:03 2010
@@ -1,7 +1,7 @@
%define ver @VERSION@
Name: librdmacm
-Version: 1.0.10
+Version: 1.0.11
Release: 1%{?dist}
Summary: Userspace RDMA Connection Manager
Modified: branches/ofed-1.5.1lenny/librdmacm/trunk/man/mckey.1
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5.1lenny/librdmacm/trunk/man/mckey.1?rev=717&op=diff
==============================================================================
--- branches/ofed-1.5.1lenny/librdmacm/trunk/man/mckey.1 (original)
+++ branches/ofed-1.5.1lenny/librdmacm/trunk/man/mckey.1 Wed May 5 14:57:03 2010
@@ -47,6 +47,11 @@
Basic usage is to start mckey -m multicast_address on a server system,
then run mckey -m multicast_address -s on a client system.
.P
+Unique Infiniband SA assigned multicast GIDs can be retrived by
+invoking mckey with a zero MGID or IP address. (Example, -M 0 or
+-m 0.0.0.0). The assigned address will be displayed to allow
+mckey clients to join the created group.
+.P
Because this test maps RDMA resources to userspace, users must ensure
that they have available system resources and permissions. See the
libibverbs README file for additional details.
More information about the Pkg-ofed-commits
mailing list