[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.0.4-133-gd2338c2
mysql vizuser
noreply at mpich.org
Sun May 5 11:08:32 CDT 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "MPICH primary repository".
The branch, master has been updated
via d2338c2d853b9f6c20f882975df6883a858afc91 (commit)
via db276e4eca99a9dee6f1b9c30f28e3c6b9af924a (commit)
via 90da6e9004433937e0b54bd847c09e1e982a1744 (commit)
via 255da3f6dff4aa605b00d36316497100d4bfa017 (commit)
via 581d59f5cf0926cc828fe6302f371cb427bb9bbd (commit)
via e801995ec7558e5fa24ee462aac395c6acad374c (commit)
from 33e53f7ad9043bcd1b6578a0b7f1157c45f28438 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.mpich.org/mpich.git/commitdiff/d2338c2d853b9f6c20f882975df6883a858afc91
commit d2338c2d853b9f6c20f882975df6883a858afc91
Author: Pavan Balaji <balaji at mcs.anl.gov>
Date: Sun May 5 10:51:20 2013 -0500
Include strings.h for strcasecmp.
No reviewer.
diff --git a/src/pm/hydra/tools/topo/hwloc/hwloc/src/traversal.c b/src/pm/hydra/tools/topo/hwloc/hwloc/src/traversal.c
index 452462b..40f1263 100644
--- a/src/pm/hydra/tools/topo/hwloc/hwloc/src/traversal.c
+++ b/src/pm/hydra/tools/topo/hwloc/hwloc/src/traversal.c
@@ -11,6 +11,9 @@
#include <private/private.h>
#include <private/misc.h>
#include <private/debug.h>
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif /* HAVE_STRINGS_H */
int
hwloc_get_type_depth (struct hwloc_topology *topology, hwloc_obj_type_t type)
http://git.mpich.org/mpich.git/commitdiff/db276e4eca99a9dee6f1b9c30f28e3c6b9af924a
commit db276e4eca99a9dee6f1b9c30f28e3c6b9af924a
Author: Pavan Balaji <balaji at mcs.anl.gov>
Date: Sat May 4 11:34:21 2013 -0500
Fixes for sysctl checks in strict builds of hwloc.
Do a full link test instead of just using AC_CHECK_FUNCS, which just
checks to see if the symbol exists or not. For example, the prototype
of sysctl uses u_int, which on some platforms (such as FreeBSD) is
only defined under __BSD_VISIBLE, __USE_BSD or other similar
definitions. So while the symbols "sysctl" and "sysctlbyname" might
still be available in libc (which autoconf checks for), they might not
be actually usable.
No reviewer.
diff --git a/src/pm/hydra/tools/topo/hwloc/hwloc/config/hwloc.m4 b/src/pm/hydra/tools/topo/hwloc/hwloc/config/hwloc.m4
index 8a6445f..2ffb4ad 100644
--- a/src/pm/hydra/tools/topo/hwloc/hwloc/config/hwloc.m4
+++ b/src/pm/hydra/tools/topo/hwloc/hwloc/config/hwloc.m4
@@ -439,7 +439,20 @@ EOF])
#include <sys/param.h>
#endif
])
- AC_CHECK_FUNCS([sysctl sysctlbyname])
+
+ # Do a full link test instead of just using AC_CHECK_FUNCS, which
+ # just checks to see if the symbol exists or not. For example,
+ # the prototype of sysctl uses u_int, which on some platforms
+ # (such as FreeBSD) is only defined under __BSD_VISIBLE, __USE_BSD
+ # or other similar definitions. So while the symbols "sysctl" and
+ # "sysctlbyname" might still be available in libc (which autoconf
+ # checks for), they might not be actually usable.
+ AC_TRY_LINK([#include <sys/sysctl.h>],
+ [return sysctl(NULL,0,NULL,NULL,NULL,0);],
+ AC_DEFINE([HAVE_SYSCTL],[1],[Define to '1' if sysctl is present and usable]))
+ AC_TRY_LINK([#include <sys/sysctl.h>],
+ [return sysctlbyname(NULL,NULL,NULL,NULL,0);],
+ AC_DEFINE([HAVE_SYSCTLBYNAME],[1],[Define to '1' if sysctlbyname is present and usable]))
case ${target} in
*-*-mingw*|*-*-cygwin*)
http://git.mpich.org/mpich.git/commitdiff/90da6e9004433937e0b54bd847c09e1e982a1744
commit 90da6e9004433937e0b54bd847c09e1e982a1744
Author: Pavan Balaji <balaji at mcs.anl.gov>
Date: Sun May 5 10:33:46 2013 -0500
Fix check for declarations in hwloc.
hwloc's check for whether an explicitly function declaration is needed
was relying on whether a redefinition of the function throws an error.
This only works if the function declaration is already present in one
of the headers. If such a declaration is not present, the test might
fail with "implicit function declaration" with the right CFLAGS. This
leads the m4 macro to think that the declaration is already there in
one of the headers and an additional declaration is not needed.
This commit fixes this by adding a dummy function declaration,
together with the dummy function definition.
No reviewer.
diff --git a/src/pm/hydra/tools/topo/hwloc/hwloc/config/hwloc.m4 b/src/pm/hydra/tools/topo/hwloc/hwloc/config/hwloc.m4
index c66f26c..8a6445f 100644
--- a/src/pm/hydra/tools/topo/hwloc/hwloc/config/hwloc.m4
+++ b/src/pm/hydra/tools/topo/hwloc/hwloc/config/hwloc.m4
@@ -1217,7 +1217,10 @@ dnl number of arguments (10). Success means the compiler couldn't really check.
AC_DEFUN([_HWLOC_CHECK_DECL], [
AC_MSG_CHECKING([whether function $1 is declared])
AC_REQUIRE([AC_PROG_CC])
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT([$4])],[$1(1,2,3,4,5,6,7,8,9,10);])],
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+ [AC_INCLUDES_DEFAULT([$4])
+ $1(int,long,int,long,int,long,int,long,int,long);],
+ [$1(1,2,3,4,5,6,7,8,9,10);])],
[AC_MSG_RESULT([no])
$3],
[AC_MSG_RESULT([yes])
http://git.mpich.org/mpich.git/commitdiff/255da3f6dff4aa605b00d36316497100d4bfa017
commit 255da3f6dff4aa605b00d36316497100d4bfa017
Author: Pavan Balaji <balaji at mcs.anl.gov>
Date: Fri May 3 22:28:56 2013 -0500
Fixes for hwloc to build with -D_POSIX_C_SOURCE=200112L.
No reviewer.
diff --git a/src/pm/hydra/tools/topo/hwloc/hwloc/src/topology-freebsd.c b/src/pm/hydra/tools/topo/hwloc/hwloc/src/topology-freebsd.c
index c172264..c3a82f7 100644
--- a/src/pm/hydra/tools/topo/hwloc/hwloc/src/topology-freebsd.c
+++ b/src/pm/hydra/tools/topo/hwloc/hwloc/src/topology-freebsd.c
@@ -19,7 +19,7 @@
#ifdef HAVE_SYS_CPUSET_H
#include <sys/cpuset.h>
#endif
-#ifdef HAVE_SYSCTL
+#ifdef HAVE_SYS_SYSCTL_H
#include <sys/sysctl.h>
#endif
@@ -164,7 +164,7 @@ hwloc_freebsd_get_thread_cpubind(hwloc_topology_t topology __hwloc_attribute_unu
#endif
#endif
-#ifdef HAVE_SYSCTL
+#if defined(HAVE_SYSCTL) && defined(HAVE_SYSCTL_H)
static void
hwloc_freebsd_node_meminfo_info(struct hwloc_topology *topology)
{
http://git.mpich.org/mpich.git/commitdiff/581d59f5cf0926cc828fe6302f371cb427bb9bbd
commit 581d59f5cf0926cc828fe6302f371cb427bb9bbd
Author: Pavan Balaji <balaji at mcs.anl.gov>
Date: Sun May 5 08:31:52 2013 -0500
Fix strict build errors in PMI simple.
FreeBSD seems to require arpa/inet.h for htons/ntohs definitions
during a strict build. This header might always be required on all
machines TCP/IP is present, but I'm configure protecting it to play
safe.
No reviewer.
diff --git a/src/pmi/simple/simple_pmiutil.h b/src/pmi/simple/simple_pmiutil.h
index ed0b741..020398d 100644
--- a/src/pmi/simple/simple_pmiutil.h
+++ b/src/pmi/simple/simple_pmiutil.h
@@ -16,6 +16,10 @@
# define PMIU_Assert(expr)
#endif
+#if defined HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif /* HAVE_ARPA_INET_H */
+
/* prototypes for PMIU routines */
void PMIU_Set_rank( int PMI_rank );
diff --git a/src/pmi/simple/subconfigure.m4 b/src/pmi/simple/subconfigure.m4
index 73ce6d5..a108cc9 100644
--- a/src/pmi/simple/subconfigure.m4
+++ b/src/pmi/simple/subconfigure.m4
@@ -12,13 +12,14 @@ AM_COND_IF([BUILD_PMI_SIMPLE],[
if test "$enable_pmiport" != "no" ; then
enable_pmiport=yes
fi
-AC_CHECK_HEADERS(unistd.h string.h stdlib.h sys/socket.h strings.h assert.h)
+AC_CHECK_HEADERS(unistd.h string.h stdlib.h sys/socket.h strings.h assert.h arpa/inet.h)
dnl Use snprintf if possible when creating messages
AC_CHECK_FUNCS(snprintf)
if test "$ac_cv_func_snprintf" = "yes" ; then
PAC_FUNC_NEEDS_DECL([#include <stdio.h>],snprintf)
fi
AC_CHECK_FUNCS(strncasecmp)
+
#
# PM's that need support for a port can set the environment variable
# NEED_PMIPORT in their setup_pm script.
http://git.mpich.org/mpich.git/commitdiff/e801995ec7558e5fa24ee462aac395c6acad374c
commit e801995ec7558e5fa24ee462aac395c6acad374c
Author: Pavan Balaji <balaji at mcs.anl.gov>
Date: Sat May 4 13:02:40 2013 -0500
Fix strict build failure in hydra.
No reviewer.
diff --git a/src/pm/hydra/configure.ac b/src/pm/hydra/configure.ac
index 892363f..053e98d 100644
--- a/src/pm/hydra/configure.ac
+++ b/src/pm/hydra/configure.ac
@@ -137,15 +137,34 @@ PAC_ENABLE_COVERAGE
AC_CHECK_HEADERS(unistd.h stdlib.h string.h strings.h stdarg.h sys/types.h sys/socket.h \
sched.h sys/stat.h sys/param.h netinet/in.h netinet/tcp.h \
sys/un.h netdb.h sys/time.h time.h ifaddrs.h arpa/inet.h \
- errno.h poll.h fcntl.h netdb.h winsock2.h windows.h)
+ errno.h poll.h fcntl.h netdb.h winsock2.h windows.h signal.h)
AC_CHECK_LIB(socket,socket,LDFLAGS="$LDFLAGS -lsocket",)
AC_CHECK_LIB(nsl,gethostbyname,LDFLAGS="$LDFLAGS -lnsl",)
# Check for necessary functions
AC_CHECK_FUNCS(gettimeofday time strdup sigaction signal usleep alloca unsetenv \
- strerror strsignal stat getifaddrs fcntl alarm isatty inet_ntop getpgid \
- setsid)
+ strerror strsignal stat fcntl alarm isatty inet_ntop getpgid \
+ setsid killpg)
+
+if test "$ac_cv_func_gettimeofday" = "yes" ; then
+ PAC_FUNC_NEEDS_DECL([#include <sys/time.h>],gettimeofday)
+fi
+
+if test "$ac_cv_func_getpgid" = "yes" ; then
+ PAC_FUNC_NEEDS_DECL([#include <unistd.h>],getpgid)
+fi
+
+if test "$ac_cv_func_killpg" = "yes" ; then
+ PAC_FUNC_NEEDS_DECL([#include <signal.h>],killpg)
+fi
+
+AC_TRY_LINK([
+ #include <sys/types.h>
+ #include <ifaddrs.h>
+ ],
+ [return getifaddrs(NULL);],
+ [AC_DEFINE([HAVE_GETIFADDRS],1,[Define to '1' if getifaddrs is present and usable])])
# Check what we need to do about the environ extern
AC_CACHE_CHECK([for environ in unistd.h],pac_cv_environ_in_unistd,
diff --git a/src/pm/hydra/include/hydra.h b/src/pm/hydra/include/hydra.h
index 6cdbfa9..adfcdeb 100644
--- a/src/pm/hydra/include/hydra.h
+++ b/src/pm/hydra/include/hydra.h
@@ -112,7 +112,11 @@ extern char *HYD_dbg_prefix;
#ifdef HAVE_SYS_SOCKET_H
#include <sys/socket.h>
-#endif
+#endif /* HAVE_SYS_SOCKET_H */
+
+#ifdef HAVE_SIGNAL_H
+#include <signal.h>
+#endif /* HAVE_SIGNAL_H */
#define HYD_POLLIN (0x0001)
#define HYD_POLLOUT (0x0002)
@@ -159,6 +163,18 @@ extern char *HYD_dbg_prefix;
extern char **environ;
#endif /* MANUAL_EXTERN_ENVIRON */
+#if defined NEEDS_GETTIMEOFDAY_DECL
+int gettimeofday(struct timeval *tv, struct timezone *tz);
+#endif /* NEEDS_GETTIMEOFDAY_DECL */
+
+#if defined NEEDS_GETPGID_DECL
+pid_t getpgid(pid_t pid);
+#endif /* NEEDS_GETPGID_DECL */
+
+#if defined NEEDS_KILLPG_DECL
+int killpg(int pgrp, int sig);
+#endif /* NEEDS_KILLPG_DECL */
+
#define HYD_SILENT_ERROR(status) (((status) == HYD_GRACEFUL_ABORT) || ((status) == HYD_TIMED_OUT))
#define HYDRA_NAMESERVER_DEFAULT_PORT 6392
-----------------------------------------------------------------------
Summary of changes:
src/pm/hydra/configure.ac | 25 +++++++++++++++++--
src/pm/hydra/include/hydra.h | 18 +++++++++++++-
.../hydra/tools/topo/hwloc/hwloc/config/hwloc.m4 | 20 ++++++++++++++-
.../tools/topo/hwloc/hwloc/src/topology-freebsd.c | 4 +-
.../hydra/tools/topo/hwloc/hwloc/src/traversal.c | 3 ++
src/pmi/simple/simple_pmiutil.h | 4 +++
src/pmi/simple/subconfigure.m4 | 3 +-
7 files changed, 68 insertions(+), 9 deletions(-)
hooks/post-receive
--
MPICH primary repository
More information about the commits
mailing list