diff --git a/include/neuron/plugin.h b/include/neuron/plugin.h index 35ab6a66..98c711f5 100644 --- a/include/neuron/plugin.h +++ b/include/neuron/plugin.h @@ -46,8 +46,6 @@ typedef struct neu_plugin_common { char name[NEU_NODE_NAME_LEN]; neu_node_link_state_e link_state; - uint16_t tag_size; - uint32_t tag_all_size; zlog_category_t *log; } neu_plugin_common_t; diff --git a/src/adapter/driver/driver.c b/src/adapter/driver/driver.c index 61dd7058..d557b0b2 100644 --- a/src/adapter/driver/driver.c +++ b/src/adapter/driver/driver.c @@ -492,7 +492,6 @@ int neu_adapter_driver_del_group(neu_adapter_driver_t *driver, const char *name) if (find != NULL) { HASH_DEL(driver->groups, find); - uint16_t tag_size = neu_group_tag_size(find->group); neu_adapter_del_timer((neu_adapter_t *) driver, find->report); neu_event_del_timer(driver->driver_events, find->read); if (find->grp.group_free != NULL) { @@ -510,8 +509,6 @@ int neu_adapter_driver_del_group(neu_adapter_driver_t *driver, const char *name) neu_group_destroy(find->group); free(find); - neu_plugin_to_plugin_common(driver->adapter.plugin)->tag_size -= - tag_size; neu_adapter_del_group_metrics(&driver->adapter, name); ret = NEU_ERR_SUCCESS; } @@ -603,7 +600,6 @@ int neu_adapter_driver_add_tag(neu_adapter_driver_t *driver, const char *group, ret = neu_group_add_tag(find->group, tag); if (ret == NEU_ERR_SUCCESS) { - neu_plugin_to_plugin_common(driver->adapter.plugin)->tag_size += 1; neu_adapter_update_group_metric(&driver->adapter, group, NEU_METRIC_GROUP_TAGS_TOTAL, neu_group_tag_size(find->group)); @@ -626,7 +622,6 @@ int neu_adapter_driver_del_tag(neu_adapter_driver_t *driver, const char *group, } if (ret == NEU_ERR_SUCCESS) { - neu_plugin_to_plugin_common(driver->adapter.plugin)->tag_size -= 1; neu_adapter_update_group_metric(&driver->adapter, group, NEU_METRIC_GROUP_TAGS_TOTAL, neu_group_tag_size(find->group)); @@ -1143,14 +1138,3 @@ static void read_group(int64_t timestamp, int64_t timeout, } } } - -uint16_t neu_adapter_driver_tag_size(neu_adapter_driver_t *driver) -{ - return neu_plugin_to_plugin_common(driver->adapter.plugin)->tag_size; -} - -void neu_adapter_driver_set_all_tag_size(neu_adapter_driver_t *driver, - uint32_t size) -{ - neu_plugin_to_plugin_common(driver->adapter.plugin)->tag_all_size = size; -} \ No newline at end of file diff --git a/src/adapter/driver/driver_internal.h b/src/adapter/driver/driver_internal.h index c9c49c06..04afedcc 100644 --- a/src/adapter/driver/driver_internal.h +++ b/src/adapter/driver/driver_internal.h @@ -61,7 +61,4 @@ void neu_adapter_driver_get_value_tag(neu_adapter_driver_t *driver, const char *group, UT_array **tags); UT_array *neu_adapter_driver_get_read_tag(neu_adapter_driver_t *driver, const char * group); -uint16_t neu_adapter_driver_tag_size(neu_adapter_driver_t *driver); -void neu_adapter_driver_set_all_tag_size(neu_adapter_driver_t *driver, - uint32_t size); #endif diff --git a/src/base/neu_plugin_common.c b/src/base/neu_plugin_common.c index c9920971..5616d05e 100644 --- a/src/base/neu_plugin_common.c +++ b/src/base/neu_plugin_common.c @@ -31,7 +31,6 @@ void neu_plugin_common_init(neu_plugin_common_t *common) { common->magic = NEU_PLUGIN_MAGIC_NUMBER; common->link_state = NEU_NODE_LINK_STATE_DISCONNECTED; - common->tag_size = 0; } bool neu_plugin_common_check(neu_plugin_t *plugin) diff --git a/src/core/manager_internal.c b/src/core/manager_internal.c index 63cc65ed..0835393a 100644 --- a/src/core/manager_internal.c +++ b/src/core/manager_internal.c @@ -138,28 +138,6 @@ UT_array *neu_manager_get_driver_group(neu_manager_t *manager) return driver_groups; } -void neu_manager_count_tag(neu_manager_t *manager) -{ - UT_array *drivers = - neu_node_manager_get_adapter(manager->node_manager, NEU_NA_TYPE_DRIVER); - uint32_t all_size = 0; - - utarray_foreach(drivers, neu_adapter_t **, p_driver) - { - uint16_t size = - neu_adapter_driver_tag_size((neu_adapter_driver_t *) (*p_driver)); - all_size += (uint32_t) size; - } - - utarray_foreach(drivers, neu_adapter_t **, p_driver) - { - neu_adapter_driver_set_all_tag_size( - (neu_adapter_driver_t *) (*p_driver), all_size); - } - - utarray_free(drivers); -} - int neu_manager_subscribe(neu_manager_t *manager, const char *app, const char *driver, const char *group) { diff --git a/src/core/manager_internal.h b/src/core/manager_internal.h index e404b378..bda25c49 100644 --- a/src/core/manager_internal.h +++ b/src/core/manager_internal.h @@ -57,8 +57,6 @@ UT_array *neu_manager_get_nodes(neu_manager_t *manager, neu_node_type_e type, UT_array *neu_manager_get_driver_group(neu_manager_t *manager); -void neu_manager_count_tag(neu_manager_t *manager); - int neu_manager_subscribe(neu_manager_t *manager, const char *app, const char *driver, const char *group); int neu_manager_unsubscribe(neu_manager_t *manager, const char *app,