diff options
| author | liuwentan <[email protected]> | 2023-04-25 17:02:30 +0800 |
|---|---|---|
| committer | liuwentan <[email protected]> | 2023-04-25 17:02:30 +0800 |
| commit | c88fd120dc5853ff74ae7ccf3cb80c0a17150452 (patch) | |
| tree | ad0cb50b8b54dcfdafdeed1810391cbe961cf44b | |
| parent | e97dfe0b90a1b33b1661fdc0dc46dea05ed53cc4 (diff) | |
add maat_stat instance_namev4.0.14
| -rw-r--r-- | src/inc_internal/maat_stat.h | 2 | ||||
| -rw-r--r-- | src/maat_api.c | 3 | ||||
| -rw-r--r-- | src/maat_stat.c | 10 |
3 files changed, 7 insertions, 8 deletions
diff --git a/src/inc_internal/maat_stat.h b/src/inc_internal/maat_stat.h index 4a48fd2..76999e4 100644 --- a/src/inc_internal/maat_stat.h +++ b/src/inc_internal/maat_stat.h @@ -24,7 +24,7 @@ struct maat_stat *maat_stat_new(const char *stat_file, size_t max_thread_num, void maat_stat_free(struct maat_stat *stat); int maat_stat_init(struct maat_stat *stat, struct table_manager *tbl_mgr, - struct maat_garbage_bin *garbage_bin, const char *stat_inst_name); + struct maat_garbage_bin *garbage_bin); void maat_stat_output(struct maat_stat *stat, long long maat_version, int perf_on); diff --git a/src/maat_api.c b/src/maat_api.c index d3add44..b1c1338 100644 --- a/src/maat_api.c +++ b/src/maat_api.c @@ -433,8 +433,7 @@ struct maat *maat_new(struct maat_options *opts, const char *table_info_path) } if (1 == maat_instance->stat_on) { - int ret = maat_stat_init(maat_instance->stat, maat_instance->tbl_mgr, maat_instance->garbage_bin, - maat_instance->instance_name); + int ret = maat_stat_init(maat_instance->stat, maat_instance->tbl_mgr, maat_instance->garbage_bin); if (ret < 0) { log_error(maat_instance->logger, MODULE_MAAT_API, "[%s:%d] maat_stat_init failed.", __FUNCTION__, __LINE__); diff --git a/src/maat_stat.c b/src/maat_stat.c index b89cee5..c733930 100644 --- a/src/maat_stat.c +++ b/src/maat_stat.c @@ -189,14 +189,14 @@ void maat_stat_free(struct maat_stat *stat) } int maat_stat_init(struct maat_stat *stat, struct table_manager *tbl_mgr, - struct maat_garbage_bin *garbage_bin, const char *stat_inst_name) + struct maat_garbage_bin *garbage_bin) { - if (NULL == stat || NULL == tbl_mgr || NULL == garbage_bin || - NULL == stat_inst_name) { + if (NULL == stat || NULL == tbl_mgr || NULL == garbage_bin) { return -1; } - stat->fs_handle = fieldstat_instance_new(stat_inst_name); + const char *instance_name = "maat_stat"; + stat->fs_handle = fieldstat_instance_new(instance_name); if (NULL == stat->fs_handle) { log_error(stat->logger, MODULE_MAAT_STAT, "fieldstat_instance_new failed."); return -1; @@ -219,7 +219,7 @@ int maat_stat_init(struct maat_stat *stat, struct table_manager *tbl_mgr, stat->ref_tbl_mgr = tbl_mgr; stat->ref_garbage_bin = garbage_bin; size_t n_column = sizeof(common_column_name) / sizeof(common_column_name[0]); - int fs_table_id = fieldstat_register_table(stat->fs_handle, stat_inst_name, + int fs_table_id = fieldstat_register_table(stat->fs_handle, instance_name, common_column_name, common_column_type, n_column); if (fs_table_id < 0) { |