From owner-svn-src-projects@FreeBSD.ORG Wed Aug 11 23:56:37 2010 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D61251065670; Wed, 11 Aug 2010 23:56:37 +0000 (UTC) (envelope-from jeff@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C39138FC17; Wed, 11 Aug 2010 23:56:37 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o7BNubUT010317; Wed, 11 Aug 2010 23:56:37 GMT (envelope-from jeff@svn.freebsd.org) Received: (from jeff@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7BNubKC010310; Wed, 11 Aug 2010 23:56:37 GMT (envelope-from jeff@svn.freebsd.org) Message-Id: <201008112356.o7BNubKC010310@svn.freebsd.org> From: Jeff Roberson Date: Wed, 11 Aug 2010 23:56:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r211198 - in projects/ofed/head/contrib/ofed/management: infiniband-diags/src opensm/complib opensm/include/complib X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Aug 2010 23:56:37 -0000 Author: jeff Date: Wed Aug 11 23:56:37 2010 New Revision: 211198 URL: http://svn.freebsd.org/changeset/base/211198 Log: - Use strdup() rather than strdupa(). Leaking one copy of argv[0] is not a problem. - Define bswap_16 and bswap_32 via machine/byteorder.h - Define the wordsize in a somewhat gross way. It's used in if defines so it can be based on sizeof(). Sponsored by: Isilon Systems, iX Systems, and Panasas. Modified: projects/ofed/head/contrib/ofed/management/infiniband-diags/src/smpdump.c projects/ofed/head/contrib/ofed/management/opensm/complib/cl_nodenamemap.c projects/ofed/head/contrib/ofed/management/opensm/complib/cl_thread.c projects/ofed/head/contrib/ofed/management/opensm/include/complib/cl_byteswap.h projects/ofed/head/contrib/ofed/management/opensm/include/complib/cl_debug_osd.h projects/ofed/head/contrib/ofed/management/opensm/include/complib/cl_types.h Modified: projects/ofed/head/contrib/ofed/management/infiniband-diags/src/smpdump.c ============================================================================== --- projects/ofed/head/contrib/ofed/management/infiniband-diags/src/smpdump.c Wed Aug 11 23:22:53 2010 (r211197) +++ projects/ofed/head/contrib/ofed/management/infiniband-diags/src/smpdump.c Wed Aug 11 23:56:37 2010 (r211198) @@ -295,7 +295,7 @@ main(int argc, char *argv[]) usage(); if (mgmt_class == CLASS_SUBN_DIRECTED_ROUTE && - str2DRPath(strdupa(argv[0]), &path) < 0) + str2DRPath(strdup(argv[0]), &path) < 0) IBPANIC("bad path str '%s'", argv[0]); if (mgmt_class == CLASS_SUBN_LID_ROUTE) Modified: projects/ofed/head/contrib/ofed/management/opensm/complib/cl_nodenamemap.c ============================================================================== --- projects/ofed/head/contrib/ofed/management/opensm/complib/cl_nodenamemap.c Wed Aug 11 23:22:53 2010 (r211197) +++ projects/ofed/head/contrib/ofed/management/opensm/complib/cl_nodenamemap.c Wed Aug 11 23:56:37 2010 (r211198) @@ -42,7 +42,9 @@ #include #include #include +#ifdef HAVE_CONFIG_H #include +#endif #include Modified: projects/ofed/head/contrib/ofed/management/opensm/complib/cl_thread.c ============================================================================== --- projects/ofed/head/contrib/ofed/management/opensm/complib/cl_thread.c Wed Aug 11 23:22:53 2010 (r211197) +++ projects/ofed/head/contrib/ofed/management/opensm/complib/cl_thread.c Wed Aug 11 23:56:37 2010 (r211198) @@ -39,7 +39,6 @@ #include #include -#include #include /* @@ -122,7 +121,7 @@ int cl_proc_count(void) { uint32_t ret; - ret = get_nprocs(); + ret = sysconf(_SC_NPROCESSORS_ONLN); if (!ret) return 1; /* Workaround for PPC where get_nprocs() returns 0 */ 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 11 23:22:53 2010 (r211197) +++ projects/ofed/head/contrib/ofed/management/opensm/include/complib/cl_byteswap.h Wed Aug 11 23:56:37 2010 (r211198) @@ -86,6 +86,11 @@ BEGIN_C_DECLS * ntoh32, hton32 * ntoh64, hton64 */ +#include +#define __BYTE_ORDER _BYTE_ORDER +#define bswap_16 __bswap16 +#define bswap_32 __bswap32 + #ifndef __BYTE_ORDER #error "__BYTE_ORDER macro undefined. Missing in endian.h?" #endif Modified: projects/ofed/head/contrib/ofed/management/opensm/include/complib/cl_debug_osd.h ============================================================================== --- projects/ofed/head/contrib/ofed/management/opensm/include/complib/cl_debug_osd.h Wed Aug 11 23:22:53 2010 (r211197) +++ projects/ofed/head/contrib/ofed/management/opensm/include/complib/cl_debug_osd.h Wed Aug 11 23:56:37 2010 (r211198) @@ -42,7 +42,6 @@ #define _CL_DEBUG_OSD_H_ #include -#include #ifdef __cplusplus # define BEGIN_C_DECLS extern "C" { Modified: projects/ofed/head/contrib/ofed/management/opensm/include/complib/cl_types.h ============================================================================== --- projects/ofed/head/contrib/ofed/management/opensm/include/complib/cl_types.h Wed Aug 11 23:22:53 2010 (r211197) +++ projects/ofed/head/contrib/ofed/management/opensm/include/complib/cl_types.h Wed Aug 11 23:56:37 2010 (r211198) @@ -60,6 +60,14 @@ typedef uint16_t net16_t; typedef uint32_t net32_t; typedef uint64_t net64_t; +#ifndef __WORDSIZE +#ifdef __LP64__ +#define __WORDSIZE 64 +#else +#define __WORDSIZE 32 +#endif +#endif + /* explicit cast of void* to uint32_t */ #ifndef ASSERT_VOIDP2UINTN #if __WORDSIZE == 64