summaryrefslogtreecommitdiffstats
path: root/src/H5C.c
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2018-12-31 03:11:41 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2018-12-31 03:11:41 (GMT)
commit029491e877a3c5c4f5947df3cc74785ce01be2ba (patch)
treea626b25a555518963c37e50c0ef26dcf30b5d5c2 /src/H5C.c
parentd531e1b6f781de58fafbe5a902636de57e56ae30 (diff)
downloadhdf5-029491e877a3c5c4f5947df3cc74785ce01be2ba.zip
hdf5-029491e877a3c5c4f5947df3cc74785ce01be2ba.tar.gz
hdf5-029491e877a3c5c4f5947df3cc74785ce01be2ba.tar.bz2
Merge of logging framework updates.
Diffstat (limited to 'src/H5C.c')
-rw-r--r--src/H5C.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/H5C.c b/src/H5C.c
index c4d4eed..e5f734c 100644
--- a/src/H5C.c
+++ b/src/H5C.c
@@ -282,13 +282,8 @@ H5C_create(size_t max_cache_size,
cache_ptr->flush_in_progress = FALSE;
- cache_ptr->logging_enabled = FALSE;
-
- cache_ptr->currently_logging = FALSE;
-
- cache_ptr->log_file_ptr = NULL;
-
- cache_ptr->trace_file_ptr = NULL;
+ if(NULL == (cache_ptr->log_info = (H5C_log_info_t *)H5MM_calloc(sizeof(H5C_log_info_t))))
+ HGOTO_ERROR(H5E_CACHE, H5E_CANTALLOC, NULL, "memory allocation failed")
cache_ptr->aux_ptr = aux_ptr;
@@ -493,6 +488,9 @@ done:
if(cache_ptr->tag_list != NULL)
H5SL_close(cache_ptr->tag_list);
+ if(cache_ptr->log_info != NULL)
+ H5MM_xfree(cache_ptr->log_info);
+
cache_ptr->magic = 0;
cache_ptr = H5FL_FREE(H5C_t, cache_ptr);
} /* end if */
@@ -865,6 +863,9 @@ H5C_dest(H5F_t * f)
cache_ptr->tag_list = NULL;
} /* end if */
+ if(cache_ptr->log_info != NULL)
+ H5MM_xfree(cache_ptr->log_info);
+
#ifndef NDEBUG
#if H5C_DO_SANITY_CHECKS
if(cache_ptr->get_entry_ptr_from_addr_counter > 0)