From 002a198c9f4ee833730e166eb6c9496bc22abbe6 Mon Sep 17 00:00:00 2001 From: KAWASHIMA Takahiro Date: Thu, 29 Oct 2015 10:58:02 +0900 Subject: [PATCH 1/4] Makefile: Move fd.c to `SOURCES` from `headers`. And reorder fd.h and few.h in alphabetical order. (cherry picked from commit 2dcb2d711b428ee1e7fac4d85a8a4c41437b6dcb) --- opal/util/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/opal/util/Makefile.am b/opal/util/Makefile.am index cedf860bf7..f80cbd50ec 100644 --- a/opal/util/Makefile.am +++ b/opal/util/Makefile.am @@ -42,9 +42,8 @@ headers = \ crc.h \ daemon_init.h \ error.h \ - few.h \ fd.h \ - fd.c \ + few.h \ if.h \ keyval_parse.h \ malloc.h \ @@ -78,6 +77,7 @@ libopalutil_la_SOURCES = \ crc.c \ daemon_init.c \ error.c \ + fd.c \ few.c \ if.c \ keyval_parse.c \ From 9d905e59ed2a316614c4d9e49da9c7f90420025a Mon Sep 17 00:00:00 2001 From: KAWASHIMA Takahiro Date: Thu, 29 Oct 2015 12:43:55 +0900 Subject: [PATCH 2/4] mpi/tool: Fix an incorrect type cast. This bug caused an invalid result value on `MPI_T_cvar_read` on big-endian machines or for large (>=2Gi) cvar values. (cherry picked from commit c09f9f05d369a687be410ac690fd9cc8dd70711d) --- ompi/mpi/tool/cvar_read.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ompi/mpi/tool/cvar_read.c b/ompi/mpi/tool/cvar_read.c index 2b7e839fd5..843ca493f8 100644 --- a/ompi/mpi/tool/cvar_read.c +++ b/ompi/mpi/tool/cvar_read.c @@ -56,7 +56,7 @@ int MPI_T_cvar_read (MPI_T_cvar_handle handle, void *buf) ((unsigned long long *) buf)[0] = value->ullval; break; case MCA_BASE_VAR_TYPE_SIZE_T: - ((int *) buf)[0] = value->sizetval; + ((size_t *) buf)[0] = value->sizetval; break; case MCA_BASE_VAR_TYPE_BOOL: ((int *) buf)[0] = value->boolval; From 5f8ce4f0eeac0b2e1a4df97a8cd414ce97a5fd3d Mon Sep 17 00:00:00 2001 From: KAWASHIMA Takahiro Date: Thu, 29 Oct 2015 13:05:51 +0900 Subject: [PATCH 3/4] opal/datatype: Fix a macro value typo for heterogeneous. This affects behaiviors only on a heterogeneous environment. (cherry picked from commit 60546c64184b8201e3a51849b3e8a2aafc3d1535) --- opal/datatype/opal_copy_functions_heterogeneous.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opal/datatype/opal_copy_functions_heterogeneous.c b/opal/datatype/opal_copy_functions_heterogeneous.c index 8ff6d1644d..956a1d46bc 100644 --- a/opal/datatype/opal_copy_functions_heterogeneous.c +++ b/opal/datatype/opal_copy_functions_heterogeneous.c @@ -330,7 +330,7 @@ COPY_TYPE_HETEROGENEOUS( float12, long double ) #if SIZEOF_FLOAT == 16 COPY_TYPE_HETEROGENEOUS( float16, float ) -#elif SIZEOF_DOUBLE == 8 +#elif SIZEOF_DOUBLE == 16 COPY_TYPE_HETEROGENEOUS( float16, double ) #elif HAVE_LONG_DOUBLE && SIZEOF_LONG_DOUBLE == 16 COPY_TYPE_HETEROGENEOUS( float16, long double ) From 81c33c17909e7206c9189aeddcc43aea17baf42c Mon Sep 17 00:00:00 2001 From: KAWASHIMA Takahiro Date: Thu, 29 Oct 2015 13:43:08 +0900 Subject: [PATCH 4/4] opal/threads: Correct nsec -> usec conversion. (cherry picked from commit d4bdf405bdac2ad799fc2022b86b522fed2a8947) --- opal/threads/condition.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/opal/threads/condition.h b/opal/threads/condition.h index cb510cf85a..4c61fd64ac 100644 --- a/opal/threads/condition.h +++ b/opal/threads/condition.h @@ -94,7 +94,7 @@ static inline int opal_condition_timedwait(opal_condition_t *c, c->c_waiting++; if (opal_using_threads()) { absolute.tv_sec = abstime->tv_sec; - absolute.tv_usec = abstime->tv_nsec * 1000; + absolute.tv_usec = abstime->tv_nsec / 1000; gettimeofday(&tv,NULL); if (c->c_signaled == 0) { do { @@ -108,7 +108,7 @@ static inline int opal_condition_timedwait(opal_condition_t *c, } } else { absolute.tv_sec = abstime->tv_sec; - absolute.tv_usec = abstime->tv_nsec * 1000; + absolute.tv_usec = abstime->tv_nsec / 1000; gettimeofday(&tv,NULL); if (c->c_signaled == 0) { do {