GithubStar/neuron
1
0
Fork 0
mirror of https://github.com/emqx/neuron.git synced 2026-10-28 14:07:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #848 from eeff/eeff/refactor

Browse Source 
fix(restful): node state api rename `avg_rtt` to `rtt`
This commit is contained in:
fengzeroz
2022-10-21 09:37:45 +08:00
committed by GitHub
parent f893947e74 4f418c41a7
commit 0b44bc56d1
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/neuron/adapter.h
+2 -2
View File
@@ -356,7 +356,7 @@ typedef struct neu_req_get_node_state {
typedef struct neu_resp_get_node_state {
neu_node_state_t state;
uint16_t avg_rtt; // average round trip time in milliseconds
uint16_t rtt; // round trip time in milliseconds
} neu_resp_get_node_state_t;
typedef struct neu_req_get_nodes_state {
@@ -365,7 +365,7 @@ typedef struct neu_req_get_nodes_state {
typedef struct {
char node[NEU_NODE_NAME_LEN];
neu_node_state_t state;
uint16_t avg_rtt; // average round trip time in milliseconds
uint16_t rtt; // round trip time in milliseconds
} neu_nodes_state_t;
inline static UT_icd neu_nodes_state_t_icd()
plugins/restful/adapter_handle.c
+2 -2
View File
@@ -258,7 +258,7 @@ void handle_get_node_state_resp(nng_aio *aio, neu_resp_get_node_state_t *state)
res.link = state->state.link;
res.running = state->state.running;
res.avg_rtt = state->avg_rtt;
res.rtt = state->rtt;
neu_json_encode_by_fn(&res, neu_json_encode_get_node_state_resp, &result);
@@ -282,7 +282,7 @@ void handle_get_nodes_state_resp(nng_aio * aio,
states_res.nodes[index].name = state->node;
states_res.nodes[index].running = state->state.running;
states_res.nodes[index].link = state->state.link;
states_res.nodes[index].avg_rtt = state->avg_rtt;
states_res.nodes[index].rtt = state->rtt;
}
neu_json_encode_by_fn(&states_res, neu_json_encode_get_nodes_state_resp,
src/adapter/adapter.c
+1 -1
View File
@@ -434,7 +434,7 @@ static int adapter_loop(enum neu_event_io_type type, int fd, void *usr_data)
if (NULL != adapter->metrics) {
HASH_FIND_STR(adapter->metrics->entries, NEU_METRIC_LAST_RTT_MS, e);
}
resp.avg_rtt = NULL != e ? e->value : 0;
resp.rtt = NULL != e ? e->value : 0;
resp.state = neu_adapter_get_state(adapter);
header->type = NEU_RESP_GET_NODE_STATE;
neu_msg_exchange(header);
src/core/node_manager.c
+1 -1
View File
@@ -308,7 +308,7 @@ UT_array *neu_node_manager_get_state(neu_node_manager_t *mgr)
HASH_FIND_STR(el->adapter->metrics->entries,
NEU_METRIC_LAST_RTT_MS, e);
}
state.avg_rtt = NULL != e ? e->value : 0;
state.rtt = NULL != e ? e->value : 0;
utarray_push_back(states, &state);
}
src/parser/neu_json_node.c
+4 -4
View File
@@ -140,9 +140,9 @@ int neu_json_encode_get_node_state_resp(void *json_object, void *param)
.v.val_int = resp->link,
},
{
.name = "average_rtt",
.name = "rtt",
.t = NEU_JSON_INT,
.v.val_int = resp->avg_rtt,
.v.val_int = resp->rtt,
} };
ret = neu_json_encode_field(json_object, resp_elems,
NEU_JSON_ELEM_SIZE(resp_elems));
@@ -176,9 +176,9 @@ int neu_json_encode_get_nodes_state_resp(void *json_object, void *param)
.v.val_int = p_node->link,
},
{
.name = "average_rtt",
.name = "rtt",
.t = NEU_JSON_INT,
.v.val_int = p_node->avg_rtt,
.v.val_int = p_node->rtt,
},
};
node_array = neu_json_encode_array(node_array, node_elems,
src/parser/neu_json_node.h
+2 -2
View File
@@ -49,7 +49,7 @@ void neu_json_decode_del_node_req_free(neu_json_del_node_req_t *req);
typedef struct {
int64_t running;
int64_t link;
int64_t avg_rtt;
int64_t rtt;
} neu_json_get_node_state_resp_t;
int neu_json_encode_get_node_state_resp(void *json_object, void *param);
@@ -58,7 +58,7 @@ typedef struct {
char * name;
int64_t running;
int64_t link;
int64_t avg_rtt;
int64_t rtt;
} neu_json_get_nodes_state_t;
typedef struct {