GithubStar/neuron
1
0
Fork 0
mirror of https://github.com/emqx/neuron.git synced 2026-10-25 11:26:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(adapter): remove adapter_type

Browse Source
This commit is contained in:
fengzero
2022-04-15 09:36:40 +00:00
parent e98c91a677
commit 3548917bc6
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/adapter/adapter.c
+8 -9
View File
@@ -1402,7 +1402,6 @@ neu_adapter_t *neu_adapter_create(neu_adapter_info_t *info,
assert(adapter->plugin_lib != NULL);
adapter->id = info->id;
adapter->type = info->type;
adapter->name = strdup(info->name);
adapter->state = ADAPTER_STATE_IDLE;
adapter->new_req_id = 1;
@@ -1437,7 +1436,7 @@ void neu_adapter_destroy(neu_adapter_t *adapter)
{
assert(adapter != NULL);
if (adapter->type == ADAPTER_TYPE_DRIVERX) {
if (adapter->plugin_module->type == NEU_NODE_TYPE_DRIVERX) {
neu_adapter_driver_destroy((neu_adapter_driver_t *) adapter);
}
@@ -1676,7 +1675,7 @@ int adapter_loop(enum neu_event_io_type type, int fd, void *usr_data)
req.sender_id = cmd_ptr->sender_id;
req.buf_len = sizeof(neu_reqresp_subscribe_node_t);
req.buf = (void *) &sub_node_req;
if (adapter->type == ADAPTER_TYPE_DRIVERX) {
if (adapter->plugin_module->type == NEU_NODE_TYPE_DRIVERX) {
neu_adapter_driver_process_msg((neu_adapter_driver_t *) adapter,
&req);
} else {
@@ -1703,7 +1702,7 @@ int adapter_loop(enum neu_event_io_type type, int fd, void *usr_data)
req.sender_id = cmd_ptr->sender_id;
req.buf_len = sizeof(neu_reqresp_unsubscribe_node_t);
req.buf = (void *) &unsub_node_req;
if (adapter->type == ADAPTER_TYPE_DRIVERX) {
if (adapter->plugin_module->type == NEU_NODE_TYPE_DRIVERX) {
neu_adapter_driver_process_msg((neu_adapter_driver_t *) adapter,
&req);
} else {
@@ -1729,7 +1728,7 @@ int adapter_loop(enum neu_event_io_type type, int fd, void *usr_data)
req.sender_id = cmd_ptr->sender_id;
req.buf_len = sizeof(neu_reqresp_read_t);
req.buf = (void *) &read_req;
if (adapter->type == ADAPTER_TYPE_DRIVERX) {
if (adapter->plugin_module->type == NEU_NODE_TYPE_DRIVERX) {
neu_adapter_driver_process_msg((neu_adapter_driver_t *) adapter,
&req);
} else {
@@ -1799,7 +1798,7 @@ int adapter_loop(enum neu_event_io_type type, int fd, void *usr_data)
req.sender_id = cmd_ptr->sender_id;
req.buf_len = sizeof(neu_reqresp_write_t);
req.buf = (void *) &write_req;
if (adapter->type == ADAPTER_TYPE_DRIVERX) {
if (adapter->plugin_module->type == NEU_NODE_TYPE_DRIVERX) {
neu_adapter_driver_process_msg((neu_adapter_driver_t *) adapter,
&req);
} else {
@@ -1879,7 +1878,7 @@ int neu_adapter_init(neu_adapter_t *adapter)
adapter->nng_io = neu_event_add_io(adapter->events, param);
if (adapter->type == ADAPTER_TYPE_DRIVERX) {
if (adapter->plugin_module->type == NEU_NODE_TYPE_DRIVERX) {
neu_adapter_driver_init((neu_adapter_driver_t *) adapter);
}
@@ -1908,7 +1907,7 @@ int neu_adapter_uninit(neu_adapter_t *adapter)
{
int rv = 0;
if (adapter->type == ADAPTER_TYPE_DRIVERX) {
if (adapter->plugin_module->type == NEU_NODE_TYPE_DRIVERX) {
neu_adapter_driver_uninit((neu_adapter_driver_t *) adapter);
}
@@ -2047,7 +2046,7 @@ adapter_type_e neu_adapter_get_type(neu_adapter_t *adapter)
return 0;
}
return adapter->type;
return (adapter_type_e) adapter->plugin_module->type;
}
plugin_id_t neu_adapter_get_plugin_id(neu_adapter_t *adapter)
src/adapter/adapter_internal.h
+1 -2
View File
@@ -44,8 +44,7 @@ typedef enum adapter_state {
struct neu_adapter {
adapter_id_t id;
neu_node_id_t node_id;
adapter_type_e type;
neu_adapter_id_t node_id;
nng_mtx * mtx;
nng_mtx * sub_grp_mtx;
adapter_state_e state;