summaryrefslogtreecommitdiffstats
path: root/src/H5TS.c
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2020-10-13 20:51:06 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2020-10-15 13:09:48 (GMT)
commit48d171b04730aff7beade684e9afd164f0204b0c (patch)
tree81bb97f196a1f35bc94624ab5f1b8e9fbbccaa81 /src/H5TS.c
parent1ce4c8dd7ddaa344ad041514b1d3aa4979497275 (diff)
downloadhdf5-48d171b04730aff7beade684e9afd164f0204b0c.zip
hdf5-48d171b04730aff7beade684e9afd164f0204b0c.tar.gz
hdf5-48d171b04730aff7beade684e9afd164f0204b0c.tar.bz2
Merge from 1.10
Comments, whitespace Simple init and if block brackets. Minimal code changes limited to return value and spelling
Diffstat (limited to 'src/H5TS.c')
-rw-r--r--src/H5TS.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/H5TS.c b/src/H5TS.c
index a76ed5a..98e7d1b 100644
--- a/src/H5TS.c
+++ b/src/H5TS.c
@@ -249,7 +249,10 @@ H5TS_cancel_count_inc(void)
if (!cancel_counter) {
/*
* First time thread calls library - create new counter and associate
- * with key
+ * with key.
+ *
+ * Don't use H5MM calls here since the destructor has to use HDfree in
+ * order to avoid codestack calls.
*/
cancel_counter = (H5TS_cancel_t *)H5MM_calloc(sizeof(H5TS_cancel_t));
@@ -408,7 +411,6 @@ H5TS_win32_process_exit(void)
/* Clean up per-process thread local storage */
TlsFree(H5TS_errstk_key_g);
-
#ifdef H5_HAVE_CODESTACK
TlsFree(H5TS_funcstk_key_g);
#endif /* H5_HAVE_CODESTACK */