[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).

1 files changed, 10 insertions, 6 deletions

diff --git a/src/H5O.c b/src/H5O.c
index 9f666d0..f72fe7e 100644
--- a/src/H5O.c
+++ b/src/H5O.c
@@ -46,6 +46,7 @@
 #include "H5MFprivate.h"	/* File memory management		*/
 #include "H5Opkg.h"             /* Object headers			*/
 #include "H5SMprivate.h"        /* Shared object header messages        */
+#include "H5AC2private.h"       /* Metadata cache                       */
 
 
 /****************/
@@ -411,7 +412,7 @@ H5Olink(hid_t obj_id, hid_t new_loc_id, const char *new_name, hid_t lcpl_id,
     H5G_loc_t	obj_loc;
     herr_t      ret_value = SUCCEED;       /* Return value */
 
-    FUNC_ENTER_API_META(H5Olink, FAIL)
+    FUNC_ENTER_API_META(H5Olink, obj_id, FAIL)
     H5TRACE5("e", "ii*sii", obj_id, new_loc_id, new_name, lcpl_id, lapl_id);
 
     /* Check arguments */
@@ -463,7 +464,7 @@ H5Oincr_refcount(hid_t object_id)
     H5O_loc_t  *oloc;
     herr_t      ret_value = SUCCEED;
 
-    FUNC_ENTER_API_META(H5Oincr_refcount, FAIL)
+    FUNC_ENTER_API_META(H5Oincr_refcount, object_id, FAIL)
     H5TRACE1("e", "i", object_id);
 
     /* Get the object's oloc so we can adjust its link count */
@@ -504,7 +505,7 @@ H5Odecr_refcount(hid_t object_id)
     H5O_loc_t  *oloc;
     herr_t      ret_value = SUCCEED;
 
-    FUNC_ENTER_API_META(H5Odecr_refcount, FAIL)
+    FUNC_ENTER_API_META(H5Odecr_refcount, object_id, FAIL)
     H5TRACE1("e", "i", object_id);
 
     /* Get the object's oloc so we can adjust its link count */
@@ -692,7 +693,7 @@ H5Oset_comment(hid_t obj_id, const char *comment)
     H5G_loc_t	loc;                    /* Location of group */
     herr_t      ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_API_META(H5Oset_comment, FAIL)
+    FUNC_ENTER_API_META(H5Oset_comment, obj_id, FAIL)
     H5TRACE2("e", "i*s", obj_id, comment);
 
     /* Check args */
@@ -732,7 +733,7 @@ H5Oset_comment_by_name(hid_t loc_id, const char *name, const char *comment,
     H5G_loc_t	loc;                    /* Location of group */
     herr_t      ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_API_META(H5Oset_comment_by_name, FAIL)
+    FUNC_ENTER_API_META(H5Oset_comment_by_name, loc_id, FAIL)
     H5TRACE4("e", "i*s*si", loc_id, name, comment, lapl_id);
 
     /* Check args */
@@ -862,7 +863,10 @@ H5Oclose(hid_t object_id)
 {
     herr_t       ret_value = SUCCEED;
 
-    FUNC_ENTER_API_META(H5Oclose, FAIL)
+    /* Will this ever change metadata?  No need for a transaction unless
+     * it does.
+     */
+    FUNC_ENTER_API_META(H5Oclose, object_id, FAIL)
     H5TRACE1("e", "i", object_id);
 
     /* Get the type of the object and close it in the correct way */