Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/zabbix/zabbix.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorArtjoms Rimdjonoks <artjoms.rimdjonoks@zabbix.com>2022-04-01 15:50:37 +0300
committerArtjoms Rimdjonoks <artjoms.rimdjonoks@zabbix.com>2022-04-01 15:50:37 +0300
commit1d2bdd179e2f93e0950a69eb535ce3d07f58971d (patch)
tree53c09b225c9d3b0cd5150781ddf6b22b69dcffe6 /src
parentab58847de3da18b3a84699e2f638bb54cce6848e (diff)
.......... [DEV-2124] replaced zbx_mem_stats_t with zbx_shmem_stats_t
Diffstat (limited to 'src')
-rw-r--r--src/libs/zbxdbcache/dbcache.c2
-rw-r--r--src/libs/zbxdbcache/valuecache.c4
-rw-r--r--src/libs/zbxdbcache/valuecache.h2
-rw-r--r--src/libs/zbxdiag/diag.c4
-rw-r--r--src/libs/zbxdiag/diag.h2
-rw-r--r--src/libs/zbxdiag/diag_server.c2
-rw-r--r--src/libs/zbxshmem/memalloc.c4
7 files changed, 10 insertions, 10 deletions
diff --git a/src/libs/zbxdbcache/dbcache.c b/src/libs/zbxdbcache/dbcache.c
index 0f35e105c6c..f924d6f4a5f 100644
--- a/src/libs/zbxdbcache/dbcache.c
+++ b/src/libs/zbxdbcache/dbcache.c
@@ -4816,7 +4816,7 @@ void zbx_hc_get_diag_stats(zbx_uint64_t *items_num, zbx_uint64_t *values_num)
* Purpose: get shared memory allocator statistics *
* *
******************************************************************************/
-void zbx_hc_get_mem_stats(zbx_mem_stats_t *data, zbx_mem_stats_t *index)
+void zbx_hc_get_mem_stats(zbx_shmem_stats_t *data, zbx_shmem_stats_t *index)
{
LOCK_CACHE;
diff --git a/src/libs/zbxdbcache/valuecache.c b/src/libs/zbxdbcache/valuecache.c
index 23069b282ba..9da241c5e71 100644
--- a/src/libs/zbxdbcache/valuecache.c
+++ b/src/libs/zbxdbcache/valuecache.c
@@ -2738,11 +2738,11 @@ void zbx_vc_get_diag_stats(zbx_uint64_t *items_num, zbx_uint64_t *values_num, in
* Purpose: get value cache shared memory statistics *
* *
******************************************************************************/
-void zbx_vc_get_mem_stats(zbx_mem_stats_t *mem)
+void zbx_vc_get_mem_stats(zbx_shmem_stats_t *mem)
{
if (ZBX_VC_DISABLED == vc_state)
{
- memset(mem, 0, sizeof(zbx_mem_stats_t));
+ memset(mem, 0, sizeof(zbx_shmem_stats_t));
return;
}
diff --git a/src/libs/zbxdbcache/valuecache.h b/src/libs/zbxdbcache/valuecache.h
index e84ffb3c73f..3b280e5a4df 100644
--- a/src/libs/zbxdbcache/valuecache.h
+++ b/src/libs/zbxdbcache/valuecache.h
@@ -114,7 +114,7 @@ int zbx_vc_get_statistics(zbx_vc_stats_t *stats);
void zbx_vc_housekeeping_value_cache(void);
void zbx_vc_get_diag_stats(zbx_uint64_t *items_num, zbx_uint64_t *values_num, int *mode);
-void zbx_vc_get_mem_stats(zbx_mem_stats_t *mem);
+void zbx_vc_get_mem_stats(zbx_shmem_stats_t *mem);
void zbx_vc_get_item_stats(zbx_vector_ptr_t *stats);
void zbx_vc_flush_stats(void);
diff --git a/src/libs/zbxdiag/diag.c b/src/libs/zbxdiag/diag.c
index c19255cff60..786ef67fef3 100644
--- a/src/libs/zbxdiag/diag.c
+++ b/src/libs/zbxdiag/diag.c
@@ -138,7 +138,7 @@ out:
* stats - [IN] the memory statistics *
* *
******************************************************************************/
-void diag_add_mem_stats(struct zbx_json *json, const char *name, const zbx_mem_stats_t *stats)
+void diag_add_mem_stats(struct zbx_json *json, const char *name, const zbx_shmem_stats_t *stats)
{
int i;
@@ -272,7 +272,7 @@ int diag_add_historycache_info(const struct zbx_json_parse *jp, struct zbx_json
if (0 != (fields & ZBX_DIAG_HISTORYCACHE_MEMORY))
{
- zbx_mem_stats_t data_mem, index_mem, *pdata_mem, *pindex_mem;
+ zbx_shmem_stats_t data_mem, index_mem, *pdata_mem, *pindex_mem;
pdata_mem = (0 != (fields & ZBX_DIAG_HISTORYCACHE_MEMORY_DATA) ? &data_mem : NULL);
pindex_mem = (0 != (fields & ZBX_DIAG_HISTORYCACHE_MEMORY_INDEX) ? &index_mem : NULL);
diff --git a/src/libs/zbxdiag/diag.h b/src/libs/zbxdiag/diag.h
index fbe808ee035..09f334c8fe3 100644
--- a/src/libs/zbxdiag/diag.h
+++ b/src/libs/zbxdiag/diag.h
@@ -75,7 +75,7 @@ void diag_map_free(zbx_diag_map_t *map);
int diag_parse_request(const struct zbx_json_parse *jp, const zbx_diag_map_t *field_map, zbx_uint64_t *field_mask,
zbx_vector_ptr_t *top_views, char **error);
-void diag_add_mem_stats(struct zbx_json *json, const char *name, const zbx_mem_stats_t *stats);
+void diag_add_mem_stats(struct zbx_json *json, const char *name, const zbx_shmem_stats_t *stats);
int diag_add_section_info(const char *section, const struct zbx_json_parse *jp, struct zbx_json *json, char **error);
diff --git a/src/libs/zbxdiag/diag_server.c b/src/libs/zbxdiag/diag_server.c
index 08b899acd98..867fe1a522a 100644
--- a/src/libs/zbxdiag/diag_server.c
+++ b/src/libs/zbxdiag/diag_server.c
@@ -127,7 +127,7 @@ static int diag_add_valuecache_info(const struct zbx_json_parse *jp, struct zbx_
if (0 != (fields & ZBX_DIAG_VALUECACHE_MEMORY))
{
- zbx_mem_stats_t mem;
+ zbx_shmem_stats_t mem;
time1 = zbx_time();
zbx_vc_get_mem_stats(&mem);
diff --git a/src/libs/zbxshmem/memalloc.c b/src/libs/zbxshmem/memalloc.c
index 0fc73c3e42f..d181b71d3e3 100644
--- a/src/libs/zbxshmem/memalloc.c
+++ b/src/libs/zbxshmem/memalloc.c
@@ -728,7 +728,7 @@ void zbx_shmem_clear(zbx_shmem_info_t *info)
zabbix_log(LOG_LEVEL_DEBUG, "End of %s()", __func__);
}
-void zbx_shmem_get_stats(const zbx_shmem_info_t *info, zbx_mem_stats_t *stats)
+void zbx_shmem_get_stats(const zbx_shmem_info_t *info, zbx_shmem_stats_t *stats)
{
void *chunk;
int i;
@@ -763,7 +763,7 @@ void zbx_shmem_get_stats(const zbx_shmem_info_t *info, zbx_mem_stats_t *stats)
void zbx_shmem_dump_stats(int level, zbx_shmem_info_t *info)
{
- zbx_mem_stats_t stats;
+ zbx_shmem_stats_t stats;
int i;
zbx_shmem_get_stats(info, &stats);