[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2b4-127-g1824f81
Service Account
noreply at mpich.org
Sun Aug 16 17:03:07 CDT 2015
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 1824f816119012e0ca94a1d293f27d56c60bec70 (commit)
via b343a1d8c7e4c7d956c002beac7b370598fb3500 (commit)
from 6504ef78086bb5ab1433b66dc527fc921cbbfc6a (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/1824f816119012e0ca94a1d293f27d56c60bec70
commit 1824f816119012e0ca94a1d293f27d56c60bec70
Author: Pavan Balaji <balaji at anl.gov>
Date: Sun Aug 16 15:01:20 2015 -0500
unistd.h is needed for some of the timer functionality.
Signed-off-by: Xin Zhao <xinzhao3 at illinois.edu>
diff --git a/src/util/timers/mpiu_timer.h.in b/src/util/timers/mpiu_timer.h.in
index 713543b..7980e10 100644
--- a/src/util/timers/mpiu_timer.h.in
+++ b/src/util/timers/mpiu_timer.h.in
@@ -8,6 +8,14 @@
#include "mpichconf.h"
#include <stdlib.h>
+
+#if defined (HAVE_UNISTD_H)
+#include <unistd.h>
+#if defined (NEEDS_USLEEP_DECL)
+int usleep(useconds_t usec);
+#endif
+#endif
+
#include "mpl.h"
/*
http://git.mpich.org/mpich.git/commitdiff/b343a1d8c7e4c7d956c002beac7b370598fb3500
commit b343a1d8c7e4c7d956c002beac7b370598fb3500
Author: Pavan Balaji <balaji at anl.gov>
Date: Sun Aug 16 15:00:17 2015 -0500
Remove redundant definition of MPIU_Wtick.
This was accidentally added in [4a706ae7ad15].
Signed-off-by: Xin Zhao <xinzhao3 at illinois.edu>
diff --git a/src/util/timers/mpiu_timer.c b/src/util/timers/mpiu_timer.c
index ff4c5fb..9ae6e8f 100644
--- a/src/util/timers/mpiu_timer.c
+++ b/src/util/timers/mpiu_timer.c
@@ -234,11 +234,6 @@ void MPIU_Wtime_acc(MPIU_Time_t * t1, MPIU_Time_t * t2, MPIU_Time_t * t3)
*t3 += (*t2 - *t1);
}
-double MPIU_Wtick(void)
-{
- return tickval;
-}
-
#elif MPICH_TIMER_KIND == MPIU_GCC_IA64_CYCLE
#include <sys/time.h>
-----------------------------------------------------------------------
Summary of changes:
src/util/timers/mpiu_timer.c | 5 -----
src/util/timers/mpiu_timer.h.in | 8 ++++++++
2 files changed, 8 insertions(+), 5 deletions(-)
hooks/post-receive
--
MPICH primary repository
More information about the commits
mailing list