summaryrefslogtreecommitdiffstats
path: root/src/H5FD.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@lbl.gov>2020-11-26 02:44:34 (GMT)
committerGitHub <noreply@github.com>2020-11-26 02:44:34 (GMT)
commit1bb2bdbcf84b31ee3d098063d081b940aab8f751 (patch)
tree5a4b05c052c49d4ccf687f9d9059e7fe94eeddbf /src/H5FD.c
parent3ebcfb8bf3cc18d9adddba86c47e647fd4eec842 (diff)
downloadhdf5-1bb2bdbcf84b31ee3d098063d081b940aab8f751.zip
hdf5-1bb2bdbcf84b31ee3d098063d081b940aab8f751.tar.gz
hdf5-1bb2bdbcf84b31ee3d098063d081b940aab8f751.tar.bz2
Enhance API tracing (#120)
Enhance API tracing to handle more types, and to put tracing info in a string, allowing it to be used when reporting errors. Also refactor ref-counted strings (H5RS) module to add capabilities needed for the tracing. Refactored H5Gname.c routines to use new H5RS routines also. Added /*out*/ tags to API routines that are returning information to the application. Updated H5TRACE macros from running updated trace script over library code. Added tests for new H5RS routines.
Diffstat (limited to 'src/H5FD.c')
-rw-r--r--src/H5FD.c36
1 files changed, 18 insertions, 18 deletions
diff --git a/src/H5FD.c b/src/H5FD.c
index 28a2bea..46ccf2f 100644
--- a/src/H5FD.c
+++ b/src/H5FD.c
@@ -218,7 +218,7 @@ H5FDregister(const H5FD_class_t *cls)
hid_t ret_value = H5I_INVALID_HID;
FUNC_ENTER_API(H5I_INVALID_HID)
- H5TRACE1("i", "*x", cls);
+ H5TRACE1("i", "*FC", cls);
/* Check arguments */
if (!cls)
@@ -644,7 +644,7 @@ H5FDopen(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
H5FD_t *ret_value = NULL;
FUNC_ENTER_API(NULL)
- H5TRACE4("*x", "*sIuia", name, flags, fapl_id, maxaddr);
+ H5TRACE4("*#", "*sIuia", name, flags, fapl_id, maxaddr);
/* Check arguments */
if (H5P_DEFAULT == fapl_id)
@@ -780,7 +780,7 @@ H5FDclose(H5FD_t *file)
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(FAIL)
- H5TRACE1("e", "*x", file);
+ H5TRACE1("e", "*#", file);
/* Check arguments */
if (!file)
@@ -858,7 +858,7 @@ H5FDcmp(const H5FD_t *f1, const H5FD_t *f2)
int ret_value = -1;
FUNC_ENTER_API(-1) /* return value is arbitrary */
- H5TRACE2("Is", "*x*x", f1, f2);
+ H5TRACE2("Is", "*#*#", f1, f2);
/* Call private function */
ret_value = H5FD_cmp(f1, f2);
@@ -928,7 +928,7 @@ H5FDquery(const H5FD_t *file, unsigned long *flags /*out*/)
int ret_value = 0;
FUNC_ENTER_API((-1))
- H5TRACE2("Is", "*xx", file, flags);
+ H5TRACE2("Is", "*#x", file, flags);
/* Check arguments */
if (!file)
@@ -1021,7 +1021,7 @@ H5FDalloc(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, hsize_t size)
haddr_t ret_value = HADDR_UNDEF;
FUNC_ENTER_API(HADDR_UNDEF)
- H5TRACE4("a", "*xMtih", file, type, dxpl_id, size);
+ H5TRACE4("a", "*#Mtih", file, type, dxpl_id, size);
/* Check arguments */
if (!file)
@@ -1071,7 +1071,7 @@ H5FDfree(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, hsize_t siz
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(FAIL)
- H5TRACE5("e", "*xMtiah", file, type, dxpl_id, addr, size);
+ H5TRACE5("e", "*#Mtiah", file, type, dxpl_id, addr, size);
/* Check arguments */
if (!file)
@@ -1114,7 +1114,7 @@ H5FDget_eoa(H5FD_t *file, H5FD_mem_t type)
haddr_t ret_value;
FUNC_ENTER_API(HADDR_UNDEF)
- H5TRACE2("a", "*xMt", file, type);
+ H5TRACE2("a", "*#Mt", file, type);
/* Check arguments */
if (!file)
@@ -1162,7 +1162,7 @@ H5FDset_eoa(H5FD_t *file, H5FD_mem_t type, haddr_t addr)
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(FAIL)
- H5TRACE3("e", "*xMta", file, type, addr);
+ H5TRACE3("e", "*#Mta", file, type, addr);
/* Check arguments */
if (!file)
@@ -1210,7 +1210,7 @@ H5FDget_eof(H5FD_t *file, H5FD_mem_t type)
haddr_t ret_value;
FUNC_ENTER_API(HADDR_UNDEF)
- H5TRACE2("a", "*xMt", file, type);
+ H5TRACE2("a", "*#Mt", file, type);
/* Check arguments */
if (!file)
@@ -1361,7 +1361,7 @@ H5FDread(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t size
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(FAIL)
- H5TRACE6("e", "*xMtiazx", file, type, dxpl_id, addr, size, buf);
+ H5TRACE6("e", "*#Mtiazx", file, type, dxpl_id, addr, size, buf);
/* Check arguments */
if (!file)
@@ -1407,7 +1407,7 @@ H5FDwrite(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t siz
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(FAIL)
- H5TRACE6("e", "*xMtiaz*x", file, type, dxpl_id, addr, size, buf);
+ H5TRACE6("e", "*#Mtiaz*x", file, type, dxpl_id, addr, size, buf);
/* Check arguments */
if (!file)
@@ -1451,7 +1451,7 @@ H5FDflush(H5FD_t *file, hid_t dxpl_id, hbool_t closing)
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(FAIL)
- H5TRACE3("e", "*xib", file, dxpl_id, closing);
+ H5TRACE3("e", "*#ib", file, dxpl_id, closing);
/* Check arguments */
if (!file)
@@ -1518,7 +1518,7 @@ H5FDtruncate(H5FD_t *file, hid_t dxpl_id, hbool_t closing)
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(FAIL)
- H5TRACE3("e", "*xib", file, dxpl_id, closing);
+ H5TRACE3("e", "*#ib", file, dxpl_id, closing);
/* Check arguments */
if (!file)
@@ -1584,7 +1584,7 @@ H5FDlock(H5FD_t *file, hbool_t rw)
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(FAIL)
- H5TRACE2("e", "*xb", file, rw);
+ H5TRACE2("e", "*#b", file, rw);
/* Check arguments */
if (!file)
@@ -1643,7 +1643,7 @@ H5FDunlock(H5FD_t *file)
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(FAIL)
- H5TRACE1("e", "*x", file);
+ H5TRACE1("e", "*#", file);
/* Check arguments */
if (!file)
@@ -1724,12 +1724,12 @@ H5FD_get_fileno(const H5FD_t *file, unsigned long *filenum)
*--------------------------------------------------------------------------
*/
herr_t
-H5FDget_vfd_handle(H5FD_t *file, hid_t fapl_id, void **file_handle)
+H5FDget_vfd_handle(H5FD_t *file, hid_t fapl_id, void **file_handle /*out*/)
{
herr_t ret_value = SUCCEED;
FUNC_ENTER_API(FAIL)
- H5TRACE3("e", "*xi**x", file, fapl_id, file_handle);
+ H5TRACE3("e", "*#ix", file, fapl_id, file_handle);
/* Check arguments */
if (!file)