diff options
| author | jhendersonHDF <jhenderson@hdfgroup.org> | 2022-05-03 17:02:01 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-03 17:02:01 (GMT) |
| commit | 5f00066eacdf2b2ddb3cf92635bea99eb1aee85e (patch) | |
| tree | d7dc19a5e765e1f03933f3244ac622e362e33c2f /src/H5trace.c | |
| parent | 47e3d5e79522d8030a5a455521524a80cd9ef064 (diff) | |
| download | hdf5-5f00066eacdf2b2ddb3cf92635bea99eb1aee85e.zip hdf5-5f00066eacdf2b2ddb3cf92635bea99eb1aee85e.tar.gz hdf5-5f00066eacdf2b2ddb3cf92635bea99eb1aee85e.tar.bz2 | |
Hdf5 1 12 Miscellaneous warnings fixes (#1718)
* Fixes const issues in the version 2 B-trees (#1172)
The operations that were changed are fundamentally not const since the
shadow operation can modify the node structure when SWMR is in use.
* Quiets const warning in H5RS code (#1181)
* Avoid calling H5Ropen_object with a misaligned H5R_ref_t: copy the (#1171)
* Avoid calling H5Ropen_object with a misaligned H5R_ref_t: copy the
raw H5R_ref_t bytes to a heap buffer that's known to have the right
alignment.
* Committing clang-format changes
* Use an automatic H5R_ref_t instead of malloc'ing one. Go ahead and
initialize the H5R_ref_t to all-0s so that arbitrary stack content
doesn't foul things up. Bail out with an error if `size` exceeds
`sizeof(H5R_ref_t)`.
* Committing clang-format changes
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
* Miscellaneous warnings fixes
Co-authored-by: Dana Robinson <43805+derobins@users.noreply.github.com>
Co-authored-by: David Young <dyoung@hdfgroup.org>
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Diffstat (limited to 'src/H5trace.c')
| -rw-r--r-- | src/H5trace.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/H5trace.c b/src/H5trace.c index d13d8ef..8d70254 100644 --- a/src/H5trace.c +++ b/src/H5trace.c @@ -120,8 +120,8 @@ H5_trace(const double *returning, const char *func, const char *type, ...) void * vp = NULL; FILE * out = H5_debug_g.trace; static hbool_t is_first_invocation = TRUE; - H5_timer_t function_timer = {{0}, {0}, {0}, FALSE}; - H5_timevals_t function_times; + H5_timer_t function_timer; + H5_timevals_t function_times = {0.0, 0.0, 0.0}; static H5_timer_t running_timer; H5_timevals_t running_times; static int current_depth = 0; @@ -133,6 +133,10 @@ H5_trace(const double *returning, const char *func, const char *type, ...) return 0.0F; /*tracing is off*/ HDva_start(ap, type); + /* Initialize the timer for this function */ + if (H5_debug_g.ttimes) + H5_timer_init(&function_timer); + if (H5_debug_g.ttop) { if (returning) { if (current_depth > 1) { @@ -156,11 +160,10 @@ H5_trace(const double *returning, const char *func, const char *type, ...) H5_timer_init(&running_timer); H5_timer_start(&running_timer); } /* end if */ - if (H5_debug_g.ttimes) { - /* start the timer for this function */ - H5_timer_init(&function_timer); + + /* Start the timer for this function */ + if (H5_debug_g.ttimes) H5_timer_start(&function_timer); - } /* end if */ /* Print the first part of the line. This is the indication of the * nesting depth followed by the function name and either start of |