mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-04-06 17:20:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r28773] Description:

Browse Source 
Clear memory for shared message info when "deferring" and using memory
checker, so valgrind doesn't whine.

Tested on:
    MacOSX/64 10.11.2 (amazon) w/serial & parallel
    (h5committest forthcoming)
This commit is contained in:
Quincey Koziol 2016-01-03 09:22:49 -05:00
parent d4f3d93b8d
commit f8465bd124
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/H5SM.c
View File

@ -1375,11 +1375,23 @@ H5SM_write_mesg(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
} /* end else */
} /* end else */
if(found)
if(found) {
/* If the message was found, it's shared in the heap (now). Set up a
* shared message so we can mark it as shared.
*/
shared.type = H5O_SHARE_TYPE_SOHM;
#ifdef H5_USING_MEMCHECKER
/* Reset the shared message payload if deferring. This doesn't matter
* in the long run since the payload will get overwritten when the
* non-deferred call to this routine occurs, but it stops memory
* checkers like valgrind from whining when the partially initialized
* shared message is serialized. -QAK
*/
if(defer)
HDmemset(&shared.u, 0, sizeof(shared.u));
#endif /* H5_USING_MEMCHECKER */
} /* end if */
else {
htri_t share_in_ohdr; /* Whether the new message can be shared in another object's header */