From c0b966ba1b3f7fb34a5228b6261a6a2b767c0d96 Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Fri, 4 Jan 2008 12:43:56 -0500 Subject: [svn-r14374] Description: Updates from running bin/reconfigure on recent changes, in preparation for making private snapshot. Also updated tracing information for recent types added to public API routines. Tested on: Linux/32 2.6.x (kagiso) --- bin/trace | 2 ++ src/H5O.c | 3 +++ src/H5Pfapl.c | 2 ++ src/H5trace.c | 20 ++++++++++++++++++++ src/Makefile.in | 14 +++++++------- 5 files changed, 34 insertions(+), 7 deletions(-) diff --git a/bin/trace b/bin/trace index d579857..2f10232 100755 --- a/bin/trace +++ b/bin/trace @@ -45,6 +45,7 @@ $Source = ""; "H5E_type_t" => "Et", "H5F_close_degree_t" => "Fd", "H5F_scope_t" => "Fs", + "H5F_format_version_t" => "Fv", "H5G_obj_t" => "Go", "H5G_stat_t" => "Gs", "hsize_t" => "h", @@ -108,6 +109,7 @@ $Source = ""; "H5MM_allocate_t" => "x", "H5MM_free_t" => "x", "H5O_info_t" => "x", + "H5O_iterate_t" => "x", "H5P_cls_create_func_t" => "x", "H5P_cls_copy_func_t" => "x", "H5P_cls_close_func_t" => "x", diff --git a/src/H5O.c b/src/H5O.c index 70b6efe..fc00813 100644 --- a/src/H5O.c +++ b/src/H5O.c @@ -882,6 +882,7 @@ H5Ovisit(hid_t obj_id, H5_index_t idx_type, H5_iter_order_t order, herr_t ret_value; /* Return value */ FUNC_ENTER_API(H5Ovisit, FAIL) + H5TRACE5("e", "iIiIox*x", obj_id, idx_type, order, op, op_data); /* Check args */ if(idx_type <= H5_INDEX_UNKNOWN || idx_type >= H5_INDEX_N) @@ -939,6 +940,8 @@ H5Ovisit_by_name(hid_t loc_id, const char *obj_name, H5_index_t idx_type, herr_t ret_value; /* Return value */ FUNC_ENTER_API(H5Ovisit_by_name, FAIL) + H5TRACE7("e", "i*sIiIox*xi", loc_id, obj_name, idx_type, order, op, op_data, + lapl_id); /* Check args */ if(!obj_name || !*obj_name) diff --git a/src/H5Pfapl.c b/src/H5Pfapl.c index a23d31c..403e5bb 100644 --- a/src/H5Pfapl.c +++ b/src/H5Pfapl.c @@ -1970,6 +1970,7 @@ H5Pset_format_bounds(hid_t plist_id, H5F_format_version_t low, herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(H5Pset_format_bounds, FAIL) + H5TRACE3("e", "iFvFv", plist_id, low, high); /* Check args */ /* (Note that this is _really_ restricted right now, we'll want to loosen @@ -2014,6 +2015,7 @@ H5Pget_format_bounds(hid_t plist_id, H5F_format_version_t *low/*out*/, herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(H5Pget_format_bounds, FAIL) + H5TRACE3("e", "ixx", plist_id, low, high); /* Get the plist structure */ if(NULL == (plist = H5P_object_verify(plist_id, H5P_FILE_ACCESS))) diff --git a/src/H5trace.c b/src/H5trace.c index 0ad99b2..c709e8a 100644 --- a/src/H5trace.c +++ b/src/H5trace.c @@ -647,6 +647,26 @@ H5_trace (const double *returning, const char *func, const char *type, ...) } break; + case 'v': + if(ptr) { + if(vp) + fprintf(out, "0x%lx", (unsigned long)vp); + else + fprintf(out, "NULL"); + } else { + H5F_format_version_t format_vers = va_arg(ap, H5F_format_version_t); /*lint !e64 Type mismatch not really occuring */ + + switch(format_vers) { + case H5F_FORMAT_EARLIEST: + fprintf(out, "H5F_FORMAT_EARLIEST"); + break; + case H5F_FORMAT_LATEST: + fprintf(out, "H5F_FORMAT_LATEST"); + break; + } + } + break; + default: fprintf(out, "BADTYPE(F%c)", type[1]); goto error; diff --git a/src/Makefile.in b/src/Makefile.in index decae9b..44bc4e7 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -88,13 +88,13 @@ am_libhdf5_la_OBJECTS = H5.lo H5checksum.lo H5dbg.lo H5system.lo \ H5E.lo H5Edeprec.lo H5Eint.lo H5F.lo H5Fdbg.lo H5Ffake.lo \ H5Fmount.lo H5Fsfile.lo H5Fsuper.lo H5Ftest.lo H5FD.lo \ H5FDcore.lo H5FDdirect.lo H5FDfamily.lo H5FDlog.lo H5FDmpi.lo \ - H5FDmpio.lo H5FDmpiposix.lo H5FDmulti.lo H5FDsec2.lo H5FDspace.lo \ - H5FDstdio.lo H5FL.lo H5FO.lo H5FS.lo H5FScache.lo H5FSdbg.lo \ - H5FSsection.lo H5G.lo H5Gbtree2.lo H5Gcompact.lo H5Gdense.lo \ - H5Gdeprec.lo H5Gent.lo H5Gint.lo H5Glink.lo H5Gloc.lo \ - H5Gname.lo H5Gnode.lo H5Gobj.lo H5Goh.lo H5Gstab.lo H5Gtest.lo \ - H5Gtraverse.lo H5HF.lo H5HFbtree2.lo H5HFcache.lo H5HFdbg.lo \ - H5HFdblock.lo H5HFdtable.lo H5HFhdr.lo H5HFhuge.lo \ + H5FDmpio.lo H5FDmpiposix.lo H5FDmulti.lo H5FDsec2.lo \ + H5FDspace.lo H5FDstdio.lo H5FL.lo H5FO.lo H5FS.lo H5FScache.lo \ + H5FSdbg.lo H5FSsection.lo H5G.lo H5Gbtree2.lo H5Gcompact.lo \ + H5Gdense.lo H5Gdeprec.lo H5Gent.lo H5Gint.lo H5Glink.lo \ + H5Gloc.lo H5Gname.lo H5Gnode.lo H5Gobj.lo H5Goh.lo H5Gstab.lo \ + H5Gtest.lo H5Gtraverse.lo H5HF.lo H5HFbtree2.lo H5HFcache.lo \ + H5HFdbg.lo H5HFdblock.lo H5HFdtable.lo H5HFhdr.lo H5HFhuge.lo \ H5HFiblock.lo H5HFiter.lo H5HFman.lo H5HFsection.lo \ H5HFspace.lo H5HFstat.lo H5HFtest.lo H5HFtiny.lo H5HG.lo \ H5HGdbg.lo H5HL.lo H5HLdbg.lo H5HP.lo H5I.lo H5L.lo \ -- cgit v0.12