From 6000f417d3647ff38289288ae88b15d6992c215a Mon Sep 17 00:00:00 2001 From: eeff <33566201+eeff@users.noreply.github.com> Date: Mon, 17 Oct 2022 16:18:22 +0800 Subject: [PATCH] revert: "feat: add new message type for getting node statistics" This reverts commit 717a4eed0c2623d1aa0cbf495591ecf68d5cc627. --- include/neuron/adapter.h | 13 ------------- src/adapter/adapter.c | 18 ------------------ src/core/manager.c | 2 -- 3 files changed, 33 deletions(-) diff --git a/include/neuron/adapter.h b/include/neuron/adapter.h index 0627632e..23cfffbb 100644 --- a/include/neuron/adapter.h +++ b/include/neuron/adapter.h @@ -121,8 +121,6 @@ typedef enum neu_reqresp_type { NEU_REQ_GET_NODES_STATE, NEU_RESP_GET_NODES_STATE, NEU_REQ_NODE_CTL, - NEU_REQ_GET_NODE_STAT, - NEU_RESP_GET_NODE_STAT, NEU_REQ_ADD_GROUP, NEU_REQ_DEL_GROUP, @@ -185,8 +183,6 @@ static const char *neu_reqresp_type_string_t[] = { [NEU_REQ_GET_NODES_STATE] = "NEU_REQ_GET_NODES_STATE", [NEU_RESP_GET_NODES_STATE] = "NEU_RESP_GET_NODES_STATE", [NEU_REQ_NODE_CTL] = "NEU_REQ_NODE_CTL", - [NEU_REQ_GET_NODE_STAT] = "NEU_REQ_GET_NODE_STAT", - [NEU_RESP_GET_NODE_STAT] = "NEU_RESP_GET_NODE_STAT", [NEU_REQ_ADD_GROUP] = "NEU_REQ_ADD_GROUP", [NEU_REQ_DEL_GROUP] = "NEU_REQ_DEL_GROUP", @@ -437,15 +433,6 @@ typedef struct { UT_array *states; // array of neu_nodes_state_t } neu_resp_get_nodes_state_t, neu_reqresp_nodes_state_t; -typedef struct neu_req_get_node_stat { - char node[NEU_NODE_NAME_LEN]; -} neu_req_get_node_stat_t; - -typedef struct neu_resp_get_node_stat { - neu_node_type_e type; - uint64_t data[NEU_NODE_STAT_MAX]; -} neu_resp_get_node_stat_t; - typedef struct neu_req_update_license { } neu_req_update_license_t; diff --git a/src/adapter/adapter.c b/src/adapter/adapter.c index f3e3de31..e5c45925 100644 --- a/src/adapter/adapter.c +++ b/src/adapter/adapter.c @@ -243,7 +243,6 @@ static int adapter_command(neu_adapter_t *adapter, neu_reqresp_head_t header, break; } case NEU_REQ_NODE_CTL: - case NEU_REQ_GET_NODE_STAT: case NEU_REQ_GET_NODE_STATE: case NEU_REQ_GET_NODE_SETTING: case NEU_REQ_NODE_SETTING: { @@ -324,7 +323,6 @@ static int adapter_loop(enum neu_event_io_type type, int fd, void *usr_data) case NEU_REQRESP_METRICS: case NEU_RESP_GET_SUB_DRIVER_TAGS: case NEU_REQ_UPDATE_LICENSE: - case NEU_RESP_GET_NODE_STAT: case NEU_RESP_GET_NODE_STATE: case NEU_RESP_GET_NODES_STATE: case NEU_RESP_GET_NODE_SETTING: @@ -406,16 +404,6 @@ static int adapter_loop(enum neu_event_io_type type, int fd, void *usr_data) break; } - case NEU_REQ_GET_NODE_STAT: { - neu_resp_get_node_stat_t resp = { 0 }; - - resp.type = neu_adapter_get_type(adapter); - memcpy(resp.data, adapter->stat.data, sizeof(resp.data)); - header->type = NEU_RESP_GET_NODE_STAT; - neu_msg_exchange(header); - reply(adapter, header, &resp); - break; - } case NEU_REQ_GET_NODE_STATE: { neu_resp_get_node_state_t resp = { 0 }; @@ -992,15 +980,9 @@ void *neu_msg_gen(neu_reqresp_head_t *header, void *data) case NEU_REQ_NODE_CTL: data_size = sizeof(neu_req_node_ctl_t); break; - case NEU_REQ_GET_NODE_STAT: - data_size = sizeof(neu_req_get_node_stat_t); - break; case NEU_REQ_GET_NODE_STATE: data_size = sizeof(neu_req_get_node_state_t); break; - case NEU_RESP_GET_NODE_STAT: - data_size = sizeof(neu_resp_get_node_stat_t); - break; case NEU_RESP_GET_NODE_STATE: data_size = sizeof(neu_resp_get_node_state_t); break; diff --git a/src/core/manager.c b/src/core/manager.c index f252f113..b1dff0b2 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -486,7 +486,6 @@ static int manager_loop(enum neu_event_io_type type, int fd, void *usr_data) case NEU_REQ_GET_NODE_SETTING: case NEU_REQ_READ_GROUP: case NEU_REQ_WRITE_TAG: - case NEU_REQ_GET_NODE_STAT: case NEU_REQ_GET_NODE_STATE: case NEU_REQ_GET_TAG: case NEU_REQ_NODE_CTL: @@ -583,7 +582,6 @@ static int manager_loop(enum neu_event_io_type type, int fd, void *usr_data) case NEU_RESP_GET_TAG: case NEU_RESP_GET_GROUP: case NEU_RESP_GET_NODE_SETTING: - case NEU_RESP_GET_NODE_STAT: case NEU_RESP_GET_NODE_STATE: case NEU_RESP_ERROR: case NEU_RESP_READ_GROUP: