[Pkg-ofed-commits] r571 - in /branches/ofed-1.5lenny/libibcm/branches/upstream/c...
gmpc-guest at alioth.debian.org
gmpc-guest at alioth.debian.org
Thu Feb 4 14:46:42 UTC 2010
Author: gmpc-guest
Date: Thu Feb 4 14:46:41 2010
New Revision: 571
URL: http://svn.debian.org/wsvn/pkg-ofed/?sc=1&rev=571
Log:
[svn-upgrade] Integrating new upstream version, libibcm (1.0.5)
Removed:
branches/ofed-1.5lenny/libibcm/branches/upstream/current/autogen.sh
branches/ofed-1.5lenny/libibcm/branches/upstream/current/autom4te.cache/
branches/ofed-1.5lenny/libibcm/branches/upstream/current/examples/
Modified:
branches/ofed-1.5lenny/libibcm/branches/upstream/current/configure
branches/ofed-1.5lenny/libibcm/branches/upstream/current/configure.in
branches/ofed-1.5lenny/libibcm/branches/upstream/current/libibcm.spec
branches/ofed-1.5lenny/libibcm/branches/upstream/current/libibcm.spec.in
branches/ofed-1.5lenny/libibcm/branches/upstream/current/src/cm.c
Modified: branches/ofed-1.5lenny/libibcm/branches/upstream/current/configure
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5lenny/libibcm/branches/upstream/current/configure?rev=571&op=diff
==============================================================================
--- branches/ofed-1.5lenny/libibcm/branches/upstream/current/configure (original)
+++ branches/ofed-1.5lenny/libibcm/branches/upstream/current/configure Thu Feb 4 14:46:41 2010
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for libibcm 1.0.4.
+# Generated by GNU Autoconf 2.59 for libibcm 1.0.5.
#
# Report bugs to <general at lists@openfabrics.org>.
#
@@ -423,8 +423,8 @@
# Identity of this package.
PACKAGE_NAME='libibcm'
PACKAGE_TARNAME='libibcm'
-PACKAGE_VERSION='1.0.4'
-PACKAGE_STRING='libibcm 1.0.4'
+PACKAGE_VERSION='1.0.5'
+PACKAGE_STRING='libibcm 1.0.5'
PACKAGE_BUGREPORT='general at lists@openfabrics.org'
ac_unique_file="src/cm.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 libibcm 1.0.4 to adapt to many kinds of systems.
+\`configure' configures libibcm 1.0.5 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 libibcm 1.0.4:";;
+ short | recursive ) echo "Configuration of libibcm 1.0.5:";;
esac
cat <<\_ACEOF
@@ -1161,7 +1161,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-libibcm configure 1.0.4
+libibcm configure 1.0.5
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 libibcm $as_me 1.0.4, which was
+It was created by libibcm $as_me 1.0.5, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1821,7 +1821,7 @@
# Define the identity of the package.
PACKAGE=libibcm
- VERSION=1.0.4
+ VERSION=1.0.5
cat >>confdefs.h <<_ACEOF
@@ -21056,7 +21056,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by libibcm $as_me 1.0.4, which was
+This file was extended by libibcm $as_me 1.0.5, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21119,7 +21119,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-libibcm config.status 1.0.4
+libibcm config.status 1.0.5
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
Modified: branches/ofed-1.5lenny/libibcm/branches/upstream/current/configure.in
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5lenny/libibcm/branches/upstream/current/configure.in?rev=571&op=diff
==============================================================================
--- branches/ofed-1.5lenny/libibcm/branches/upstream/current/configure.in (original)
+++ branches/ofed-1.5lenny/libibcm/branches/upstream/current/configure.in Thu Feb 4 14:46:41 2010
@@ -1,11 +1,11 @@
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.57)
-AC_INIT(libibcm, 1.0.4, general at lists@openfabrics.org)
+AC_INIT(libibcm, 1.0.5, general at lists@openfabrics.org)
AC_CONFIG_SRCDIR([src/cm.c])
AC_CONFIG_AUX_DIR(config)
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(libibcm, 1.0.4)
+AM_INIT_AUTOMAKE(libibcm, 1.0.5)
AM_PROG_LIBTOOL
Modified: branches/ofed-1.5lenny/libibcm/branches/upstream/current/libibcm.spec
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5lenny/libibcm/branches/upstream/current/libibcm.spec?rev=571&op=diff
==============================================================================
--- branches/ofed-1.5lenny/libibcm/branches/upstream/current/libibcm.spec (original)
+++ branches/ofed-1.5lenny/libibcm/branches/upstream/current/libibcm.spec Thu Feb 4 14:46:41 2010
@@ -1,14 +1,14 @@
-%define ver 1.0.4
+%define ver 1.0.5
Name: libibcm
-Version: 1.0.4
-Release: 1.ofed1.4
+Version: 1.0.5
+Release: 1%{?dist}
Summary: Userspace InfiniBand Communication Manager.
Group: System Environment/Libraries
License: GPL/BSD
Url: http://www.openfabrics.org/
-Source: http://www.openfabrics.org/downloads/libibcm-1.0.4.tar.gz
+Source: http://www.openfabrics.org/downloads/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description
Modified: branches/ofed-1.5lenny/libibcm/branches/upstream/current/libibcm.spec.in
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5lenny/libibcm/branches/upstream/current/libibcm.spec.in?rev=571&op=diff
==============================================================================
--- branches/ofed-1.5lenny/libibcm/branches/upstream/current/libibcm.spec.in (original)
+++ branches/ofed-1.5lenny/libibcm/branches/upstream/current/libibcm.spec.in Thu Feb 4 14:46:41 2010
@@ -1,7 +1,7 @@
%define ver @VERSION@
Name: libibcm
-Version: 1.0.4
+Version: 1.0.5
Release: 1%{?dist}
Summary: Userspace InfiniBand Communication Manager.
Modified: branches/ofed-1.5lenny/libibcm/branches/upstream/current/src/cm.c
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5lenny/libibcm/branches/upstream/current/src/cm.c?rev=571&op=diff
==============================================================================
--- branches/ofed-1.5lenny/libibcm/branches/upstream/current/src/cm.c (original)
+++ branches/ofed-1.5lenny/libibcm/branches/upstream/current/src/cm.c Thu Feb 4 14:46:41 2010
@@ -71,6 +71,13 @@
IB_UCM_MAX_DEVICES = 32
};
+static inline int ERR(int err)
+{
+ errno = err;
+ return -1;
+}
+
+
#define CM_CREATE_MSG_CMD_RESP(msg, cmd, resp, type, size) \
do { \
struct cm_abi_cmd_hdr *hdr; \
@@ -78,7 +85,7 @@
size = sizeof(*hdr) + sizeof(*cmd); \
msg = alloca(size); \
if (!msg) \
- return -ENOMEM; \
+ return ERR(ENOMEM); \
hdr = msg; \
cmd = msg + sizeof(*hdr); \
hdr->cmd = type; \
@@ -87,7 +94,7 @@
memset(cmd, 0, sizeof(*cmd)); \
resp = alloca(sizeof(*resp)); \
if (!resp) \
- return -ENOMEM; \
+ return ERR(ENOMEM); \
cmd->response = (uintptr_t)resp;\
} while (0)
@@ -98,7 +105,7 @@
size = sizeof(*hdr) + sizeof(*cmd); \
msg = alloca(size); \
if (!msg) \
- return -ENOMEM; \
+ return ERR(ENOMEM); \
hdr = msg; \
cmd = msg + sizeof(*hdr); \
hdr->cmd = type; \
@@ -260,7 +267,7 @@
cm_id_priv = ib_cm_alloc_id(device, context);
if (!cm_id_priv)
- return -ENOMEM;
+ return ERR(ENOMEM);
CM_CREATE_MSG_CMD_RESP(msg, cmd, resp, IB_USER_CM_CMD_CREATE_ID, size);
cmd->uid = (uintptr_t) cm_id_priv;
@@ -293,7 +300,7 @@
result = write(cm_id->device->fd, msg, size);
if (result != size)
- return (result > 0) ? -ENODATA : result;
+ return (result >= 0) ? ERR(ENODATA) : -1;
VALGRIND_MAKE_MEM_DEFINED(resp, sizeof *resp);
@@ -317,14 +324,14 @@
int size;
if (!param)
- return -EINVAL;
+ return ERR(EINVAL);
CM_CREATE_MSG_CMD_RESP(msg, cmd, resp, IB_USER_CM_CMD_ATTR_ID, size);
cmd->id = cm_id->handle;
result = write(cm_id->device->fd, msg, size);
if (result != size)
- return (result > 0) ? -ENODATA : result;
+ return (result >= 0) ? ERR(ENODATA) : -1;
VALGRIND_MAKE_MEM_DEFINED(resp, sizeof *resp);
@@ -346,7 +353,7 @@
int size;
if (!qp_attr || !qp_attr_mask)
- return -EINVAL;
+ return ERR(EINVAL);
CM_CREATE_MSG_CMD_RESP(msg, cmd, resp, IB_USER_CM_CMD_INIT_QP_ATTR, size);
cmd->id = cm_id->handle;
@@ -354,7 +361,7 @@
result = write(cm_id->device->fd, msg, size);
if (result != size)
- return (result > 0) ? -ENODATA : result;
+ return (result >= 0) ? ERR(ENODATA) : result;
VALGRIND_MAKE_MEM_DEFINED(resp, sizeof *resp);
@@ -380,7 +387,7 @@
result = write(cm_id->device->fd, msg, size);
if (result != size)
- return (result > 0) ? -ENODATA : result;
+ return (result >= 0) ? ERR(ENODATA) : -1;
return 0;
}
@@ -395,7 +402,7 @@
int size;
if (!param)
- return -EINVAL;
+ return ERR(EINVAL);
CM_CREATE_MSG_CMD(msg, cmd, IB_USER_CM_CMD_SEND_REQ, size);
cmd->id = cm_id->handle;
@@ -417,7 +424,7 @@
if (param->primary_path) {
p_path = alloca(sizeof(*p_path));
if (!p_path)
- return -ENOMEM;
+ return ERR(ENOMEM);
ibv_copy_path_rec_to_kern(p_path, param->primary_path);
cmd->primary_path = (uintptr_t) p_path;
@@ -426,7 +433,7 @@
if (param->alternate_path) {
a_path = alloca(sizeof(*a_path));
if (!a_path)
- return -ENOMEM;
+ return ERR(ENOMEM);
ibv_copy_path_rec_to_kern(a_path, param->alternate_path);
cmd->alternate_path = (uintptr_t) a_path;
@@ -439,7 +446,7 @@
result = write(cm_id->device->fd, msg, size);
if (result != size)
- return (result > 0) ? -ENODATA : result;
+ return (result >= 0) ? ERR(ENODATA) : -1;
return 0;
}
@@ -452,7 +459,7 @@
int size;
if (!param)
- return -EINVAL;
+ return ERR(EINVAL);
CM_CREATE_MSG_CMD(msg, cmd, IB_USER_CM_CMD_SEND_REP, size);
cmd->uid = (uintptr_t) container_of(cm_id, struct cm_id_private, id);
@@ -474,7 +481,7 @@
result = write(cm_id->device->fd, msg, size);
if (result != size)
- return (result > 0) ? -ENODATA : result;
+ return (result >= 0) ? ERR(ENODATA) : -1;
return 0;
}
@@ -499,7 +506,7 @@
result = write(cm_id->device->fd, msg, size);
if (result != size)
- return (result > 0) ? -ENODATA : result;
+ return (result >= 0) ? ERR(ENODATA) : -1;
return 0;
}
@@ -540,7 +547,7 @@
result = write(cm_id->device->fd, msg, size);
if (result != size)
- return (result > 0) ? -ENODATA : result;
+ return (result >= 0) ? ERR(ENODATA) : -1;
return 0;
}
@@ -556,7 +563,7 @@
if (event == IBV_EVENT_COMM_EST)
return cm_establish(cm_id);
else
- return -EINVAL;
+ return ERR(EINVAL);
}
CM_CREATE_MSG_CMD(msg, cmd, IB_USER_CM_CMD_NOTIFY, size);
@@ -565,7 +572,7 @@
result = write(cm_id->device->fd, msg, size);
if (result != size)
- return (result > 0) ? -ENODATA : result;
+ return (result >= 0) ? ERR(ENODATA) : -1;
return 0;
}
@@ -599,7 +606,7 @@
result = write(cm_id->device->fd, msg, size);
if (result != size)
- return (result > 0) ? -ENODATA : result;
+ return (result >= 0) ? ERR(ENODATA) : -1;
return 0;
}
@@ -649,7 +656,7 @@
result = write(cm_id->device->fd, msg, size);
if (result != size)
- return (result > 0) ? -ENODATA : result;
+ return (result >= 0) ? ERR(ENODATA) : result;
return 0;
}
@@ -671,7 +678,7 @@
if (alternate_path) {
abi_path = alloca(sizeof(*abi_path));
if (!abi_path)
- return -ENOMEM;
+ return ERR(ENOMEM);
ibv_copy_path_rec_to_kern(abi_path, alternate_path);
cmd->path = (uintptr_t) abi_path;
@@ -684,7 +691,7 @@
result = write(cm_id->device->fd, msg, size);
if (result != size)
- return (result > 0) ? -ENODATA : result;
+ return (result >= 0) ? ERR(ENODATA) : -1;
return 0;
}
@@ -699,7 +706,7 @@
int size;
if (!param)
- return -EINVAL;
+ return ERR(EINVAL);
CM_CREATE_MSG_CMD(msg, cmd, IB_USER_CM_CMD_SEND_SIDR_REQ, size);
cmd->id = cm_id->handle;
@@ -711,7 +718,7 @@
if (param->path) {
abi_path = alloca(sizeof(*abi_path));
if (!abi_path)
- return -ENOMEM;
+ return ERR(ENOMEM);
ibv_copy_path_rec_to_kern(abi_path, param->path);
cmd->path = (uintptr_t) abi_path;
@@ -724,7 +731,7 @@
result = write(cm_id->device->fd, msg, size);
if (result != size)
- return (result > 0) ? -ENODATA : result;
+ return (result >= 0) ? ERR(ENODATA) : result;
return 0;
}
@@ -738,7 +745,7 @@
int size;
if (!param)
- return -EINVAL;
+ return ERR(EINVAL);
CM_CREATE_MSG_CMD(msg, cmd, IB_USER_CM_CMD_SEND_SIDR_REP, size);
cmd->id = cm_id->handle;
@@ -758,7 +765,7 @@
result = write(cm_id->device->fd, msg, size);
if (result != size)
- return (result > 0) ? -ENODATA : result;
+ return (result >= 0) ? ERR(ENODATA) : -1;
return 0;
}
@@ -827,12 +834,12 @@
int size;
if (!event)
- return -EINVAL;
+ return ERR(EINVAL);
size = sizeof(*hdr) + sizeof(*cmd);
msg = alloca(size);
if (!msg)
- return -ENOMEM;
+ return ERR(ENOMEM);
hdr = msg;
cmd = msg + sizeof(*hdr);
@@ -845,7 +852,7 @@
resp = alloca(sizeof(*resp));
if (!resp)
- return -ENOMEM;
+ return ERR(ENOMEM);
cmd->response = (uintptr_t) resp;
cmd->data_len = (uint8_t)(~0U);
@@ -853,13 +860,13 @@
data = malloc(cmd->data_len);
if (!data) {
- result = -ENOMEM;
+ result = ERR(ENOMEM);
goto done;
}
info = malloc(cmd->info_len);
if (!info) {
- result = -ENOMEM;
+ result = ERR(ENOMEM);
goto done;
}
@@ -868,7 +875,7 @@
result = write(device->fd, msg, size);
if (result != size) {
- result = (result > 0) ? -ENODATA : result;
+ result = (result >= 0) ? ERR(ENODATA) : -1;
goto done;
}
@@ -879,7 +886,7 @@
*/
evt = malloc(sizeof(*evt));
if (!evt) {
- result = -ENOMEM;
+ result = ERR(ENOMEM);
goto done;
}
memset(evt, 0, sizeof(*evt));
@@ -889,7 +896,7 @@
if (resp->present & CM_ABI_PRES_PRIMARY) {
path_a = malloc(sizeof(*path_a));
if (!path_a) {
- result = -ENOMEM;
+ result = ERR(ENOMEM);
goto done;
}
}
@@ -897,7 +904,7 @@
if (resp->present & CM_ABI_PRES_ALTERNATE) {
path_b = malloc(sizeof(*path_b));
if (!path_b) {
- result = -ENOMEM;
+ result = ERR(ENOMEM);
goto done;
}
}
@@ -908,7 +915,7 @@
cm_id_priv = ib_cm_alloc_id(evt->cm_id->device,
evt->cm_id->context);
if (!cm_id_priv) {
- result = -ENOMEM;
+ result = ERR(ENOMEM);
goto done;
}
cm_id_priv->id.handle = resp->id;
@@ -946,7 +953,7 @@
cm_id_priv = ib_cm_alloc_id(evt->cm_id->device,
evt->cm_id->context);
if (!cm_id_priv) {
- result = -ENOMEM;
+ result = ERR(ENOMEM);
goto done;
}
cm_id_priv->id.handle = resp->id;
@@ -993,7 +1000,7 @@
struct cm_id_private *cm_id_priv;
if (!event)
- return -EINVAL;
+ return ERR(EINVAL);
if (event->private_data)
free(event->private_data);
More information about the Pkg-ofed-commits
mailing list