Skip to content
This repository was archived by the owner on Sep 30, 2022. It is now read-only.

v2.0.0: Some trivial fixes #741

Merged
merged 4 commits into from
Nov 6, 2015
Merged

v2.0.0: Some trivial fixes #741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
002a198
Makefile: Move fd.c to `SOURCES` from `headers`.
kawashima-fj Oct 29, 2015
9d905e5
mpi/tool: Fix an incorrect type cast.
kawashima-fj Oct 29, 2015
5f8ce4f
opal/datatype: Fix a macro value typo for heterogeneous.
kawashima-fj Oct 29, 2015
81c33c1
opal/threads: Correct nsec -> usec conversion.
kawashima-fj Oct 29, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ompi/mpi/tool/cvar_read.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion opal/datatype/opal_copy_functions_heterogeneous.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand Down
4 changes: 2 additions & 2 deletions opal/threads/condition.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions opal/util/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -78,6 +77,7 @@ libopalutil_la_SOURCES = \
crc.c \
daemon_init.c \
error.c \
fd.c \
few.c \
if.c \
keyval_parse.c \
Expand Down