[mpich2-commits] r6646 - in mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc: . config doc include src utils
balaji at mcs.anl.gov
balaji at mcs.anl.gov
Thu May 13 19:03:07 CDT 2010
Author: balaji
Date: 2010-05-13 19:03:07 -0500 (Thu, 13 May 2010)
New Revision: 6646
Modified:
mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/VERSION
mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/config/hwloc.m4
mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/configure.ac
mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/doc/Makefile.am
mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/include/hwloc.h
mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/src/misc.c
mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/src/topology-synthetic.c
mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/src/topology-windows.c
mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/src/traversal.c
mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/utils/Makefile.am
mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/utils/lstopo-draw.c
mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/utils/lstopo-text.c
Log:
Update hwloc to 1.0rc6.
Modified: mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/VERSION
===================================================================
--- mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/VERSION 2010-05-12 13:31:35 UTC (rev 6645)
+++ mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/VERSION 2010-05-14 00:03:07 UTC (rev 6646)
@@ -16,7 +16,7 @@
# requirement is that it must be entirely printable ASCII characters
# and have no white space.
-greek=rc5
+greek=rc6
# If want_svn=1, then the SVN r number will be included in the overall
# hwloc version number in some form.
Modified: mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/config/hwloc.m4
===================================================================
--- mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/config/hwloc.m4 2010-05-12 13:31:35 UTC (rev 6645)
+++ mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/config/hwloc.m4 2010-05-14 00:03:07 UTC (rev 6646)
@@ -224,10 +224,15 @@
hwloc_CC_save=$CC
hwloc_CFLAGS_save=$CFLAGS
AC_PROG_CC_C99
- hwloc_CC_c99_flags=`echo $CC | sed -e s/^$hwloc_CC_save//`
- if test "$ac_cv_prog_cc_c99" = "no" ; then
- AC_ERROR([C99 support required for hwloc])
- fi
+ AS_IF([test x"$ac_cv_prog_cc_c99" = xno],
+ [AC_WARN([C99 support is required by hwloc])
+ $3],
+ [HWLOC_SETUP_CORE_AFTER_C99($1, $2, $3, $4)])
+])
+
+dnl Same order of parameters form HWLOC-SETUP-CORE
+AC_DEFUN([HWLOC_SETUP_CORE_AFTER_C99],[
+ hwloc_CC_c99_flags=`echo $CC | sed -e "s/^$hwloc_CC_save//"`
CC=$hwloc_CC_save
CFLAGS=$hwloc_CFLAGS_save
@@ -549,7 +554,6 @@
)
# Cleanup
- unset hwloc_config_happy
AC_LANG_POP
# Success
Modified: mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/configure.ac
===================================================================
--- mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/configure.ac 2010-05-12 13:31:35 UTC (rev 6645)
+++ mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/configure.ac 2010-05-14 00:03:07 UTC (rev 6646)
@@ -124,9 +124,7 @@
[HWLOC_BUILD_STANDALONE])])
# Setup the hwloc core
-HWLOC_SETUP_CORE([], [], [hwloc_setup=unhappy], [1])
-AS_IF([test "$hwloc_setup" = "unhappy"],
- [AC_MSG_ERROR([Cannot continue])])
+HWLOC_SETUP_CORE([], [], [AC_MSG_ERROR([Cannot continue])], [1])
# Setup hwloc's docs, utils, and tests
AS_IF([test "$hwloc_mode" = "standalone"],
Modified: mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/doc/Makefile.am
===================================================================
--- mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/doc/Makefile.am 2010-05-12 13:31:35 UTC (rev 6645)
+++ mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/doc/Makefile.am 2010-05-14 00:03:07 UTC (rev 6646)
@@ -408,7 +408,9 @@
if HWLOC_BUILD_DOXYGEN
$(man3_MANS): $(DOX_TAG)
-$(DOX_A4PDF): $(DOX_TAG)
+# Enforce some ordering so that "make -j X" works properly (i.e.,
+# doesn't try to build both PDFs at the same time)
+$(DOX_A4PDF): $(DOX_TAG) $(DOX_LETTERPDF)
$(DOX_LETTERPDF): $(DOX_TAG)
$(DOX_HTML_DIR): $(DOX_TAG)
$(DOX_LATEX_DIR): $(DOX_TAG)
Modified: mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/include/hwloc.h
===================================================================
--- mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/include/hwloc.h 2010-05-12 13:31:35 UTC (rev 6645)
+++ mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/include/hwloc.h 2010-05-14 00:03:07 UTC (rev 6646)
@@ -691,7 +691,8 @@
* It differs from hwloc_obj_type_string() because it prints type attributes such
* as cache depth.
*
- * \return how many characters were actually written (not including the ending \\0).
+ * \return how many characters were actually written (not including the ending
+ * \\0), or -1 on error.
*/
HWLOC_DECLSPEC int hwloc_obj_type_snprintf(char * __hwloc_restrict string, size_t size, hwloc_obj_t obj,
int verbose);
@@ -702,7 +703,8 @@
*
* Only the major attributes are printed in non-verbose mode.
*
- * \return how many characters were actually written (not including the ending \\0).
+ * \return how many characters were actually written (not including the ending
+ * \\0), or -1 on error.
*/
HWLOC_DECLSPEC int hwloc_obj_attr_snprintf(char * __hwloc_restrict string, size_t size, hwloc_obj_t obj, const char * __hwloc_restrict separator,
int verbose);
@@ -722,7 +724,8 @@
* \p indexprefix is used to prefix the \p os_index attribute number of
* the object in the description. If \c NULL, the \c # character is used.
*
- * \return how many characters were actually written (not including the ending \\0).
+ * \return how many characters were actually written (not including the ending
+ * \\0), or -1 on error.
*/
HWLOC_DECLSPEC int hwloc_obj_snprintf(char * __hwloc_restrict string, size_t size,
hwloc_topology_t topology, hwloc_obj_t obj,
Modified: mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/src/misc.c
===================================================================
--- mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/src/misc.c 2010-05-12 13:31:35 UTC (rev 6645)
+++ mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/src/misc.c 2010-05-14 00:03:07 UTC (rev 6646)
@@ -1,6 +1,6 @@
/*
* Copyright © 2009 CNRS, INRIA, Université Bordeaux 1
- * Copyright © 2009 Cisco Systems, Inc. All rights reserved.
+ * Copyright © 2009-2010 Cisco Systems, Inc. All rights reserved.
* See COPYING in top-level directory.
*/
@@ -39,6 +39,8 @@
do {
size *= 2;
str = malloc(size);
+ if (NULL == str)
+ return -1;
va_start(ap, format);
errno = 0;
ret = vsnprintf(str, size, format, ap);
Modified: mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/src/topology-synthetic.c
===================================================================
--- mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/src/topology-synthetic.c 2010-05-12 13:31:35 UTC (rev 6645)
+++ mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/src/topology-synthetic.c 2010-05-14 00:03:07 UTC (rev 6646)
@@ -84,7 +84,7 @@
nb_pu *= item;
if (nb_pu > HWLOC_NBMAXCPUS) {
- fprintf(stderr, "To many PUs, max %u\n", HWLOC_NBMAXCPUS);
+ fprintf(stderr, "To many PUs, max %d\n", HWLOC_NBMAXCPUS);
return -1;
}
Modified: mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/src/topology-windows.c
===================================================================
--- mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/src/topology-windows.c 2010-05-12 13:31:35 UTC (rev 6645)
+++ mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/src/topology-windows.c 2010-05-14 00:03:07 UTC (rev 6646)
@@ -47,7 +47,7 @@
RelationCache,
RelationProcessorPackage,
RelationGroup,
- RelationAll = 0xffff,
+ RelationAll = 0xffff
} LOGICAL_PROCESSOR_RELATIONSHIP;
#endif
Modified: mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/src/traversal.c
===================================================================
--- mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/src/traversal.c 2010-05-12 13:31:35 UTC (rev 6645)
+++ mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/src/traversal.c 2010-05-14 00:03:07 UTC (rev 6646)
@@ -265,7 +265,7 @@
hwloc_obj_type_snprintf(type, sizeof(type), l, verbose);
attrlen = hwloc_obj_attr_snprintf(attr, sizeof(attr), l, " ", verbose);
- if (attrlen)
+ if (attrlen > 0)
return hwloc_snprintf(string, size, "%s%s(%s)", type, os_index, attr);
else
return hwloc_snprintf(string, size, "%s%s", type, os_index);
Modified: mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/utils/Makefile.am
===================================================================
--- mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/utils/Makefile.am 2010-05-12 13:31:35 UTC (rev 6645)
+++ mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/utils/Makefile.am 2010-05-14 00:03:07 UTC (rev 6646)
@@ -39,8 +39,10 @@
# Only install man pages if we're building in standalone mode
if HWLOC_BUILD_UTILS
-man_pages = hwloc.7 lstopo.1 hwloc-bind.1 hwloc-distrib.1 hwloc-calc.1
-EXTRA_DIST += $(man_pages:.1=.1in)
+man1_pages = lstopo.1 hwloc-bind.1 hwloc-distrib.1 hwloc-calc.1
+man7_pages = hwloc.7
+man_pages = $(man7_pages) $(man1_pages)
+EXTRA_DIST += $(man1_pages:.1=.1in) $(man7_pages:.7=.7in)
nodist_man_MANS = $(man_pages)
.1in.1:
Modified: mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/utils/lstopo-draw.c
===================================================================
--- mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/utils/lstopo-draw.c 2010-05-12 13:31:35 UTC (rev 6645)
+++ mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/utils/lstopo-draw.c 2010-05-14 00:03:07 UTC (rev 6646)
@@ -338,12 +338,12 @@
char typestr[32];
char indexstr[32]= "";
char attrstr[256];
- size_t attrlen;
+ int attrlen;
hwloc_obj_type_snprintf(typestr, sizeof(typestr), obj, 0);
if (idx != (unsigned)-1 && obj->depth != 0)
snprintf(indexstr, sizeof(indexstr), "%s%u", indexprefix, idx);
attrlen = hwloc_obj_attr_snprintf(attrstr, sizeof(attrstr), obj, " ", 0);
- if (attrlen)
+ if (attrlen > 0)
return snprintf(text, textlen, "%s%s (%s)", typestr, indexstr, attrstr);
else
return snprintf(text, textlen, "%s%s", typestr, indexstr);
Modified: mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/utils/lstopo-text.c
===================================================================
--- mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/utils/lstopo-text.c 2010-05-12 13:31:35 UTC (rev 6645)
+++ mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/utils/lstopo-text.c 2010-05-14 00:03:07 UTC (rev 6646)
@@ -389,7 +389,7 @@
up = (1<<0),
down = (1<<1),
left = (1<<2),
- right = (1<<3),
+ right = (1<<3)
};
/* Convert a bar character into its directions */
More information about the mpich2-commits
mailing list