[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.0.2-30-g617927f
mysql vizuser
noreply at mpich.org
Thu Feb 21 15:42:06 CST 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 617927fb6680aa0b5209fd29ab453e25c7ab3750 (commit)
via bda59a264d3889c1eb80ba79af67ad5661f9f435 (commit)
via 1f1897098dfec1740f93b1390ab1e7facdb0f9da (commit)
from 780133cd0fc51132438a42a4d013279989dc122b (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/617927fb6680aa0b5209fd29ab453e25c7ab3750
commit 617927fb6680aa0b5209fd29ab453e25c7ab3750
Author: James Dinan <dinan at mcs.anl.gov>
Date: Thu Feb 21 14:43:47 2013 -0600
Cleaned up test compiler warnings
Cleaned up a variety of compiler warnings relating to header files and
other such bugs. Most of this patch was provided by Jeff Hammond.
Reviewer: none
diff --git a/test/mpi/coll/nonblocking3.c b/test/mpi/coll/nonblocking3.c
index b1f66dd..e072def 100644
--- a/test/mpi/coll/nonblocking3.c
+++ b/test/mpi/coll/nonblocking3.c
@@ -21,6 +21,10 @@
/* USE_STRICT_MPI may be defined in mpitestconf.h */
#include "mpitestconf.h"
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
static int errs = 0;
/* Constants that control the high level test harness behavior. */
diff --git a/test/mpi/f90/attr/attrlangc.c b/test/mpi/f90/attr/attrlangc.c
index 6920668..2ee4ef5 100644
--- a/test/mpi/f90/attr/attrlangc.c
+++ b/test/mpi/f90/attr/attrlangc.c
@@ -124,7 +124,7 @@ void cgetsizes_( MPI_Fint *ptrSize, MPI_Fint *intSize, MPI_Fint *aintSize )
}
/* ----------------------------------------------------------------------- */
-/* Copy and delete functions attached to keyvals
+/* Copy and delete functions attached to keyvals */
/* ----------------------------------------------------------------------- */
static int CMPI1_COPY_FN( MPI_Comm comm, int keyval, void *extra,
void *inval, void *outval, int *flag )
diff --git a/test/mpi/manual/mpi_t/nem_fbox_fallback_to_queue_count.c b/test/mpi/manual/mpi_t/nem_fbox_fallback_to_queue_count.c
index f045212..c6dec0b 100644
--- a/test/mpi/manual/mpi_t/nem_fbox_fallback_to_queue_count.c
+++ b/test/mpi/manual/mpi_t/nem_fbox_fallback_to_queue_count.c
@@ -17,6 +17,11 @@
#include <stdlib.h>
#include <stdint.h>
#include <stdio.h>
+#include "mpitest.h"
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
#define TRY(func) \
do { \
diff --git a/test/mpi/rma/linked_list.c b/test/mpi/rma/linked_list.c
index e17e6ce..c0dc769 100644
--- a/test/mpi/rma/linked_list.c
+++ b/test/mpi/rma/linked_list.c
@@ -19,11 +19,14 @@
#include <stdio.h>
#include <stdlib.h>
-#include <unistd.h>
#include <mpi.h>
#include <assert.h>
#include "mpitest.h"
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
#define NUM_ELEMS 32
#define NPROBE 100
#define ELEM_PER_ROW 16
diff --git a/test/mpi/rma/linked_list_bench_lock_all.c b/test/mpi/rma/linked_list_bench_lock_all.c
index 90df021..ef67050 100644
--- a/test/mpi/rma/linked_list_bench_lock_all.c
+++ b/test/mpi/rma/linked_list_bench_lock_all.c
@@ -15,11 +15,14 @@
#include <stdio.h>
#include <stdlib.h>
-#include <unistd.h>
#include <mpi.h>
#include <assert.h>
#include "mpitest.h"
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
#define NUM_ELEMS 1000
#define MAX_NPROBE nproc
#define MIN_NPROBE 1
diff --git a/test/mpi/rma/linked_list_bench_lock_excl.c b/test/mpi/rma/linked_list_bench_lock_excl.c
index 7fe5240..8bf5427 100644
--- a/test/mpi/rma/linked_list_bench_lock_excl.c
+++ b/test/mpi/rma/linked_list_bench_lock_excl.c
@@ -15,11 +15,14 @@
#include <stdio.h>
#include <stdlib.h>
-#include <unistd.h>
#include <mpi.h>
#include <assert.h>
#include "mpitest.h"
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
#define NUM_ELEMS 1000
#define MAX_NPROBE nproc
#define MIN_NPROBE 1
diff --git a/test/mpi/rma/linked_list_bench_lock_shr.c b/test/mpi/rma/linked_list_bench_lock_shr.c
index 2ddb791..49c3e04 100644
--- a/test/mpi/rma/linked_list_bench_lock_shr.c
+++ b/test/mpi/rma/linked_list_bench_lock_shr.c
@@ -15,11 +15,14 @@
#include <stdio.h>
#include <stdlib.h>
-#include <unistd.h>
#include <mpi.h>
#include <assert.h>
#include "mpitest.h"
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
#define NUM_ELEMS 1000
#define MAX_NPROBE nproc
#define MIN_NPROBE 1
diff --git a/test/mpi/rma/linked_list_fop.c b/test/mpi/rma/linked_list_fop.c
index 11d8ca0..bb95b77 100644
--- a/test/mpi/rma/linked_list_fop.c
+++ b/test/mpi/rma/linked_list_fop.c
@@ -19,11 +19,14 @@
#include <stdio.h>
#include <stdlib.h>
-#include <unistd.h>
#include <mpi.h>
#include <assert.h>
#include "mpitest.h"
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
#define NUM_ELEMS 32
#define NPROBE 100
#define ELEM_PER_ROW 16
diff --git a/test/mpi/rma/linked_list_lockall.c b/test/mpi/rma/linked_list_lockall.c
index 53b2ba6..f1373fb 100644
--- a/test/mpi/rma/linked_list_lockall.c
+++ b/test/mpi/rma/linked_list_lockall.c
@@ -19,11 +19,14 @@
#include <stdio.h>
#include <stdlib.h>
-#include <unistd.h>
#include <mpi.h>
#include <assert.h>
#include "mpitest.h"
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
#define NUM_ELEMS 32
#define NPROBE 100
#define ELEM_PER_ROW 16
diff --git a/test/mpi/rma/mutex_bench.c b/test/mpi/rma/mutex_bench.c
index 098382e..2db24e4 100644
--- a/test/mpi/rma/mutex_bench.c
+++ b/test/mpi/rma/mutex_bench.c
@@ -12,6 +12,7 @@
#include <assert.h>
#include <mpi.h>
+#include "mpitest.h"
#include "mcs-mutex.h"
#define NUM_ITER 1000
http://git.mpich.org/mpich.git/commitdiff/bda59a264d3889c1eb80ba79af67ad5661f9f435
commit bda59a264d3889c1eb80ba79af67ad5661f9f435
Author: James Dinan <dinan at mcs.anl.gov>
Date: Thu Feb 21 14:41:52 2013 -0600
Fixed several warnings in lockcontention3 test
This patch fixes several warnings when compiling the lockcontention3
test. PUT_VAL was reduced because the old value overflowed signed
integer comparisons.
Reviewer: none
diff --git a/test/mpi/rma/lockcontention3.c b/test/mpi/rma/lockcontention3.c
index 6204e94..d70e26c 100644
--- a/test/mpi/rma/lockcontention3.c
+++ b/test/mpi/rma/lockcontention3.c
@@ -8,6 +8,7 @@
#include "stdlib.h"
#include "mpitest.h"
#include <assert.h>
+#include <string.h>
#define LAST_TEST 14
#define RMA_SIZE 2048
@@ -15,7 +16,7 @@
#define OFFSET_2 83
#define OFFSET_3 157
-#define PUT_VAL 0xfedcba97
+#define PUT_VAL 0xdcba97
#define ACC_VAL 10771134
/*
@@ -316,6 +317,8 @@ int RMACheck( int i, int *buf, MPI_Aint bufsize )
break;
case 3: /* Datatype single put (strided put) */
case 6: /* a few small puts (like strided put, but 1 word at a time) */
+ /* FIXME: The conditional and increment are reversed below. This looks
+ * like a bug, and currently prevents the following test from running. */
for (j=0; j++; j<veccount) {
if (buf[j*stride] != PUT_VAL + j) {
errs++;
@@ -326,6 +329,8 @@ int RMACheck( int i, int *buf, MPI_Aint bufsize )
break;
case 4: /* Datatype single accumulate (strided acc) */
case 7: /* a few small accumulates (like strided acc, but 1 word at a time )*/
+ /* FIXME: The conditional and increment are reversed below. This looks
+ * like a bug, and currently prevents the following test from running. */
for (j=0; j++; j<veccount) {
if (buf[j*stride] != ACC_VAL + j + OFFSET_2 + j*stride) {
errs++;
@@ -342,7 +347,7 @@ int RMACheck( int i, int *buf, MPI_Aint bufsize )
for (j=0; j<longcount; j++) {
if (buf[OFFSET_1+j] != j) {
errs++;
- printf( "case 9: value is %d should be %d\n", i,
+ printf( "case 9: value is %d should be %d\n",
buf[OFFSET_1+j], OFFSET_1 + j );
}
}
@@ -440,7 +445,7 @@ int RMACheckGet( int i, MPI_Win win, int *getbuf, MPI_Aint getsize)
for (j=0; j<longcount; j++) {
if (getbuf[j] != OFFSET_3 + j) {
errs++;
- printf( "case 11: value is %d should be %d\n", i,
+ printf( "case 11: value is %d should be %d\n",
getbuf[j], OFFSET_3 + j );
}
}
http://git.mpich.org/mpich.git/commitdiff/1f1897098dfec1740f93b1390ab1e7facdb0f9da
commit 1f1897098dfec1740f93b1390ab1e7facdb0f9da
Author: James Dinan <dinan at mcs.anl.gov>
Date: Thu Feb 21 13:57:25 2013 -0600
Added missing thread safety to Comm_compare
This function was missing thread safety CS_ENTER/EXIT locks. The global
lock is necessary for this function because it accesses multiple parts
of the comm object, calls several internal routines that assume the
global lock is held, and upates the ref counts on the groups of each
communicator.
Reported by Steve Oyanagi @ Cray. This closes ticket #1796.
Reviewer: goodell
diff --git a/src/mpi/comm/comm_compare.c b/src/mpi/comm/comm_compare.c
index 6536c98..50d6cb2 100644
--- a/src/mpi/comm/comm_compare.c
+++ b/src/mpi/comm/comm_compare.c
@@ -75,6 +75,7 @@ int MPI_Comm_compare(MPI_Comm comm1, MPI_Comm comm2, int *result)
MPIR_ERRTEST_INITIALIZED_ORDIE();
+ MPIU_THREAD_CS_ENTER(ALLFUNC,);
MPID_MPI_FUNC_ENTER(MPID_STATE_MPI_COMM_COMPARE);
# ifdef HAVE_ERROR_CHECKING
@@ -177,6 +178,7 @@ int MPI_Comm_compare(MPI_Comm comm1, MPI_Comm comm2, int *result)
fn_exit:
MPID_MPI_FUNC_EXIT(MPID_STATE_MPI_COMM_COMPARE);
+ MPIU_THREAD_CS_EXIT(ALLFUNC,);
return mpi_errno;
/* --BEGIN ERROR HANDLING-- */
-----------------------------------------------------------------------
Summary of changes:
src/mpi/comm/comm_compare.c | 2 ++
test/mpi/coll/nonblocking3.c | 4 ++++
test/mpi/f90/attr/attrlangc.c | 2 +-
.../mpi_t/nem_fbox_fallback_to_queue_count.c | 5 +++++
test/mpi/rma/linked_list.c | 5 ++++-
test/mpi/rma/linked_list_bench_lock_all.c | 5 ++++-
test/mpi/rma/linked_list_bench_lock_excl.c | 5 ++++-
test/mpi/rma/linked_list_bench_lock_shr.c | 5 ++++-
test/mpi/rma/linked_list_fop.c | 5 ++++-
test/mpi/rma/linked_list_lockall.c | 5 ++++-
test/mpi/rma/lockcontention3.c | 11 ++++++++---
test/mpi/rma/mutex_bench.c | 1 +
12 files changed, 45 insertions(+), 10 deletions(-)
hooks/post-receive
--
MPICH primary repository
More information about the commits
mailing list