From 8f74cc85d8c0f499277622a40d90679a4b0b1db1 Mon Sep 17 00:00:00 2001 From: Dana Robinson Date: Thu, 4 Jun 2015 15:47:04 -0500 Subject: [svn-r27152] Updated bin/trace and src/H5trace.c to handle the H5D_vds_view_t enum type. Tested on: jam --- bin/trace | 1 + src/H5Pdapl.c | 4 ++++ src/H5trace.c | 30 ++++++++++++++++++++++++++++++ 3 files changed, 35 insertions(+) diff --git a/bin/trace b/bin/trace index 2823982..f548361 100755 --- a/bin/trace +++ b/bin/trace @@ -41,6 +41,7 @@ $Source = ""; "H5D_mpio_no_collective_cause_t" => "Dn", "H5D_mpio_actual_chunk_opt_mode_t" => "Do", "H5D_space_status_t" => "Ds", + "H5D_vds_view_t" => "Dv", "H5FD_mpio_xfer_t" => "Dt", "herr_t" => "e", "H5E_direction_t" => "Ed", diff --git a/src/H5Pdapl.c b/src/H5Pdapl.c index dea45f2..256a46e 100644 --- a/src/H5Pdapl.c +++ b/src/H5Pdapl.c @@ -332,6 +332,7 @@ H5Pset_virtual_view(hid_t plist_id, H5D_vds_view_t view) herr_t ret_value = SUCCEED; /* return value */ FUNC_ENTER_API(FAIL) + H5TRACE2("e", "iDv", plist_id, view); /* Check argument */ if((view != H5D_VDS_FIRST_MISSING) && (view != H5D_VDS_LAST_AVAILABLE)) @@ -371,6 +372,7 @@ H5Pget_virtual_view(hid_t plist_id) H5D_vds_view_t ret_value; /* Return value */ FUNC_ENTER_API(H5D_VDS_ERROR) + H5TRACE1("Dv", "i", plist_id); /* Get the plist structure */ if(NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_ACCESS))) @@ -475,6 +477,7 @@ H5Pset_virtual_printf_gap(hid_t plist_id, hsize_t gap_size) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(FAIL) + H5TRACE2("e", "ih", plist_id, gap_size); /* Check argument */ if(gap_size == HSIZE_UNDEF) @@ -512,6 +515,7 @@ H5Pget_virtual_printf_gap(hid_t plist_id, hsize_t *gap_size) herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(H5D_VDS_ERROR) + H5TRACE2("e", "i*h", plist_id, gap_size); /* Get the plist structure */ if(NULL == (plist = H5P_object_verify(plist_id, H5P_DATASET_ACCESS))) diff --git a/src/H5trace.c b/src/H5trace.c index 6b12318..66b3a0c 100644 --- a/src/H5trace.c +++ b/src/H5trace.c @@ -680,6 +680,36 @@ H5_trace(const double *returning, const char *func, const char *type, ...) } /* end else */ break; + case 'v': + if(ptr) { + if(vp) + fprintf(out, "0x%lx", (unsigned long)vp); + else + fprintf(out, "NULL"); + } /* end if */ + else { + H5D_vds_view_t view = (H5D_vds_view_t)va_arg(ap, int); + + switch(view) { + case H5D_VDS_ERROR: + fprintf(out, "H5D_VDS_ERROR"); + break; + + case H5D_VDS_FIRST_MISSING: + fprintf(out, "H5D_VDS_FIRST_MISSING"); + break; + + case H5D_VDS_LAST_AVAILABLE: + fprintf(out, "H5D_VDS_LAST_AVAILABLE"); + break; + + default: + fprintf(out, "%ld", (long)view); + break; + } /* end switch */ + } /* end else */ + break; + default: fprintf (out, "BADTYPE(D%c)", type[1]); goto error; -- cgit v0.12