From adbc2245bc8ad978699a3f381de87c03d4cf98e7 Mon Sep 17 00:00:00 2001 From: fengzero Date: Fri, 15 Apr 2022 09:15:17 +0000 Subject: [PATCH] rename adapter id --- src/adapter/adapter.c | 24 ++++----- src/adapter/adapter_info.h | 14 +++--- src/adapter/adapter_internal.h | 22 ++++---- src/core/message.h | 26 +++++----- src/core/neu_manager.c | 92 +++++++++++++++++----------------- src/core/neu_manager.h | 4 +- 6 files changed, 91 insertions(+), 91 deletions(-) diff --git a/src/adapter/adapter.c b/src/adapter/adapter.c index a94d6a8b..8f235d55 100644 --- a/src/adapter/adapter.c +++ b/src/adapter/adapter.c @@ -1438,8 +1438,8 @@ void neu_adapter_destroy(neu_adapter_t *adapter) if (adapter->name != NULL) { free(adapter->name); } - if (NULL != adapter->node_setting.buf) { - free(adapter->node_setting.buf); + if (NULL != adapter->setting.buf) { + free(adapter->setting.buf); } nng_mtx_lock(adapter->nng.sub_grp_mtx); vector_uninit(&adapter->sub_grp_configs); @@ -2006,7 +2006,7 @@ neu_manager_t *neu_adapter_get_manager(neu_adapter_t *adapter) return (neu_manager_t *) adapter->manager; } -adapter_id_t neu_adapter_get_id(neu_adapter_t *adapter) +neu_adapter_id_t neu_adapter_get_id(neu_adapter_t *adapter) { if (adapter == NULL) { return 0; @@ -2016,13 +2016,13 @@ adapter_id_t neu_adapter_get_id(neu_adapter_t *adapter) } // NOTE: Do NOT expose this function in header files, use for persistence only! -adapter_id_t neu_adapter_set_id(neu_adapter_t *adapter, adapter_id_t id) +neu_adapter_id_t neu_adapter_set_id(neu_adapter_t *adapter, neu_adapter_id_t id) { if (adapter == NULL) { return 0; } - adapter_id_t old = adapter->id; + neu_adapter_id_t old = adapter->id; adapter->id = id; return old; } @@ -2055,12 +2055,12 @@ int neu_adapter_set_setting(neu_adapter_t *adapter, neu_config_t *config) intf_funs = adapter->plugin_info.module->intf_funs; rv = intf_funs->config(adapter->plugin_info.plugin, config); if (rv == 0) { - adapter->node_setting.buf_len = config->buf_len; - adapter->node_setting.type = config->type; + adapter->setting.buf_len = config->buf_len; + adapter->setting.type = config->type; - if (adapter->node_setting.buf != NULL) - free(adapter->node_setting.buf); - adapter->node_setting.buf = strdup(config->buf); + if (adapter->setting.buf != NULL) + free(adapter->setting.buf); + adapter->setting.buf = strdup(config->buf); if (adapter->state == ADAPTER_STATE_INIT) { adapter->state = ADAPTER_STATE_READY; } @@ -2079,8 +2079,8 @@ int neu_adapter_get_setting(neu_adapter_t *adapter, char **config) return NEU_ERR_NODE_NOT_EXIST; } - if (adapter->node_setting.buf != NULL) { - *config = strdup(adapter->node_setting.buf); + if (adapter->setting.buf != NULL) { + *config = strdup(adapter->setting.buf); return NEU_ERR_SUCCESS; } diff --git a/src/adapter/adapter_info.h b/src/adapter/adapter_info.h index 028f7a56..3d8f9b77 100644 --- a/src/adapter/adapter_info.h +++ b/src/adapter/adapter_info.h @@ -22,6 +22,7 @@ #include +#include "adapter.h" #include "plugin_info.h" typedef enum adapter_type { @@ -36,14 +37,13 @@ typedef enum adapter_type { ADAPTER_TYPE_MAX, } adapter_type_e; -typedef uint32_t adapter_id_t; typedef struct neu_adapter_info { - adapter_id_t id; - adapter_type_e type; - plugin_id_t plugin_id; - const char * name; - plugin_kind_e plugin_kind; - const char * plugin_lib_name; + neu_adapter_id_t id; + adapter_type_e type; + plugin_id_t plugin_id; + const char * name; + plugin_kind_e plugin_kind; + const char * plugin_lib_name; } neu_adapter_info_t; #endif diff --git a/src/adapter/adapter_internal.h b/src/adapter/adapter_internal.h index 856a9d9d..2119a977 100644 --- a/src/adapter/adapter_internal.h +++ b/src/adapter/adapter_internal.h @@ -43,16 +43,16 @@ typedef enum adapter_state { } adapter_state_e; struct neu_adapter { - adapter_id_t id; - adapter_state_e state; - char * name; - neu_manager_t * manager; + neu_adapter_id_t id; + adapter_state_e state; + char * name; + neu_manager_t * manager; uint32_t req_id; neu_trans_kind_e trans_kind; adapter_callbacks_t cb_funs; - neu_config_t node_setting; + neu_config_t setting; vector_t sub_grp_configs; // neu_sub_grp_config_t struct { @@ -87,12 +87,12 @@ neu_event_timer_t *neu_adapter_add_timer(neu_adapter_t * adapter, neu_event_timer_param_t param); void neu_adapter_del_timer(neu_adapter_t *adapter, neu_event_timer_t *timer); -const char * neu_adapter_get_name(neu_adapter_t *adapter); -void neu_adapter_rename(neu_adapter_t *adapter, const char *name); -neu_manager_t *neu_adapter_get_manager(neu_adapter_t *adapter); -adapter_id_t neu_adapter_get_id(neu_adapter_t *adapter); -adapter_type_e neu_adapter_get_type(neu_adapter_t *adapter); -plugin_id_t neu_adapter_get_plugin_id(neu_adapter_t *adapter); +const char * neu_adapter_get_name(neu_adapter_t *adapter); +void neu_adapter_rename(neu_adapter_t *adapter, const char *name); +neu_manager_t * neu_adapter_get_manager(neu_adapter_t *adapter); +neu_adapter_id_t neu_adapter_get_id(neu_adapter_t *adapter); +adapter_type_e neu_adapter_get_type(neu_adapter_t *adapter); +plugin_id_t neu_adapter_get_plugin_id(neu_adapter_t *adapter); int neu_adapter_set_setting(neu_adapter_t *adapter, neu_config_t *config); int neu_adapter_get_setting(neu_adapter_t *adapter, char **config); neu_plugin_state_t neu_adapter_get_state(neu_adapter_t *adapter); diff --git a/src/core/message.h b/src/core/message.h index 70b26717..02d28e9b 100644 --- a/src/core/message.h +++ b/src/core/message.h @@ -101,7 +101,7 @@ static_assert(MSG_TYPE_END < MSG_DATABUF_KIND_MASK, /* MSG_CMD_READ_DATA */ typedef struct read_data_cmd { neu_taggrp_config_t *grp_config; - adapter_id_t sender_id; // adapter_id of sender + neu_adapter_id_t sender_id; // adapter_id of sender neu_node_id_t dst_node_id; uint32_t req_id; } read_data_cmd_t; @@ -109,7 +109,7 @@ typedef struct read_data_cmd { /* MSG_CMD_WRITE_DATA */ typedef struct write_data_cmd { neu_taggrp_config_t *grp_config; - adapter_id_t sender_id; // adapter_id of sender + neu_adapter_id_t sender_id; // adapter_id of sender neu_node_id_t dst_node_id; neu_trans_buf_t trans_buf; uint32_t req_id; @@ -118,21 +118,21 @@ typedef struct write_data_cmd { /* MSG_CMD_START_PERIODIC_READ */ typedef struct start_periodic_read_cmd { neu_taggrp_config_t *grp_config; - adapter_id_t sender_id; // adapter_id of sender + neu_adapter_id_t sender_id; // adapter_id of sender neu_node_id_t dst_node_id; } start_periodic_read_cmd_t; /* MSG_CMD_STOP_PERIODIC_READ */ typedef struct stop_periodic_read_cmd { neu_taggrp_config_t *grp_config; - adapter_id_t sender_id; // adapter_id of sender + neu_adapter_id_t sender_id; // adapter_id of sender neu_node_id_t dst_node_id; } stop_periodic_read_cmd_t; /* MSG_CMD_SUBSCRIBE_DRIVER */ typedef struct subscribe_driver_cmd { neu_taggrp_config_t *grp_config; - adapter_id_t sender_id; // adapter_id of sender + neu_adapter_id_t sender_id; // adapter_id of sender neu_node_id_t src_node_id; neu_node_id_t dst_node_id; uint32_t req_id; @@ -141,7 +141,7 @@ typedef struct subscribe_driver_cmd { /* MSG_CMD_UNSUBSCRIBE_DRIVER */ typedef struct unsubscribe_driver_cmd { neu_taggrp_config_t *grp_config; - adapter_id_t sender_id; // adapter_id of sender + neu_adapter_id_t sender_id; // adapter_id of sender neu_node_id_t src_node_id; neu_node_id_t dst_node_id; uint32_t req_id; @@ -150,21 +150,21 @@ typedef struct unsubscribe_driver_cmd { /* MSG_CMD_GROUP_CONFIG_CHANGED */ typedef struct grp_config_changed_cmd { neu_taggrp_config_t *grp_config; - adapter_id_t sender_id; // adapter_id of sender + neu_adapter_id_t sender_id; // adapter_id of sender neu_node_id_t dst_node_id; } grp_config_changed_cmd_t; /* MSG_EVENT_GROUP_CONFIG_CHANGED */ typedef struct grp_config_changed_event { neu_taggrp_config_t *grp_config; - adapter_id_t sender_id; // adapter_id of sender + neu_adapter_id_t sender_id; // adapter_id of sender neu_node_id_t dst_node_id; } grp_config_changed_event_t; /* MSG_DATA_NEURON_TRANS_DATA */ typedef struct neuron_trans_data { neu_taggrp_config_t *grp_config; - adapter_id_t sender_id; // adapter_id of sender + neu_adapter_id_t sender_id; // adapter_id of sender char * node_name; neu_trans_buf_t trans_buf; } neuron_trans_data_t; @@ -173,8 +173,8 @@ typedef struct neuron_trans_data { typedef struct read_data_resp { neu_taggrp_config_t *grp_config; neu_trans_buf_t trans_buf; - adapter_id_t sender_id; - adapter_id_t recver_id; + neu_adapter_id_t sender_id; + neu_adapter_id_t recver_id; uint32_t req_id; } read_data_resp_t; @@ -182,8 +182,8 @@ typedef struct read_data_resp { typedef struct write_data_resp { neu_taggrp_config_t *grp_config; neu_trans_buf_t trans_buf; - adapter_id_t sender_id; - adapter_id_t recver_id; + neu_adapter_id_t sender_id; + neu_adapter_id_t recver_id; uint32_t req_id; } write_data_resp_t; diff --git a/src/core/neu_manager.c b/src/core/neu_manager.c index 7bb2b49c..1ee999ee 100644 --- a/src/core/neu_manager.c +++ b/src/core/neu_manager.c @@ -42,7 +42,7 @@ #include "subscribe.h" typedef struct adapter_reg_entity { - adapter_id_t adapter_id; + neu_adapter_id_t adapter_id; neu_adapter_t * adapter; neu_datatag_manager_t *datatag_manager; nng_cv * cv; @@ -184,7 +184,7 @@ static int uninit_bind_info(manager_bind_info_t *mng_bind_info) static bool match_id_reg_adapter(const void *key, const void *item) { - return *(adapter_id_t *) key == ((adapter_reg_entity_t *) item)->adapter_id; + return *(neu_adapter_id_t *) key == ((adapter_reg_entity_t *) item)->adapter_id; } static bool match_name_reg_adapter(const void *key, const void *item) @@ -206,13 +206,13 @@ static bool match_pipe_reg_adapter(const void *key, const void *item) } // Return SIZE_MAX if can't find a adapter -static size_t find_reg_adapter_index_by_id(vector_t *adapters, adapter_id_t id) +static size_t find_reg_adapter_index_by_id(vector_t *adapters, neu_adapter_id_t id) { return vector_find_index(adapters, &id, match_id_reg_adapter); } static adapter_reg_entity_t *find_reg_adapter_by_id(vector_t * adapters, - adapter_id_t id) + neu_adapter_id_t id) { return vector_find_item(adapters, &id, match_id_reg_adapter); } @@ -250,9 +250,9 @@ static bool is_static_plugin(const char *plugin_name) return false; } -static adapter_id_t manager_new_adapter_id(neu_manager_t *manager) +static neu_adapter_id_t manager_new_adapter_id(neu_manager_t *manager) { - adapter_id_t adapter_id; + neu_adapter_id_t adapter_id; nng_mtx_lock(manager->adapters_mtx); adapter_id = manager->new_adapter_id++; @@ -277,12 +277,12 @@ static inline int manager_send_msg_to_pipe(neu_manager_t *manager, } neu_node_id_t neu_manager_adapter_id_to_node_id(neu_manager_t *manager, - adapter_id_t adapter_id) + neu_adapter_id_t adapter_id) { (void) manager; return adapter_id; } -adapter_id_t neu_manager_adapter_id_from_node_id(neu_manager_t *manager, +neu_adapter_id_t neu_manager_adapter_id_from_node_id(neu_manager_t *manager, neu_node_id_t node_id) { (void) manager; @@ -291,7 +291,7 @@ adapter_id_t neu_manager_adapter_id_from_node_id(neu_manager_t *manager, static void manager_bind_adapter(nng_pipe p, nng_pipe_ev ev, void *arg) { - adapter_id_t adapter_id; + neu_adapter_id_t adapter_id; neu_adapter_t * adapter; neu_manager_t * manager; adapter_reg_entity_t *reg_entity; @@ -354,7 +354,7 @@ static void manager_unbind_adapter(nng_pipe p, nng_pipe_ev ev, void *arg) static neu_err_code_e manager_reg_adapter(neu_manager_t * manager, adapter_reg_cmd_t *reg_param, neu_adapter_t ** p_adapter, - adapter_id_t * adapter_id) + neu_adapter_id_t * adapter_id) { int rv = NEU_ERR_SUCCESS; neu_adapter_t * adapter; @@ -438,7 +438,7 @@ static neu_err_code_e manager_reg_adapter(neu_manager_t * manager, return rv; } -static int manager_unreg_adapter(neu_manager_t *manager, adapter_id_t id, +static int manager_unreg_adapter(neu_manager_t *manager, neu_adapter_id_t id, bool need_erase) { size_t index; @@ -540,7 +540,7 @@ int neu_manager_uninit_adapter(neu_manager_t *manager, neu_adapter_t *adapter) nng_pipe msg_pipe = { 0 }; adapter_reg_entity_t *reg_entity; - adapter_id_t adapter_id; + neu_adapter_id_t adapter_id; adapter_id = neu_adapter_get_id(adapter); nng_mtx_lock(manager->adapters_mtx); @@ -619,7 +619,7 @@ static void unregister_all_reg_plugins(neu_manager_t *manager) static void reg_and_start_static_adapters(neu_manager_t *manager) { uint32_t i; - adapter_id_t id; + neu_adapter_id_t id; neu_adapter_t *p_adapter; for (i = 0; i < STATIC_ADAPTER_ADD_INFO_SIZE; i++) { @@ -889,7 +889,7 @@ static void manager_loop(void *arg) size_t msg_size; nng_msg * out_msg; nng_pipe msg_pipe; - adapter_id_t adapter_id; + neu_adapter_id_t adapter_id; read_data_cmd_t * cmd_ptr; adapter_reg_entity_t *reg_entity; @@ -922,7 +922,7 @@ static void manager_loop(void *arg) size_t msg_size; nng_msg * out_msg; nng_pipe msg_pipe; - adapter_id_t adapter_id; + neu_adapter_id_t adapter_id; read_data_resp_t * cmd_ptr; adapter_reg_entity_t *reg_entity; @@ -955,7 +955,7 @@ static void manager_loop(void *arg) size_t msg_size; nng_msg * out_msg; nng_pipe msg_pipe; - adapter_id_t adapter_id; + neu_adapter_id_t adapter_id; write_data_cmd_t * cmd_ptr; adapter_reg_entity_t *reg_entity; @@ -988,7 +988,7 @@ static void manager_loop(void *arg) size_t msg_size; nng_msg * out_msg; nng_pipe msg_pipe; - adapter_id_t adapter_id; + neu_adapter_id_t adapter_id; write_data_resp_t * cmd_ptr; adapter_reg_entity_t *reg_entity; @@ -1131,7 +1131,7 @@ static void manager_loop(void *arg) size_t msg_size; nng_msg * out_msg; nng_pipe msg_pipe; - adapter_id_t adapter_id; + neu_adapter_id_t adapter_id; grp_config_changed_event_t *event_ptr; adapter_reg_entity_t * reg_entity; @@ -1368,7 +1368,7 @@ int neu_manager_add_node(neu_manager_t *manager, neu_cmd_add_node_t *cmd, neu_node_id_t *p_node_id) { int rv = 0; - adapter_id_t adapter_id; + neu_adapter_id_t adapter_id; neu_adapter_t * adapter = NULL; adapter_reg_cmd_t reg_cmd; @@ -1391,12 +1391,12 @@ int neu_manager_update_node_id(neu_manager_t *manager, neu_node_id_t node_id, neu_node_id_t new_node_id) { int rv = 0; - adapter_id_t adapter_id; - adapter_id_t new_adapter_id; + neu_adapter_id_t adapter_id; + neu_adapter_id_t new_adapter_id; adapter_reg_entity_t *reg_entity; // declaration for neu_adapter_set_id since it is not exposed - adapter_id_t neu_adapter_set_id(neu_adapter_t * adapter, adapter_id_t id); + neu_adapter_id_t neu_adapter_set_id(neu_adapter_t * adapter, neu_adapter_id_t id); if (0 == new_node_id) { return NEU_ERR_EINVAL; @@ -1430,7 +1430,7 @@ int neu_manager_update_node_id(neu_manager_t *manager, neu_node_id_t node_id, int neu_manager_del_node(neu_manager_t *manager, neu_node_id_t node_id) { int rv = 0; - adapter_id_t adapter_id; + neu_adapter_id_t adapter_id; neu_adapter_t * adapter = NULL; adapter_reg_entity_t *reg_entity; vector_t group_config; @@ -1477,7 +1477,7 @@ int neu_manager_update_node(neu_manager_t *manager, neu_cmd_update_node_t *cmd) size_t index = 0; neu_adapter_t *adapter = NULL; vector_t * reg_adapters = &manager->reg_adapters; - adapter_id_t adapter_id = + neu_adapter_id_t adapter_id = neu_manager_adapter_id_from_node_id(manager, cmd->node_id); nng_mtx_lock(manager->adapters_mtx); @@ -1504,9 +1504,9 @@ int neu_manager_subscribe_node(neu_manager_t * manager, int rv = 0; nng_mtx_lock(manager->adapters_mtx); - adapter_id_t src_adapter_id = + neu_adapter_id_t src_adapter_id = neu_manager_adapter_id_from_node_id(manager, cmd->src_node_id); - adapter_id_t sub_adapter_id = + neu_adapter_id_t sub_adapter_id = neu_manager_adapter_id_from_node_id(manager, cmd->dst_node_id); adapter_reg_entity_t *src_reg_entity = find_reg_adapter_by_id(&manager->reg_adapters, src_adapter_id); @@ -1548,9 +1548,9 @@ int neu_manager_unsubscribe_node(neu_manager_t * manager, int rv = 0; nng_mtx_lock(manager->adapters_mtx); - adapter_id_t src_adapter_id = + neu_adapter_id_t src_adapter_id = neu_manager_adapter_id_from_node_id(manager, cmd->src_node_id); - adapter_id_t sub_adapter_id = + neu_adapter_id_t sub_adapter_id = neu_manager_adapter_id_from_node_id(manager, cmd->dst_node_id); adapter_reg_entity_t *src_reg_entity = find_reg_adapter_by_id(&manager->reg_adapters, src_adapter_id); @@ -1624,7 +1624,7 @@ int neu_manager_get_nodes(neu_manager_t *manager, neu_node_type_e node_type, reg_entity = (adapter_reg_entity_t *) iterator_get(&iter); if (adapter_match_node_type(reg_entity->adapter, node_type)) { neu_node_info_t node_info; - adapter_id_t adapter_id; + neu_adapter_id_t adapter_id; const char * adapter_name; adapter_name = neu_adapter_get_name(reg_entity->adapter); @@ -1646,7 +1646,7 @@ int neu_manager_get_node_name_by_id(neu_manager_t *manager, neu_node_id_t node_id, char **name) { int rv = 0; - adapter_id_t adapter_id; + neu_adapter_id_t adapter_id; adapter_reg_entity_t *reg_entity; if (NULL == name) { @@ -1696,7 +1696,7 @@ int neu_manager_add_grp_config(neu_manager_t * manager, neu_cmd_add_grp_config_t *cmd) { int rv = NEU_ERR_SUCCESS; - adapter_id_t adapter_id; + neu_adapter_id_t adapter_id; adapter_reg_entity_t *reg_entity; if (manager == NULL || cmd == NULL) { @@ -1728,7 +1728,7 @@ int neu_manager_del_grp_config(neu_manager_t *manager, neu_node_id_t node_id, const char *config_name) { int rv = NEU_ERR_SUCCESS; - adapter_id_t adapter_id; + neu_adapter_id_t adapter_id; adapter_reg_entity_t *reg_entity; if (manager == NULL || config_name == NULL) { @@ -1760,7 +1760,7 @@ int neu_manager_update_grp_config(neu_manager_t * manager, neu_cmd_update_grp_config_t *cmd) { int rv = NEU_ERR_SUCCESS; - adapter_id_t adapter_id; + neu_adapter_id_t adapter_id; adapter_reg_entity_t *reg_entity; if (manager == NULL || cmd == NULL) { @@ -1801,7 +1801,7 @@ int neu_manager_get_grp_configs(neu_manager_t *manager, neu_node_id_t node_id, { int rv = 0; adapter_reg_entity_t *reg_entity; - adapter_id_t adapter_id; + neu_adapter_id_t adapter_id; if (manager == NULL || result_grp_configs == NULL) { log_error("get nodes with NULL manager or result_nodes"); @@ -1830,7 +1830,7 @@ int neu_manager_get_persist_datatag_infos(neu_manager_t *manager, { int rv = 0; adapter_reg_entity_t *reg_entity; - adapter_id_t adapter_id; + neu_adapter_id_t adapter_id; if (manager == NULL || result == NULL) { log_error("get persist datatag infos with NULL manager or result"); @@ -2050,7 +2050,7 @@ neu_datatag_table_t *neu_manager_get_datatag_tbl(neu_manager_t *manager, { adapter_reg_entity_t *reg_entity; neu_datatag_table_t * tag_table; - adapter_id_t adapter_id; + neu_adapter_id_t adapter_id; if (manager == NULL) { log_error("get datatag table with NULL manager"); @@ -2076,7 +2076,7 @@ neu_datatag_table_t *neu_manager_get_datatag_tbl(neu_manager_t *manager, int neu_manager_adapter_set_setting(neu_manager_t *manager, neu_node_id_t node_id, const char *config) { - adapter_id_t adapter_id = { 0 }; + neu_adapter_id_t adapter_id = { 0 }; adapter_reg_entity_t *reg_entity = NULL; int ret = 0; neu_config_t neu_config = { .type = NEU_CONFIG_SETTING }; @@ -2170,7 +2170,7 @@ int neu_manager_get_persist_adapter_infos(neu_manager_t *manager, int neu_manager_adapter_get_setting(neu_manager_t *manager, neu_node_id_t node_id, char **config) { - adapter_id_t adapter_id = { 0 }; + neu_adapter_id_t adapter_id = { 0 }; adapter_reg_entity_t *reg_entity = NULL; int ret = 0; @@ -2194,7 +2194,7 @@ int neu_manager_adapter_get_setting(neu_manager_t *manager, int neu_manager_start_adapter_with_id(neu_manager_t *manager, neu_node_id_t node_id) { - adapter_id_t adapter_id = { 0 }; + neu_adapter_id_t adapter_id = { 0 }; adapter_reg_entity_t *reg_entity = NULL; nng_mtx_lock(manager->adapters_mtx); @@ -2219,7 +2219,7 @@ int neu_manager_start_adapter_with_id(neu_manager_t *manager, int neu_manager_adapter_get_state(neu_manager_t *manager, neu_node_id_t node_id, neu_plugin_state_t *state) { - adapter_id_t adapter_id = { 0 }; + neu_adapter_id_t adapter_id = { 0 }; adapter_reg_entity_t *reg_entity = NULL; nng_mtx_lock(manager->adapters_mtx); @@ -2242,7 +2242,7 @@ int neu_manager_adapter_get_state(neu_manager_t *manager, neu_node_id_t node_id, int neu_manager_adapter_ctl(neu_manager_t *manager, neu_node_id_t node_id, neu_adapter_ctl_e ctl) { - adapter_id_t adapter_id = { 0 }; + neu_adapter_id_t adapter_id = { 0 }; adapter_reg_entity_t *reg_entity = NULL; neu_adapter_t * adapter; int ret = NEU_ERR_SUCCESS; @@ -2277,7 +2277,7 @@ int neu_manager_adapter_get_sub_grp_configs(neu_manager_t *manager, neu_node_id_t node_id, vector_t ** result_sgc) { - adapter_id_t adapter_id = { 0 }; + neu_adapter_id_t adapter_id = { 0 }; adapter_reg_entity_t *reg_entity = NULL; nng_mtx_lock(manager->adapters_mtx); @@ -2310,7 +2310,7 @@ int neu_manager_adapter_get_grp_config_ref_by_name( } nng_mtx_lock(manager->adapters_mtx); - adapter_id_t adapter_id = + neu_adapter_id_t adapter_id = neu_manager_adapter_id_from_node_id(manager, node_id); adapter_reg_entity_t *reg_entity = find_reg_adapter_by_id(&manager->reg_adapters, adapter_id); @@ -2344,7 +2344,7 @@ int neu_manager_get_persist_subscription_infos(neu_manager_t *manager, return NEU_ERR_EINTERNAL; } - adapter_id_t adapter_id = { 0 }; + neu_adapter_id_t adapter_id = { 0 }; adapter_reg_entity_t *reg_entity = NULL; nng_mtx_lock(manager->adapters_mtx); @@ -2374,7 +2374,7 @@ int neu_manager_get_persist_subscription_infos(neu_manager_t *manager, VECTOR_FOR_EACH(sub_grp_configs, iter) { neu_sub_grp_config_t *sgc = iterator_get(&iter); - adapter_id_t adapter_id = + neu_adapter_id_t adapter_id = neu_manager_adapter_id_from_node_id(manager, sgc->node_id); adapter_reg_entity_t *src_reg_entity = find_reg_adapter_by_id(&manager->reg_adapters, adapter_id); @@ -2427,7 +2427,7 @@ final: int neu_manager_adapter_validate_tag(neu_manager_t *manager, neu_node_id_t node_id, neu_datatag_t *tags) { - adapter_id_t adapter_id = { 0 }; + neu_adapter_id_t adapter_id = { 0 }; adapter_reg_entity_t *reg_entity = NULL; neu_adapter_t * adapter; int ret = -1; diff --git a/src/core/neu_manager.h b/src/core/neu_manager.h index cf0af9d6..41860750 100644 --- a/src/core/neu_manager.h +++ b/src/core/neu_manager.h @@ -82,8 +82,8 @@ int neu_manager_get_persist_plugin_infos(neu_manager_t *manager, neu_datatag_table_t *neu_manager_get_datatag_tbl(neu_manager_t *manager, neu_node_id_t node_id); neu_node_id_t neu_manager_adapter_id_to_node_id(neu_manager_t *manager, - adapter_id_t adapter_id); -adapter_id_t neu_manager_adapter_id_from_node_id(neu_manager_t *manager, + neu_adapter_id_t adapter_id); +neu_adapter_id_t neu_manager_adapter_id_from_node_id(neu_manager_t *manager, neu_node_id_t node_id); int neu_manager_adapter_set_setting(neu_manager_t *manager, neu_node_id_t node_id, const char *config);