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/H5Gdeprec.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/H5Gdeprec.c')
| -rw-r--r-- | src/H5Gdeprec.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/H5Gdeprec.c b/src/H5Gdeprec.c index 03a380b..07de86a 100644 --- a/src/H5Gdeprec.c +++ b/src/H5Gdeprec.c @@ -46,6 +46,7 @@ #include "H5Iprivate.h" /* IDs */ #include "H5Lprivate.h" /* Links */ #include "H5Pprivate.h" /* Property lists */ +#include "H5AC2private.h" /* Metadata cache */ /****************/ @@ -203,7 +204,7 @@ H5Gcreate1(hid_t loc_id, const char *name, size_t size_hint) hid_t tmp_gcpl = (-1); /* Temporary group creation property list */ hid_t ret_value; /* Return value */ - FUNC_ENTER_API_META(H5Gcreate1, FAIL) + FUNC_ENTER_API_META(H5Gcreate1, loc_id, FAIL) H5TRACE3("i", "i*sz", loc_id, name, size_hint); /* Check arguments */ @@ -325,7 +326,7 @@ H5Glink(hid_t cur_loc_id, H5G_link_t type, const char *cur_name, const char *new { herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_API_META(H5Glink, FAIL) + FUNC_ENTER_API_META(H5Glink, cur_loc_id, FAIL) H5TRACE4("e", "iLl*s*s", cur_loc_id, type, cur_name, new_name); /* Check arguments */ @@ -371,7 +372,7 @@ H5Glink2(hid_t cur_loc_id, const char *cur_name, H5G_link_t type, { herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_API_META(H5Glink2, FAIL) + FUNC_ENTER_API_META(H5Glink2, cur_loc_id, FAIL) H5TRACE5("e", "i*sLli*s", cur_loc_id, cur_name, type, new_loc_id, new_name); /* Check arguments */ @@ -474,7 +475,7 @@ H5Gmove(hid_t src_loc_id, const char *src_name, const char *dst_name) { herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_API_META(H5Gmove, FAIL) + FUNC_ENTER_API_META(H5Gmove, src_loc_id, FAIL) H5TRACE3("e", "i*s*s", src_loc_id, src_name, dst_name); /* Call common routine to move the link */ @@ -499,7 +500,7 @@ H5Gmove2(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, { herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_API_META(H5Gmove2, FAIL) + FUNC_ENTER_API_META(H5Gmove2, src_loc_id, FAIL) H5TRACE4("e", "i*si*s", src_loc_id, src_name, dst_loc_id, dst_name); /* Call common routine to move the link */ @@ -581,7 +582,7 @@ H5Gunlink(hid_t loc_id, const char *name) H5G_loc_t loc; /* Group's location */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_API_META(H5Gunlink, FAIL) + FUNC_ENTER_API_META(H5Gunlink, loc_id, FAIL) H5TRACE2("e", "i*s", loc_id, name); /* Check arguments */ @@ -654,7 +655,7 @@ H5Gset_comment(hid_t loc_id, const char *name, const char *comment) H5G_loc_t loc; herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_API_META(H5Gset_comment, FAIL) + FUNC_ENTER_API_META(H5Gset_comment, loc_id, FAIL) H5TRACE3("e", "i*s*s", loc_id, name, comment); if(H5G_loc(loc_id, &loc) < 0) |