Date: Wed, 18 Aug 2010 07:37:16 +0000 (UTC) From: Jeff Roberson <jeff@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r211444 - in projects/ofed/head/contrib/ofed: management/libibmad/src management/libibumad/src management/opensm/include/complib usr.bin/opensm usr.lib/libibcommon usr.lib/libibmad usr.... Message-ID: <201008180737.o7I7bG9P058485@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jeff Date: Wed Aug 18 07:37:16 2010 New Revision: 211444 URL: http://svn.freebsd.org/changeset/base/211444 Log: - Simplify makefiles now that /usr/include/infiniband exists. - Don't duplicate byteswap functionality contained elsewhere. - Disable umad debugging, it seems to work well now. Sponsored by: Isilon Systems, iX Systems, and Panasas. Modified: projects/ofed/head/contrib/ofed/management/libibmad/src/rpc.c projects/ofed/head/contrib/ofed/management/libibumad/src/umad.c projects/ofed/head/contrib/ofed/management/opensm/include/complib/cl_byteswap.h projects/ofed/head/contrib/ofed/usr.bin/opensm/Makefile projects/ofed/head/contrib/ofed/usr.lib/libibcommon/Makefile projects/ofed/head/contrib/ofed/usr.lib/libibmad/Makefile projects/ofed/head/contrib/ofed/usr.lib/libibumad/Makefile Modified: projects/ofed/head/contrib/ofed/management/libibmad/src/rpc.c ============================================================================== --- projects/ofed/head/contrib/ofed/management/libibmad/src/rpc.c Wed Aug 18 07:34:58 2010 (r211443) +++ projects/ofed/head/contrib/ofed/management/libibmad/src/rpc.c Wed Aug 18 07:37:16 2010 (r211444) @@ -140,7 +140,7 @@ _do_madrpc(int port_id, void *sndbuf, vo length = len; if (umad_send(port_id, agentid, sndbuf, length, timeout, 0) < 0) { - IBWARN("send failed; %m"); + IBWARN("send failed; %s", strerror(errno)); return -1; } @@ -148,7 +148,7 @@ _do_madrpc(int port_id, void *sndbuf, vo /* send packet is lost somewhere. */ do { if (umad_recv(port_id, rcvbuf, &length, timeout) < 0) { - IBWARN("recv failed: %m"); + IBWARN("recv failed: %s", strerror(errno)); return -1; } Modified: projects/ofed/head/contrib/ofed/management/libibumad/src/umad.c ============================================================================== --- projects/ofed/head/contrib/ofed/management/libibumad/src/umad.c Wed Aug 18 07:34:58 2010 (r211443) +++ projects/ofed/head/contrib/ofed/management/libibumad/src/umad.c Wed Aug 18 07:37:16 2010 (r211444) @@ -79,7 +79,7 @@ typedef struct ib_user_mad_reg_req { #define TRACE if (umaddebug) IBWARN #define DEBUG if (umaddebug) IBWARN -int umaddebug = 1; +int umaddebug = 0; #define UMAD_DEV_FILE_SZ 256 Modified: projects/ofed/head/contrib/ofed/management/opensm/include/complib/cl_byteswap.h ============================================================================== --- projects/ofed/head/contrib/ofed/management/opensm/include/complib/cl_byteswap.h Wed Aug 18 07:34:58 2010 (r211443) +++ projects/ofed/head/contrib/ofed/management/opensm/include/complib/cl_byteswap.h Wed Aug 18 07:37:16 2010 (r211444) @@ -86,11 +86,6 @@ BEGIN_C_DECLS * ntoh32, hton32 * ntoh64, hton64 */ -#include <sys/endian.h> -#define __BYTE_ORDER _BYTE_ORDER -#define bswap_16 bswap16 -#define bswap_32 bswap32 -#define bswap_64 bswap64 #ifndef __BYTE_ORDER #error "__BYTE_ORDER macro undefined. Missing in endian.h?" Modified: projects/ofed/head/contrib/ofed/usr.bin/opensm/Makefile ============================================================================== --- projects/ofed/head/contrib/ofed/usr.bin/opensm/Makefile Wed Aug 18 07:34:58 2010 (r211443) +++ projects/ofed/head/contrib/ofed/usr.bin/opensm/Makefile Wed Aug 18 07:37:16 2010 (r211444) @@ -30,8 +30,10 @@ SRCS+= osm_dump.c osm_ucast_cache.c osm_ SRCS+= osm_qos_policy.c LDADD= -lopensm -losmvendor -losmcomp -libmad -libumad -libcommon -CFLAGS+= -I${DIAGPATH}/include -I${OFEDSYS}/include -I/usr/include/infiniband +CFLAGS+= -I${OFEDSYS}/include -I/usr/include/infiniband CFLAGS+= -pthread +CFLAGS+= -DVENDOR_RMPP_SUPPORT -DDUAL_SIDED_RMPP + MAN= opensm.8 WARNS?= 1 Modified: projects/ofed/head/contrib/ofed/usr.lib/libibcommon/Makefile ============================================================================== --- projects/ofed/head/contrib/ofed/usr.lib/libibcommon/Makefile Wed Aug 18 07:34:58 2010 (r211443) +++ projects/ofed/head/contrib/ofed/usr.lib/libibcommon/Makefile Wed Aug 18 07:37:16 2010 (r211444) @@ -16,8 +16,7 @@ NO_PROFILE= SRCS= sysfs.c util.c hash.c stack.c time.c -CFLAGS+= -I${.CURDIR} -I${IBSRCDIR} -I${IBCOMMONDIR}/include -CFLAGS+= -I${OFEDSYS}/include -I${IBCOMMONDIR}/include/infiniband +CFLAGS+= -I${.CURDIR} -I${IBSRCDIR} -I${OFEDSYS}/include -I/usr/include/infiniband VERSION_MAP= ${IBSRCDIR}/libibcommon.map Modified: projects/ofed/head/contrib/ofed/usr.lib/libibmad/Makefile ============================================================================== --- projects/ofed/head/contrib/ofed/usr.lib/libibmad/Makefile Wed Aug 18 07:34:58 2010 (r211443) +++ projects/ofed/head/contrib/ofed/usr.lib/libibmad/Makefile Wed Aug 18 07:37:16 2010 (r211444) @@ -5,7 +5,6 @@ SHLIBDIR?= /usr/lib .include <bsd.own.mk> IBMADDIR= ../../management/libibmad -COMMONDIR= ../../management/libibcommon/include UMADDIR= ../../management/libibumad/include IBSRCDIR= ${IBMADDIR}/src OFEDSYS= ../../../../sys/ofed @@ -20,8 +19,8 @@ SRCS= dump.c fields.c gs.c mad.c portid. serv.c smp.c vendor.c CFLAGS+= -DHAVE_CONFIG_H -CFLAGS+= -I${.CURDIR} -I${IBSRCDIR} -I${IBMADDIR}/include -I${COMMONDIR} -CFLAGS+= -I${OFEDSYS}/include -I${IBMADDIR}/include/infiniband -I${UMADDIR} +CFLAGS+= -I${.CURDIR} -I${IBSRCDIR} -I${IBMADDIR}/include +CFLAGS+= -I/usr/include/infiniband -I${OFEDSYS}/include VERSION_MAP= ${IBSRCDIR}/libibmad.map Modified: projects/ofed/head/contrib/ofed/usr.lib/libibumad/Makefile ============================================================================== --- projects/ofed/head/contrib/ofed/usr.lib/libibumad/Makefile Wed Aug 18 07:34:58 2010 (r211443) +++ projects/ofed/head/contrib/ofed/usr.lib/libibumad/Makefile Wed Aug 18 07:37:16 2010 (r211444) @@ -4,8 +4,6 @@ SHLIBDIR?= /usr/lib .include <bsd.own.mk> -IBMADDIR= ../../management/libibmad -COMMONDIR= ../../management/libibcommon/include UMADDIR= ../../management/libibumad IBSRCDIR= ${UMADDIR}/src OFEDSYS= ../../../../sys/ofed @@ -19,8 +17,7 @@ NO_PROFILE= SRCS= umad.c CFLAGS+= -DHAVE_CONFIG_H -CFLAGS+= -I${.CURDIR} -I${IBSRCDIR} -I${IBMADDIR}/include -I${COMMONDIR} -CFLAGS+= -I${OFEDSYS}/include -I${UMADDIR}/include/infiniband +CFLAGS+= -I${.CURDIR} -I/usr/include/infiniband -I${OFEDSYS}/include VERSION_MAP= ${IBSRCDIR}/libibumad.map
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201008180737.o7I7bG9P058485>