|
From: <sv...@va...> - 2012-09-02 20:31:48
|
sewardj 2012-09-02 21:31:39 +0100 (Sun, 02 Sep 2012)
New Revision: 12940
Log:
Merge from trunk, r12887 (n-i-bz: Fix false positives in
count_from_Status etc al.)
Modified directories:
branches/VALGRIND_3_8_BRANCH/
branches/VALGRIND_3_8_BRANCH/coregrind/
branches/VALGRIND_3_8_BRANCH/coregrind/m_syswrap/
Modified files:
branches/VALGRIND_3_8_BRANCH/coregrind/m_syswrap/syswrap-generic.c
branches/VALGRIND_3_8_BRANCH/mpi/libmpiwrap.c
Modified: branches/VALGRIND_3_8_BRANCH/
Modified: branches/VALGRIND_3_8_BRANCH/coregrind/
Modified: branches/VALGRIND_3_8_BRANCH/coregrind/m_syswrap/
Property changed: branches/VALGRIND_3_8_BRANCH/coregrind/m_syswrap/syswrap-generic.c (+0 -0)
___________________________________________________________________
Name: svn:mergeinfo
- /branches/TCHAIN/coregrind/m_syswrap/syswrap-generic.c:12477-12516
/trunk/coregrind/m_syswrap/syswrap-generic.c:12874,12878-12879,12881-12883,12885
+ /branches/TCHAIN/coregrind/m_syswrap/syswrap-generic.c:12477-12516
/trunk/coregrind/m_syswrap/syswrap-generic.c:12874,12878-12879,12881-12883,12885,12887
Property changed: branches/VALGRIND_3_8_BRANCH (+0 -0)
___________________________________________________________________
Name: svn:mergeinfo
- /branches/TCHAIN:12477-12516
/trunk:12873,12878-12879,12885
+ /branches/TCHAIN:12477-12516
/trunk:12873,12878-12879,12885,12887
Modified: branches/VALGRIND_3_8_BRANCH/mpi/libmpiwrap.c (+4 -0)
===================================================================
--- branches/VALGRIND_3_8_BRANCH/mpi/libmpiwrap.c 2012-09-02 21:26:23 +01:00 (rev 12939)
+++ branches/VALGRIND_3_8_BRANCH/mpi/libmpiwrap.c 2012-09-02 21:31:39 +01:00 (rev 12940)
@@ -413,7 +413,9 @@
MPI_Status* status)
{
int n;
+ if (cONFIG_DER) VALGRIND_DISABLE_ERROR_REPORTING;
int err = PMPI_Get_count(status, datatype, &n);
+ if (cONFIG_DER) VALGRIND_ENABLE_ERROR_REPORTING;
if (err == MPI_SUCCESS) {
*recv_count = n;
return True;
@@ -1107,6 +1109,7 @@
if (cONFIG_DER) VALGRIND_DISABLE_ERROR_REPORTING;
CALL_FN_W_7W(err, fn, buf,count,datatype,source,tag,comm,status);
if (cONFIG_DER) VALGRIND_ENABLE_ERROR_REPORTING;
+ make_mem_defined_if_addressable_if_success_untyped(err, status, sizeof(*status));
if (err == MPI_SUCCESS && count_from_Status(&recv_count,datatype,status)) {
make_mem_defined_if_addressable(buf, recv_count, datatype);
}
@@ -1724,6 +1727,7 @@
recvbuf,recvcount,recvtype,source,recvtag,
comm,status);
if (cONFIG_DER) VALGRIND_ENABLE_ERROR_REPORTING;
+ make_mem_defined_if_addressable_if_success_untyped(err, status, sizeof(*status));
if (err == MPI_SUCCESS
&& count_from_Status(&recvcount_actual,recvtype,status)) {
make_mem_defined_if_addressable(recvbuf, recvcount_actual, recvtype);
Property changed: branches/VALGRIND_3_8_BRANCH/coregrind (+0 -0)
___________________________________________________________________
Name: svn:mergeinfo
- /branches/TCHAIN/coregrind:12477-12516
/trunk/coregrind:12873,12881,12885
+ /branches/TCHAIN/coregrind:12477-12516
/trunk/coregrind:12873,12881,12885,12887
Property changed: branches/VALGRIND_3_8_BRANCH/coregrind/m_syswrap (+0 -0)
___________________________________________________________________
Name: svn:mergeinfo
- /branches/TCHAIN/coregrind/m_syswrap:12477-12516
/trunk/coregrind/m_syswrap:12873,12881-12883,12885
+ /branches/TCHAIN/coregrind/m_syswrap:12477-12516
/trunk/coregrind/m_syswrap:12873,12881-12883,12885,12887
|