diff options
| author | John Mainzer <mainzer@hdfgroup.org> | 2008-04-25 14:55:20 (GMT) |
|---|---|---|
| committer | John Mainzer <mainzer@hdfgroup.org> | 2008-04-25 14:55:20 (GMT) |
| commit | 2c84019fcaca9a1cb2a415564d8b88e3dd88479d (patch) | |
| tree | 22b8d155072c707be3f408185d739b1d65c2f085 /src/H5Fmount.c | |
| parent | de68c607843fbfa55f94a661cf8cf58ad09adc0c (diff) | |
| download | hdf5-2c84019fcaca9a1cb2a415564d8b88e3dd88479d.zip hdf5-2c84019fcaca9a1cb2a415564d8b88e3dd88479d.tar.gz hdf5-2c84019fcaca9a1cb2a415564d8b88e3dd88479d.tar.bz2 | |
[svn-r14863] Checking in code supporting metadata journaling in the serial case.
While this code doesn't break any of the existing tests, it HAS NOT
been tested beyond that.
Also mods needed to integrate the journaling code with Quincey's latest
mods, and to adapt existing test code to slight changes caused by the
addition of journaling.
Finally, fixed an undefined variable bug in the HL code exposed by the
journaling mods.
Tested serial under Linux (Phoenix) and parallel under Linux (Kagiso).
Diffstat (limited to 'src/H5Fmount.c')
| -rw-r--r-- | src/H5Fmount.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/src/H5Fmount.c b/src/H5Fmount.c index 92882ae..7eee769 100644 --- a/src/H5Fmount.c +++ b/src/H5Fmount.c @@ -27,6 +27,7 @@ #include "H5Iprivate.h" /* IDs */ #include "H5Pprivate.h" /* Property lists */ #include "H5MMprivate.h" /* Memory management */ +#include "H5AC2private.h" /* Metadata cache */ /* PRIVATE PROTOTYPES */ static herr_t H5F_mount(H5G_loc_t *loc, const char *name, H5F_t *child, @@ -482,7 +483,12 @@ H5Fmount(hid_t loc_id, const char *name, hid_t child_id, hid_t plist_id) H5F_t *child = NULL; herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_API_META(H5Fmount, FAIL) + /* Not sure this will generate any dirty metadata... + * + * Also we must work out how we are going to deal with journaling + * in such cases. + */ + FUNC_ENTER_API_META(H5Fmount, loc_id, FAIL) H5TRACE4("e", "i*sii", loc_id, name, child_id, plist_id); /* Check arguments */ @@ -532,7 +538,12 @@ H5Funmount(hid_t loc_id, const char *name) H5G_loc_t loc; herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_API_META(H5Funmount, FAIL) + /* Not sure that this will generate any dirty metadata. + * + * Also, must decide how we are going to deal with journaling + * in such cases. + */ + FUNC_ENTER_API_META(H5Funmount, loc_id, FAIL) H5TRACE2("e", "i*s", loc_id, name); /* Check args */ |