summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2018-12-28 13:15:58 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2018-12-28 13:15:58 (GMT)
commit1ff756a1047d58f71c70deb48c797cb860904292 (patch)
tree33f20992224381794d07e31b54313f1f26709a01
parent552fec96e91bf89046214f9090a4f9855bdc89e3 (diff)
downloadhdf5-1ff756a1047d58f71c70deb48c797cb860904292.zip
hdf5-1ff756a1047d58f71c70deb48c797cb860904292.tar.gz
hdf5-1ff756a1047d58f71c70deb48c797cb860904292.tar.bz2
Updated the log function names.
-rw-r--r--src/H5AC.c48
-rw-r--r--src/H5Clog.c136
-rw-r--r--src/H5Clog.h49
-rw-r--r--src/H5Clog_json.c6
-rw-r--r--src/H5Clog_trace.c6
5 files changed, 123 insertions, 122 deletions
diff --git a/src/H5AC.c b/src/H5AC.c
index f1f2aba..0a5411a 100644
--- a/src/H5AC.c
+++ b/src/H5AC.c
@@ -413,7 +413,7 @@ H5AC_create(const H5F_t *f, H5AC_cache_config_t *config_ptr, H5AC_cache_image_co
* is generated when logging is controlled by the struct.
*/
if(H5F_USE_MDC_LOGGING(f))
- if(H5C_set_up_logging(f->shared->cache, H5F_MDC_LOG_LOCATION(f), H5C_LOG_STYLE_JSON, H5F_START_MDC_LOG_ON_ACCESS(f)) < 0)
+ if(H5C_log_set_up(f->shared->cache, H5F_MDC_LOG_LOCATION(f), H5C_LOG_STYLE_JSON, H5F_START_MDC_LOG_ON_ACCESS(f)) < 0)
HGOTO_ERROR(H5E_CACHE, H5E_LOGGING, FAIL, "mdc logging setup failed")
/* Set the cache parameters */
@@ -436,7 +436,7 @@ H5AC_create(const H5F_t *f, H5AC_cache_config_t *config_ptr, H5AC_cache_image_co
done:
/* If currently logging, generate a message */
if(f->shared->cache->log_info->logging)
- if(H5C_write_create_cache_log_msg(f->shared->cache, ret_value) < 0)
+ if(H5C_log_write_create_cache_msg(f->shared->cache, ret_value) < 0)
HDONE_ERROR(H5E_CACHE, H5E_LOGGING, FAIL, "unable to emit log message")
#ifdef H5_HAVE_PARALLEL
@@ -500,11 +500,11 @@ H5AC_dest(H5F_t *f)
if(H5C_get_logging_status(f->shared->cache, &log_enabled, &curr_logging) < 0)
HGOTO_ERROR(H5E_CACHE, H5E_LOGGING, FAIL, "unable to get logging status")
if(log_enabled && curr_logging)
- if(H5C_write_destroy_cache_log_msg(f->shared->cache) < 0)
+ if(H5C_log_write_destroy_cache_msg(f->shared->cache) < 0)
HDONE_ERROR(H5E_CACHE, H5E_LOGGING, FAIL, "unable to emit log message")
/* Tear down logging */
if(log_enabled)
- if(H5C_tear_down_logging(f->shared->cache) < 0)
+ if(H5C_log_tear_down(f->shared->cache) < 0)
HGOTO_ERROR(H5E_CACHE, H5E_LOGGING, FAIL, "mdc logging tear-down failed")
#ifdef H5_HAVE_PARALLEL
@@ -590,7 +590,7 @@ done:
/* If currently logging, generate a message */
if(f->shared->cache->log_info->logging)
- if(H5C_write_evict_cache_log_msg(f->shared->cache, ret_value) < 0)
+ if(H5C_log_write_evict_cache_msg(f->shared->cache, ret_value) < 0)
HDONE_ERROR(H5E_CACHE, H5E_LOGGING, FAIL, "unable to emit log message")
FUNC_LEAVE_NOAPI(ret_value)
@@ -633,7 +633,7 @@ H5AC_expunge_entry(H5F_t *f, const H5AC_class_t *type, haddr_t addr,
done:
/* If currently logging, generate a message */
if(f->shared->cache->log_info->logging)
- if(H5C_write_expunge_entry_log_msg(f->shared->cache, addr, type->id, ret_value) < 0)
+ if(H5C_log_write_expunge_entry_msg(f->shared->cache, addr, type->id, ret_value) < 0)
HDONE_ERROR(H5E_CACHE, H5E_LOGGING, FAIL, "unable to emit log message")
FUNC_LEAVE_NOAPI(ret_value)
@@ -690,7 +690,7 @@ H5AC_flush(H5F_t *f)
done:
/* If currently logging, generate a message */
if(f->shared->cache->log_info->logging)
- if(H5C_write_flush_cache_log_msg(f->shared->cache, ret_value) < 0)
+ if(H5C_log_write_flush_cache_msg(f->shared->cache, ret_value) < 0)
HDONE_ERROR(H5E_CACHE, H5E_LOGGING, FAIL, "unable to emit log message")
FUNC_LEAVE_NOAPI(ret_value)
@@ -870,7 +870,7 @@ H5AC_insert_entry(H5F_t *f, const H5AC_class_t *type, haddr_t addr, void *thing,
done:
/* If currently logging, generate a message */
if(f->shared->cache->log_info->logging)
- if(H5C_write_insert_entry_log_msg(f->shared->cache, addr, type->id, flags, ((H5C_cache_entry_t *)thing)->size, ret_value) < 0)
+ if(H5C_log_write_insert_entry_msg(f->shared->cache, addr, type->id, flags, ((H5C_cache_entry_t *)thing)->size, ret_value) < 0)
HDONE_ERROR(H5E_CACHE, H5E_LOGGING, FAIL, "unable to emit log message")
FUNC_LEAVE_NOAPI(ret_value)
@@ -959,7 +959,7 @@ H5AC_mark_entry_dirty(void *thing)
done:
/* If currently logging, generate a message */
if(cache_ptr->log_info->logging)
- if(H5C_write_mark_entry_dirty_log_msg(cache_ptr, entry_ptr, ret_value) < 0)
+ if(H5C_log_write_mark_entry_dirty_msg(cache_ptr, entry_ptr, ret_value) < 0)
HDONE_ERROR(H5E_CACHE, H5E_LOGGING, FAIL, "unable to emit log message")
FUNC_LEAVE_NOAPI(ret_value)
@@ -1012,7 +1012,7 @@ H5AC_mark_entry_clean(void *thing)
done:
/* If currently logging, generate a message */
if(cache_ptr->log_info->logging)
- if(H5C_write_mark_entry_clean_log_msg(cache_ptr, entry_ptr, ret_value) < 0)
+ if(H5C_log_write_mark_entry_clean_msg(cache_ptr, entry_ptr, ret_value) < 0)
HDONE_ERROR(H5E_CACHE, H5E_LOGGING, FAIL, "unable to emit log message")
FUNC_LEAVE_NOAPI(ret_value)
@@ -1054,7 +1054,7 @@ H5AC_mark_entry_unserialized(void *thing)
done:
/* If currently logging, generate a message */
if(cache_ptr->log_info->logging)
- if(H5C_write_mark_unserialized_entry_log_msg(cache_ptr, entry_ptr, ret_value) < 0)
+ if(H5C_log_write_mark_unserialized_entry_msg(cache_ptr, entry_ptr, ret_value) < 0)
HDONE_ERROR(H5E_CACHE, H5E_LOGGING, FAIL, "unable to emit log message")
FUNC_LEAVE_NOAPI(ret_value)
@@ -1095,7 +1095,7 @@ H5AC_mark_entry_serialized(void *thing)
done:
/* If currently logging, generate a message */
if(cache_ptr->log_info->logging)
- if(H5C_write_mark_serialized_entry_log_msg(cache_ptr, entry_ptr, ret_value) < 0)
+ if(H5C_log_write_mark_serialized_entry_msg(cache_ptr, entry_ptr, ret_value) < 0)
HDONE_ERROR(H5E_CACHE, H5E_LOGGING, FAIL, "unable to emit log message")
FUNC_LEAVE_NOAPI(ret_value)
@@ -1154,7 +1154,7 @@ H5AC_move_entry(H5F_t *f, const H5AC_class_t *type, haddr_t old_addr, haddr_t ne
done:
/* If currently logging, generate a message */
if(f->shared->cache->log_info->logging)
- if(H5C_write_move_entry_log_msg(f->shared->cache, old_addr, new_addr, type->id, ret_value) < 0)
+ if(H5C_log_write_move_entry_msg(f->shared->cache, old_addr, new_addr, type->id, ret_value) < 0)
HDONE_ERROR(H5E_CACHE, H5E_LOGGING, FAIL, "unable to emit log message")
FUNC_LEAVE_NOAPI(ret_value)
@@ -1197,7 +1197,7 @@ H5AC_pin_protected_entry(void *thing)
done:
/* If currently logging, generate a message */
if(cache_ptr->log_info->logging)
- if(H5C_write_pin_entry_log_msg(cache_ptr, entry_ptr, ret_value) < 0)
+ if(H5C_log_write_pin_entry_msg(cache_ptr, entry_ptr, ret_value) < 0)
HDONE_ERROR(H5E_CACHE, H5E_LOGGING, FAIL, "unable to emit log message")
FUNC_LEAVE_NOAPI(ret_value)
@@ -1279,7 +1279,7 @@ H5AC_create_flush_dependency(void * parent_thing, void * child_thing)
done:
/* If currently logging, generate a message */
if(cache_ptr->log_info->logging)
- if(H5C_write_create_fd_log_msg(cache_ptr, (H5AC_info_t *)parent_thing, (H5AC_info_t *)child_thing, ret_value) < 0)
+ if(H5C_log_write_create_fd_msg(cache_ptr, (H5AC_info_t *)parent_thing, (H5AC_info_t *)child_thing, ret_value) < 0)
HDONE_ERROR(H5E_CACHE, H5E_LOGGING, FAIL, "unable to emit log message")
FUNC_LEAVE_NOAPI(ret_value)
@@ -1360,7 +1360,7 @@ done:
herr_t fake_ret_value = (NULL == ret_value) ? FAIL : SUCCEED;
if(f->shared->cache->log_info->logging)
- if(H5C_write_protect_entry_log_msg(f->shared->cache, (H5AC_info_t *)thing, type->id, flags, fake_ret_value) < 0)
+ if(H5C_log_write_protect_entry_msg(f->shared->cache, (H5AC_info_t *)thing, type->id, flags, fake_ret_value) < 0)
HDONE_ERROR(H5E_CACHE, H5E_LOGGING, NULL, "unable to emit log message")
}
@@ -1414,7 +1414,7 @@ H5AC_resize_entry(void *thing, size_t new_size)
done:
/* If currently logging, generate a message */
if(cache_ptr->log_info->logging)
- if(H5C_write_resize_entry_log_msg(cache_ptr, entry_ptr, new_size, ret_value) < 0)
+ if(H5C_log_write_resize_entry_msg(cache_ptr, entry_ptr, new_size, ret_value) < 0)
HDONE_ERROR(H5E_CACHE, H5E_LOGGING, FAIL, "unable to emit log message")
FUNC_LEAVE_NOAPI(ret_value)
@@ -1457,7 +1457,7 @@ H5AC_unpin_entry(void *thing)
done:
/* If currently logging, generate a message */
if(cache_ptr->log_info->logging)
- if(H5C_write_unpin_entry_log_msg(cache_ptr, entry_ptr, ret_value) < 0)
+ if(H5C_log_write_unpin_entry_msg(cache_ptr, entry_ptr, ret_value) < 0)
HDONE_ERROR(H5E_CACHE, H5E_LOGGING, FAIL, "unable to emit log message")
FUNC_LEAVE_NOAPI(ret_value)
@@ -1500,7 +1500,7 @@ H5AC_destroy_flush_dependency(void * parent_thing, void * child_thing)
done:
/* If currently logging, generate a message */
if(cache_ptr->log_info->logging)
- if(H5C_write_destroy_fd_log_msg(cache_ptr, (H5AC_info_t *)parent_thing, (H5AC_info_t *)child_thing, ret_value) < 0)
+ if(H5C_log_write_destroy_fd_msg(cache_ptr, (H5AC_info_t *)parent_thing, (H5AC_info_t *)child_thing, ret_value) < 0)
HDONE_ERROR(H5E_CACHE, H5E_LOGGING, FAIL, "unable to emit log message")
FUNC_LEAVE_NOAPI(ret_value)
@@ -1612,7 +1612,7 @@ H5AC_unprotect(H5F_t *f, const H5AC_class_t *type, haddr_t addr, void *thing,
done:
/* If currently logging, generate a message */
if(f->shared->cache->log_info->logging)
- if(H5C_write_unprotect_entry_log_msg(f->shared->cache, (H5AC_info_t *)thing, type->id, flags, ret_value) < 0)
+ if(H5C_log_write_unprotect_entry_msg(f->shared->cache, (H5AC_info_t *)thing, type->id, flags, ret_value) < 0)
HDONE_ERROR(H5E_CACHE, H5E_LOGGING, FAIL, "unable to emit log message")
FUNC_LEAVE_NOAPI(ret_value)
@@ -1843,7 +1843,7 @@ H5AC_set_cache_auto_resize_config(H5AC_t *cache_ptr, H5AC_cache_config_t *config
*/
/* close */
if(config_ptr->close_trace_file)
- if(H5C_tear_down_logging((H5C_t *)cache_ptr) < 0)
+ if(H5C_log_tear_down((H5C_t *)cache_ptr) < 0)
HGOTO_ERROR(H5E_CACHE, H5E_LOGGING, FAIL, "mdc logging tear-down failed")
/* open */
@@ -1852,7 +1852,7 @@ H5AC_set_cache_auto_resize_config(H5AC_t *cache_ptr, H5AC_cache_config_t *config
* This will be trace output until we create a special API call. JSON
* output is generated when logging is controlled by the H5P calls.
*/
- if(H5C_set_up_logging((H5C_t *)cache_ptr, config_ptr->trace_file_name, H5C_LOG_STYLE_TRACE, TRUE) < 0)
+ if(H5C_log_set_up((H5C_t *)cache_ptr, config_ptr->trace_file_name, H5C_LOG_STYLE_TRACE, TRUE) < 0)
HGOTO_ERROR(H5E_CACHE, H5E_LOGGING, FAIL, "mdc logging setup failed")
}
@@ -1882,7 +1882,7 @@ H5AC_set_cache_auto_resize_config(H5AC_t *cache_ptr, H5AC_cache_config_t *config
done:
/* If currently logging, generate a message */
if(cache_ptr->log_info->logging)
- if(H5C_write_set_cache_config_log_msg(cache_ptr, config_ptr, ret_value) < 0)
+ if(H5C_log_write_set_cache_config_msg(cache_ptr, config_ptr, ret_value) < 0)
HDONE_ERROR(H5E_CACHE, H5E_LOGGING, FAIL, "unable to emit log message")
FUNC_LEAVE_NOAPI(ret_value)
@@ -2641,7 +2641,7 @@ H5AC_remove_entry(void *_entry)
done:
/* If currently logging, generate a message */
if(cache->log_info->logging)
- if(H5C_write_remove_entry_log_msg(cache, entry, ret_value) < 0)
+ if(H5C_log_write_remove_entry_msg(cache, entry, ret_value) < 0)
HDONE_ERROR(H5E_CACHE, H5E_LOGGING, FAIL, "unable to emit log message")
FUNC_LEAVE_NOAPI(ret_value)
diff --git a/src/H5Clog.c b/src/H5Clog.c
index c36c630..0ae7f13 100644
--- a/src/H5Clog.c
+++ b/src/H5Clog.c
@@ -73,7 +73,7 @@
/*-------------------------------------------------------------------------
- * Function: H5C_set_up_logging
+ * Function: H5C_log_set_up
*
* Purpose: Setup for metadata cache logging.
*
@@ -85,7 +85,7 @@
*-------------------------------------------------------------------------
*/
herr_t
-H5C_set_up_logging(H5C_t *cache, const char log_location[], H5C_log_style_t style, hbool_t start_immediately)
+H5C_log_set_up(H5C_t *cache, const char log_location[], H5C_log_style_t style, hbool_t start_immediately)
{
int mpi_rank = -1; /* -1 indicates serial (no MPI rank) */
herr_t ret_value = SUCCEED; /* Return value */
@@ -110,11 +110,11 @@ H5C_set_up_logging(H5C_t *cache, const char log_location[], H5C_log_style_t styl
/* Set up logging */
if(H5C_LOG_STYLE_JSON == style) {
- if(H5C_json_set_up_logging(cache->log_info, log_location, mpi_rank) < 0)
+ if(H5C_log_json_set_up(cache->log_info, log_location, mpi_rank) < 0)
HGOTO_ERROR(H5E_CACHE, H5E_LOGGING, FAIL, "unable to set up json logging")
}
else if(H5C_LOG_STYLE_TRACE == style) {
- if(H5C_trace_set_up_logging(cache->log_info, log_location, mpi_rank) < 0)
+ if(H5C_log_trace_set_up(cache->log_info, log_location, mpi_rank) < 0)
HGOTO_ERROR(H5E_CACHE, H5E_LOGGING, FAIL, "unable to set up trace logging")
}
else
@@ -131,11 +131,11 @@ H5C_set_up_logging(H5C_t *cache, const char log_location[], H5C_log_style_t styl
done:
FUNC_LEAVE_NOAPI(ret_value)
-} /* H5C_set_up_logging() */
+} /* H5C_log_set_up() */
/*-------------------------------------------------------------------------
- * Function: H5C_tear_down_logging
+ * Function: H5C_log_tear_down
*
* Purpose: Tear-down for metadata cache logging.
*
@@ -147,7 +147,7 @@ H5C_set_up_logging(H5C_t *cache, const char log_location[], H5C_log_style_t styl
*-------------------------------------------------------------------------
*/
herr_t
-H5C_tear_down_logging(H5C_t *cache)
+H5C_log_tear_down(H5C_t *cache)
{
herr_t ret_value = SUCCEED; /* Return value */
@@ -175,7 +175,7 @@ H5C_tear_down_logging(H5C_t *cache)
done:
FUNC_LEAVE_NOAPI(ret_value)
-} /* H5C_tear_down_logging() */
+} /* H5C_log_tear_down() */
/*-------------------------------------------------------------------------
@@ -301,7 +301,7 @@ H5C_get_logging_status(const H5C_t *cache, /*OUT*/ hbool_t *is_enabled,
/*-------------------------------------------------------------------------
- * Function: H5C_write_create_cache_log_msg
+ * Function: H5C_log_write_create_cache_msg
*
* Purpose: Write a log message for cache creation.
*
@@ -313,7 +313,7 @@ H5C_get_logging_status(const H5C_t *cache, /*OUT*/ hbool_t *is_enabled,
*-------------------------------------------------------------------------
*/
herr_t
-H5C_write_create_cache_log_msg(H5C_t *cache, herr_t fxn_ret_value)
+H5C_log_write_create_cache_msg(H5C_t *cache, herr_t fxn_ret_value)
{
herr_t ret_value = SUCCEED; /* Return value */
@@ -329,10 +329,10 @@ H5C_write_create_cache_log_msg(H5C_t *cache, herr_t fxn_ret_value)
done:
FUNC_LEAVE_NOAPI(ret_value)
-} /* H5C_write_create_cache_log_msg() */
+} /* H5C_log_write_create_cache_msg() */
/*-------------------------------------------------------------------------
- * Function: H5C_write_destroy_cache_log_msg
+ * Function: H5C_log_write_destroy_cache_msg
*
* Purpose: Write a log message for cache destruction.
*
@@ -348,7 +348,7 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5C_write_destroy_cache_log_msg(H5C_t *cache)
+H5C_log_write_destroy_cache_msg(H5C_t *cache)
{
herr_t ret_value = SUCCEED; /* Return value */
@@ -364,11 +364,11 @@ H5C_write_destroy_cache_log_msg(H5C_t *cache)
done:
FUNC_LEAVE_NOAPI(ret_value)
-} /* H5C_write_destroy_cache_log_msg() */
+} /* H5C_log_write_destroy_cache_msg() */
/*-------------------------------------------------------------------------
- * Function: H5C_write_evict_cache_log_msg
+ * Function: H5C_log_write_evict_cache_msg
*
* Purpose: Write a log message for eviction of cache entries.
*
@@ -380,7 +380,7 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5C_write_evict_cache_log_msg(H5C_t *cache, herr_t fxn_ret_value)
+H5C_log_write_evict_cache_msg(H5C_t *cache, herr_t fxn_ret_value)
{
herr_t ret_value = SUCCEED;
@@ -396,11 +396,11 @@ H5C_write_evict_cache_log_msg(H5C_t *cache, herr_t fxn_ret_value)
done:
FUNC_LEAVE_NOAPI(ret_value)
-} /* H5C_write_evict_cache_log_msg() */
+} /* H5C_log_write_evict_cache_msg() */
/*-------------------------------------------------------------------------
- * Function: H5C_write_expunge_entry_log_msg
+ * Function: H5C_log_write_expunge_entry_msg
*
* Purpose: Write a log message for expunge of cache entries.
*
@@ -412,7 +412,7 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5C_write_expunge_entry_log_msg(H5C_t *cache, haddr_t address,
+H5C_log_write_expunge_entry_msg(H5C_t *cache, haddr_t address,
int type_id, herr_t fxn_ret_value)
{
herr_t ret_value = SUCCEED;
@@ -429,11 +429,11 @@ H5C_write_expunge_entry_log_msg(H5C_t *cache, haddr_t address,
done:
FUNC_LEAVE_NOAPI(ret_value)
-} /* H5C_write_expunge_entry_log_msg() */
+} /* H5C_log_write_expunge_entry_msg() */
/*-------------------------------------------------------------------------
- * Function: H5C_write_flush_cache_log_msg
+ * Function: H5C_log_write_flush_cache_msg
*
* Purpose: Write a log message for cache flushes.
*
@@ -445,7 +445,7 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5C_write_flush_cache_log_msg(H5C_t *cache, herr_t fxn_ret_value)
+H5C_log_write_flush_cache_msg(H5C_t *cache, herr_t fxn_ret_value)
{
herr_t ret_value = SUCCEED;
@@ -461,11 +461,11 @@ H5C_write_flush_cache_log_msg(H5C_t *cache, herr_t fxn_ret_value)
done:
FUNC_LEAVE_NOAPI(ret_value)
-} /* H5C_write_flush_cache_log_msg() */
+} /* H5C_log_write_flush_cache_msg() */
/*-------------------------------------------------------------------------
- * Function: H5C_write_insert_entry_log_msg
+ * Function: H5C_log_write_insert_entry_msg
*
* Purpose: Write a log message for insertion of cache entries.
*
@@ -477,7 +477,7 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5C_write_insert_entry_log_msg(H5C_t *cache, haddr_t address,
+H5C_log_write_insert_entry_msg(H5C_t *cache, haddr_t address,
int type_id, unsigned flags, size_t size, herr_t fxn_ret_value)
{
herr_t ret_value = SUCCEED;
@@ -494,11 +494,11 @@ H5C_write_insert_entry_log_msg(H5C_t *cache, haddr_t address,
done:
FUNC_LEAVE_NOAPI(ret_value)
-} /* H5C_write_insert_entry_log_msg() */
+} /* H5C_log_write_insert_entry_msg() */
/*-------------------------------------------------------------------------
- * Function: H5C_write_mark_entry_dirty_log_msg
+ * Function: H5C_log_write_mark_entry_dirty_msg
*
* Purpose: Write a log message for marking cache entries as dirty.
*
@@ -510,7 +510,7 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5C_write_mark_entry_dirty_log_msg(H5C_t *cache, const H5C_cache_entry_t *entry,
+H5C_log_write_mark_entry_dirty_msg(H5C_t *cache, const H5C_cache_entry_t *entry,
herr_t fxn_ret_value)
{
herr_t ret_value = SUCCEED;
@@ -528,11 +528,11 @@ H5C_write_mark_entry_dirty_log_msg(H5C_t *cache, const H5C_cache_entry_t *entry,
done:
FUNC_LEAVE_NOAPI(ret_value)
-} /* H5C_write_mark_entry_dirty_log_msg() */
+} /* H5C_log_write_mark_entry_dirty_msg() */
/*-------------------------------------------------------------------------
- * Function: H5C_write_mark_entry_clean_log_msg
+ * Function: H5C_log_write_mark_entry_clean_msg
*
* Purpose: Write a log message for marking cache entries as clean.
*
@@ -544,7 +544,7 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5C_write_mark_entry_clean_log_msg(H5C_t *cache, const H5C_cache_entry_t *entry,
+H5C_log_write_mark_entry_clean_msg(H5C_t *cache, const H5C_cache_entry_t *entry,
herr_t fxn_ret_value)
{
herr_t ret_value = SUCCEED; /* Return value */
@@ -562,11 +562,11 @@ H5C_write_mark_entry_clean_log_msg(H5C_t *cache, const H5C_cache_entry_t *entry,
done:
FUNC_LEAVE_NOAPI(ret_value)
-} /* H5C_write_mark_entry_clean_log_msg() */
+} /* H5C_log_write_mark_entry_clean_msg() */
/*-------------------------------------------------------------------------
- * Function: H5C_write_mark_unserialized_entry_log_msg
+ * Function: H5C_log_write_mark_unserialized_entry_msg
*
* Purpose: Write a log message for marking cache entries as unserialized.
*
@@ -578,7 +578,7 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5C_write_mark_unserialized_entry_log_msg(H5C_t *cache,
+H5C_log_write_mark_unserialized_entry_msg(H5C_t *cache,
const H5C_cache_entry_t *entry, herr_t fxn_ret_value)
{
herr_t ret_value = SUCCEED;
@@ -596,11 +596,11 @@ H5C_write_mark_unserialized_entry_log_msg(H5C_t *cache,
done:
FUNC_LEAVE_NOAPI(ret_value)
-} /* H5C_write_mark_unserialized_entry_log_msg() */
+} /* H5C_log_write_mark_unserialized_entry_msg() */
/*-------------------------------------------------------------------------
- * Function: H5C_write_mark_serialized_entry_log_msg
+ * Function: H5C_log_write_mark_serialized_entry_msg
*
* Purpose: Write a log message for marking cache entries as serialize.
*
@@ -612,7 +612,7 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5C_write_mark_serialized_entry_log_msg(H5C_t *cache, const H5C_cache_entry_t *entry,
+H5C_log_write_mark_serialized_entry_msg(H5C_t *cache, const H5C_cache_entry_t *entry,
herr_t fxn_ret_value)
{
herr_t ret_value = SUCCEED; /* Return value */
@@ -630,11 +630,11 @@ H5C_write_mark_serialized_entry_log_msg(H5C_t *cache, const H5C_cache_entry_t *e
done:
FUNC_LEAVE_NOAPI(ret_value)
-} /* H5C_write_mark_serialized_entry_log_msg() */
+} /* H5C_log_write_mark_serialized_entry_msg() */
/*-------------------------------------------------------------------------
- * Function: H5C_write_move_entry_log_msg
+ * Function: H5C_log_write_move_entry_msg
*
* Purpose: Write a log message for moving a cache entry.
*
@@ -646,7 +646,7 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5C_write_move_entry_log_msg(H5C_t *cache, haddr_t old_addr, haddr_t new_addr,
+H5C_log_write_move_entry_msg(H5C_t *cache, haddr_t old_addr, haddr_t new_addr,
int type_id, herr_t fxn_ret_value)
{
herr_t ret_value = SUCCEED;
@@ -663,11 +663,11 @@ H5C_write_move_entry_log_msg(H5C_t *cache, haddr_t old_addr, haddr_t new_addr,
done:
FUNC_LEAVE_NOAPI(ret_value)
-} /* H5C_write_move_entry_log_msg() */
+} /* H5C_log_write_move_entry_msg() */
/*-------------------------------------------------------------------------
- * Function: H5C_write_pin_entry_log_msg
+ * Function: H5C_log_write_pin_entry_msg
*
* Purpose: Write a log message for pinning a cache entry.
*
@@ -679,7 +679,7 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5C_write_pin_entry_log_msg(H5C_t *cache, const H5C_cache_entry_t *entry,
+H5C_log_write_pin_entry_msg(H5C_t *cache, const H5C_cache_entry_t *entry,
herr_t fxn_ret_value)
{
herr_t ret_value = SUCCEED;
@@ -697,11 +697,11 @@ H5C_write_pin_entry_log_msg(H5C_t *cache, const H5C_cache_entry_t *entry,
done:
FUNC_LEAVE_NOAPI(ret_value)
-} /* H5C_write_pin_entry_log_msg() */
+} /* H5C_log_write_pin_entry_msg() */
/*-------------------------------------------------------------------------
- * Function: H5C_write_create_fd_log_msg
+ * Function: H5C_log_write_create_fd_msg
*
* Purpose: Write a log message for creating a flush dependency between
* two cache entries.
@@ -714,7 +714,7 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5C_write_create_fd_log_msg(H5C_t *cache, const H5C_cache_entry_t *parent,
+H5C_log_write_create_fd_msg(H5C_t *cache, const H5C_cache_entry_t *parent,
const H5C_cache_entry_t *child, herr_t fxn_ret_value)
{
herr_t ret_value = SUCCEED;
@@ -733,11 +733,11 @@ H5C_write_create_fd_log_msg(H5C_t *cache, const H5C_cache_entry_t *parent,
done:
FUNC_LEAVE_NOAPI(ret_value)
-} /* H5C_write_create_fd_log_msg() */
+} /* H5C_log_write_create_fd_msg() */
/*-------------------------------------------------------------------------
- * Function: H5C_write_protect_entry_log_msg
+ * Function: H5C_log_write_protect_entry_msg
*
* Purpose: Write a log message for protecting a cache entry.
*
@@ -749,7 +749,7 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5C_write_protect_entry_log_msg(H5C_t *cache, const H5C_cache_entry_t *entry,
+H5C_log_write_protect_entry_msg(H5C_t *cache, const H5C_cache_entry_t *entry,
int type_id, unsigned flags, herr_t fxn_ret_value)
{
herr_t ret_value = SUCCEED;
@@ -767,11 +767,11 @@ H5C_write_protect_entry_log_msg(H5C_t *cache, const H5C_cache_entry_t *entry,
done:
FUNC_LEAVE_NOAPI(ret_value)
-} /* H5C_write_protect_entry_log_msg() */
+} /* H5C_log_write_protect_entry_msg() */
/*-------------------------------------------------------------------------
- * Function: H5C_write_resize_entry_log_msg
+ * Function: H5C_log_write_resize_entry_msg
*
* Purpose: Write a log message for resizing a cache entry.
*
@@ -783,7 +783,7 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5C_write_resize_entry_log_msg(H5C_t *cache, const H5C_cache_entry_t *entry,
+H5C_log_write_resize_entry_msg(H5C_t *cache, const H5C_cache_entry_t *entry,
size_t new_size, herr_t fxn_ret_value)
{
herr_t ret_value = SUCCEED;
@@ -801,11 +801,11 @@ H5C_write_resize_entry_log_msg(H5C_t *cache, const H5C_cache_entry_t *entry,
done:
FUNC_LEAVE_NOAPI(ret_value)
-} /* H5C_write_resize_entry_log_msg() */
+} /* H5C_log_write_resize_entry_msg() */
/*-------------------------------------------------------------------------
- * Function: H5C_write_unpin_entry_log_msg
+ * Function: H5C_log_write_unpin_entry_msg
*
* Purpose: Write a log message for unpinning a cache entry.
*
@@ -817,7 +817,7 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5C_write_unpin_entry_log_msg(H5C_t *cache, const H5C_cache_entry_t *entry,
+H5C_log_write_unpin_entry_msg(H5C_t *cache, const H5C_cache_entry_t *entry,
herr_t fxn_ret_value)
{
herr_t ret_value = SUCCEED;
@@ -835,11 +835,11 @@ H5C_write_unpin_entry_log_msg(H5C_t *cache, const H5C_cache_entry_t *entry,
done:
FUNC_LEAVE_NOAPI(ret_value)
-} /* H5C_write_unpin_entry_log_msg() */
+} /* H5C_log_write_unpin_entry_msg() */
/*-------------------------------------------------------------------------
- * Function: H5C_write_destroy_fd_log_msg
+ * Function: H5C_log_write_destroy_fd_msg
*
* Purpose: Write a log message for destroying a flush dependency
* between two cache entries.
@@ -852,7 +852,7 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5C_write_destroy_fd_log_msg(H5C_t *cache, const H5C_cache_entry_t *parent,
+H5C_log_write_destroy_fd_msg(H5C_t *cache, const H5C_cache_entry_t *parent,
const H5C_cache_entry_t *child, herr_t fxn_ret_value)
{
herr_t ret_value = SUCCEED;
@@ -871,11 +871,11 @@ H5C_write_destroy_fd_log_msg(H5C_t *cache, const H5C_cache_entry_t *parent,
done:
FUNC_LEAVE_NOAPI(ret_value)
-} /* H5C_write_destroy_fd_log_msg() */
+} /* H5C_log_write_destroy_fd_msg() */
/*-------------------------------------------------------------------------
- * Function: H5C_write_unprotect_entry_log_msg
+ * Function: H5C_log_write_unprotect_entry_msg
*
* Purpose: Write a log message for unprotecting a cache entry.
*
@@ -887,7 +887,7 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5C_write_unprotect_entry_log_msg(H5C_t *cache, const H5C_cache_entry_t *entry,
+H5C_log_write_unprotect_entry_msg(H5C_t *cache, const H5C_cache_entry_t *entry,
int type_id, unsigned flags, herr_t fxn_ret_value)
{
herr_t ret_value = SUCCEED;
@@ -905,11 +905,11 @@ H5C_write_unprotect_entry_log_msg(H5C_t *cache, const H5C_cache_entry_t *entry,
done:
FUNC_LEAVE_NOAPI(ret_value)
-} /* H5C_write_unprotect_entry_log_msg() */
+} /* H5C_log_write_unprotect_entry_msg() */
/*-------------------------------------------------------------------------
- * Function: H5C_write_set_cache_config_log_msg
+ * Function: H5C_log_write_set_cache_config_msg
*
* Purpose: Write a log message for setting the cache configuration.
*
@@ -921,7 +921,7 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5C_write_set_cache_config_log_msg(H5C_t *cache, const H5AC_cache_config_t *config,
+H5C_log_write_set_cache_config_msg(H5C_t *cache, const H5AC_cache_config_t *config,
herr_t fxn_ret_value)
{
herr_t ret_value = SUCCEED;
@@ -939,11 +939,11 @@ H5C_write_set_cache_config_log_msg(H5C_t *cache, const H5AC_cache_config_t *conf
done:
FUNC_LEAVE_NOAPI(ret_value)
-} /* H5C_write_set_cache_config_log_msg() */
+} /* H5C_log_write_set_cache_config_msg() */
/*-------------------------------------------------------------------------
- * Function: H5C_write_remove_entry_log_msg
+ * Function: H5C_log_write_remove_entry_msg
*
* Purpose: Write a log message for removing a cache entry.
*
@@ -955,7 +955,7 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5C_write_remove_entry_log_msg(H5C_t *cache, const H5C_cache_entry_t *entry,
+H5C_log_write_remove_entry_msg(H5C_t *cache, const H5C_cache_entry_t *entry,
herr_t fxn_ret_value)
{
herr_t ret_value = SUCCEED;
@@ -973,5 +973,5 @@ H5C_write_remove_entry_log_msg(H5C_t *cache, const H5C_cache_entry_t *entry,
done:
FUNC_LEAVE_NOAPI(ret_value)
-} /* H5C_write_remove_entry_log_msg() */
+} /* H5C_log_write_remove_entry_msg() */
diff --git a/src/H5Clog.h b/src/H5Clog.h
index e866afa..9ba6786 100644
--- a/src/H5Clog.h
+++ b/src/H5Clog.h
@@ -82,32 +82,33 @@ struct H5C_log_info_t {
/******************************/
/* Package Private Prototypes */
/******************************/
-H5_DLL herr_t H5C_set_up_logging(H5C_t *cache, const char log_location[], H5C_log_style_t style, hbool_t start_immediately);
-H5_DLL herr_t H5C_tear_down_logging(H5C_t *cache);
-H5_DLL herr_t H5C_write_create_cache_log_msg(H5C_t *cache, herr_t fxn_ret_value);
-H5_DLL herr_t H5C_write_destroy_cache_log_msg(H5C_t *cache);
-H5_DLL herr_t H5C_write_evict_cache_log_msg(H5C_t *cache, herr_t fxn_ret_value);
-H5_DLL herr_t H5C_write_expunge_entry_log_msg(H5C_t *cache, haddr_t address, int type_id, herr_t fxn_ret_value);
-H5_DLL herr_t H5C_write_flush_cache_log_msg(H5C_t *cache, herr_t fxn_ret_value);
-H5_DLL herr_t H5C_write_insert_entry_log_msg(H5C_t *cache, haddr_t address, int type_id, unsigned flags, size_t size, herr_t fxn_ret_value);
-H5_DLL herr_t H5C_write_mark_entry_dirty_log_msg(H5C_t *cache, const H5C_cache_entry_t *entry, herr_t fxn_ret_value);
-H5_DLL herr_t H5C_write_mark_entry_clean_log_msg(H5C_t *cache, const H5C_cache_entry_t *entry, herr_t fxn_ret_value);
-H5_DLL herr_t H5C_write_mark_unserialized_entry_log_msg(H5C_t *cache, const H5C_cache_entry_t *entry, herr_t fxn_ret_value);
-H5_DLL herr_t H5C_write_mark_serialized_entry_log_msg(H5C_t *cache, const H5C_cache_entry_t *entry, herr_t fxn_ret_value);
-H5_DLL herr_t H5C_write_move_entry_log_msg(H5C_t *cache, haddr_t old_addr, haddr_t new_addr, int type_id, herr_t fxn_ret_value);
-H5_DLL herr_t H5C_write_pin_entry_log_msg(H5C_t *cache, const H5C_cache_entry_t *entry, herr_t fxn_ret_value);
-H5_DLL herr_t H5C_write_create_fd_log_msg(H5C_t *cache, const H5C_cache_entry_t *parent, const H5C_cache_entry_t *child, herr_t fxn_ret_value);
-H5_DLL herr_t H5C_write_protect_entry_log_msg(H5C_t *cache, const H5C_cache_entry_t *entry, int type_id, unsigned flags, herr_t fxn_ret_value);
-H5_DLL herr_t H5C_write_resize_entry_log_msg(H5C_t *cache, const H5C_cache_entry_t *entry, size_t new_size, herr_t fxn_ret_value);
-H5_DLL herr_t H5C_write_unpin_entry_log_msg(H5C_t *cache, const H5C_cache_entry_t *entry, herr_t fxn_ret_value);
-H5_DLL herr_t H5C_write_destroy_fd_log_msg(H5C_t *cache, const H5C_cache_entry_t *parent, const H5C_cache_entry_t *child, herr_t fxn_ret_value);
-H5_DLL herr_t H5C_write_unprotect_entry_log_msg(H5C_t *cache, const H5C_cache_entry_t *entry, int type_id, unsigned flags, herr_t fxn_ret_value);
-H5_DLL herr_t H5C_write_set_cache_config_log_msg(H5C_t *cache, const H5AC_cache_config_t *config, herr_t fxn_ret_value);
-H5_DLL herr_t H5C_write_remove_entry_log_msg(H5C_t *cache, const H5C_cache_entry_t *entry, herr_t fxn_ret_value);
+H5_DLL herr_t H5C_log_set_up(H5C_t *cache, const char log_location[], H5C_log_style_t style, hbool_t start_immediately);
+H5_DLL herr_t H5C_log_tear_down(H5C_t *cache);
+
+H5_DLL herr_t H5C_log_write_create_cache_msg(H5C_t *cache, herr_t fxn_ret_value);
+H5_DLL herr_t H5C_log_write_destroy_cache_msg(H5C_t *cache);
+H5_DLL herr_t H5C_log_write_evict_cache_msg(H5C_t *cache, herr_t fxn_ret_value);
+H5_DLL herr_t H5C_log_write_expunge_entry_msg(H5C_t *cache, haddr_t address, int type_id, herr_t fxn_ret_value);
+H5_DLL herr_t H5C_log_write_flush_cache_msg(H5C_t *cache, herr_t fxn_ret_value);
+H5_DLL herr_t H5C_log_write_insert_entry_msg(H5C_t *cache, haddr_t address, int type_id, unsigned flags, size_t size, herr_t fxn_ret_value);
+H5_DLL herr_t H5C_log_write_mark_entry_dirty_msg(H5C_t *cache, const H5C_cache_entry_t *entry, herr_t fxn_ret_value);
+H5_DLL herr_t H5C_log_write_mark_entry_clean_msg(H5C_t *cache, const H5C_cache_entry_t *entry, herr_t fxn_ret_value);
+H5_DLL herr_t H5C_log_write_mark_unserialized_entry_msg(H5C_t *cache, const H5C_cache_entry_t *entry, herr_t fxn_ret_value);
+H5_DLL herr_t H5C_log_write_mark_serialized_entry_msg(H5C_t *cache, const H5C_cache_entry_t *entry, herr_t fxn_ret_value);
+H5_DLL herr_t H5C_log_write_move_entry_msg(H5C_t *cache, haddr_t old_addr, haddr_t new_addr, int type_id, herr_t fxn_ret_value);
+H5_DLL herr_t H5C_log_write_pin_entry_msg(H5C_t *cache, const H5C_cache_entry_t *entry, herr_t fxn_ret_value);
+H5_DLL herr_t H5C_log_write_create_fd_msg(H5C_t *cache, const H5C_cache_entry_t *parent, const H5C_cache_entry_t *child, herr_t fxn_ret_value);
+H5_DLL herr_t H5C_log_write_protect_entry_msg(H5C_t *cache, const H5C_cache_entry_t *entry, int type_id, unsigned flags, herr_t fxn_ret_value);
+H5_DLL herr_t H5C_log_write_resize_entry_msg(H5C_t *cache, const H5C_cache_entry_t *entry, size_t new_size, herr_t fxn_ret_value);
+H5_DLL herr_t H5C_log_write_unpin_entry_msg(H5C_t *cache, const H5C_cache_entry_t *entry, herr_t fxn_ret_value);
+H5_DLL herr_t H5C_log_write_destroy_fd_msg(H5C_t *cache, const H5C_cache_entry_t *parent, const H5C_cache_entry_t *child, herr_t fxn_ret_value);
+H5_DLL herr_t H5C_log_write_unprotect_entry_msg(H5C_t *cache, const H5C_cache_entry_t *entry, int type_id, unsigned flags, herr_t fxn_ret_value);
+H5_DLL herr_t H5C_log_write_set_cache_config_msg(H5C_t *cache, const H5AC_cache_config_t *config, herr_t fxn_ret_value);
+H5_DLL herr_t H5C_log_write_remove_entry_msg(H5C_t *cache, const H5C_cache_entry_t *entry, herr_t fxn_ret_value);
/* Logging-specific setup functions */
-H5_DLL herr_t H5C_json_set_up_logging(H5C_log_info_t *log_info, const char log_location[], int mpi_rank);
-H5_DLL herr_t H5C_trace_set_up_logging(H5C_log_info_t *log_info, const char log_location[], int mpi_rank);
+H5_DLL herr_t H5C_log_json_set_up(H5C_log_info_t *log_info, const char log_location[], int mpi_rank);
+H5_DLL herr_t H5C_log_trace_set_up(H5C_log_info_t *log_info, const char log_location[], int mpi_rank);
#endif /* _H5Clog_H */
diff --git a/src/H5Clog_json.c b/src/H5Clog_json.c
index c1ede75..ccfa222 100644
--- a/src/H5Clog_json.c
+++ b/src/H5Clog_json.c
@@ -178,7 +178,7 @@ done:
/*-------------------------------------------------------------------------
- * Function: H5C_json_set_up_logging
+ * Function: H5C_log_json_set_up
*
* Purpose: Setup for metadata cache logging.
*
@@ -202,7 +202,7 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5C_json_set_up_logging(H5C_log_info_t *log_info, const char log_location[], int mpi_rank)
+H5C_log_json_set_up(H5C_log_info_t *log_info, const char log_location[], int mpi_rank)
{
H5C_log_json_udata_t *json_udata = NULL;
char *file_name = NULL;
@@ -267,7 +267,7 @@ H5C_json_set_up_logging(H5C_log_info_t *log_info, const char log_location[], int
}
FUNC_LEAVE_NOAPI(ret_value)
-} /* H5C_json_set_up_logging() */
+} /* H5C_log_json_set_up() */
/*-------------------------------------------------------------------------
diff --git a/src/H5Clog_trace.c b/src/H5Clog_trace.c
index 2db931c..f7d6889 100644
--- a/src/H5Clog_trace.c
+++ b/src/H5Clog_trace.c
@@ -173,7 +173,7 @@ done:
/*-------------------------------------------------------------------------
- * Function: H5C_trace_set_up_logging
+ * Function: H5C_log_trace_set_up
*
* Purpose: Setup for metadata cache logging.
*
@@ -197,7 +197,7 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5C_trace_set_up_logging(H5C_log_info_t *log_info, const char log_location[], int mpi_rank)
+H5C_log_trace_set_up(H5C_log_info_t *log_info, const char log_location[], int mpi_rank)
{
H5C_log_trace_udata_t *trace_udata = NULL;
char *file_name = NULL;
@@ -265,7 +265,7 @@ H5C_trace_set_up_logging(H5C_log_info_t *log_info, const char log_location[], in
}
FUNC_LEAVE_NOAPI(ret_value)
-} /* H5C_trace_set_up_logging() */
+} /* H5C_log_trace_set_up() */
/*-------------------------------------------------------------------------