proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-10-30 17:34:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib, zebra: Convert THREAD_TIMER_STRLEN to EVENT_TIMER_STRLEN

Browse Source 
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
Donald Sharp 2022-12-11 11:39:09 -05:00
parent 04ec66797c
commit 70d4d90c82
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/event.h
View File

@ -147,10 +147,10 @@ struct cpu_event_history {
/* Struct timeval's tv_usec one second value. */ /* Struct timeval's tv_usec one second value. */
#define TIMER_SECOND_MICRO 1000000L #define TIMER_SECOND_MICRO 1000000L
/* Thread yield time. */ /* Event yield time. */
#define EVENT_YIELD_TIME_SLOT 10 * 1000L /* 10ms */ #define EVENT_YIELD_TIME_SLOT 10 * 1000L /* 10ms */
#define THREAD_TIMER_STRLEN 12 #define EVENT_TIMER_STRLEN 12
/* Macros. */ /* Macros. */
#define THREAD_ARG(X) ((X)->arg) #define THREAD_ARG(X) ((X)->arg)

2
zebra/zebra_evpn_mac.c
View File

@ -615,7 +615,7 @@ void zebra_evpn_print_mac(struct zebra_mac *mac, void *ctxt, json_object *json)
struct zebra_vrf *zvrf; struct zebra_vrf *zvrf;
struct timeval detect_start_time = {0, 0}; struct timeval detect_start_time = {0, 0};
char timebuf[MONOTIME_STRLEN]; char timebuf[MONOTIME_STRLEN];
char thread_buf[THREAD_TIMER_STRLEN]; char thread_buf[EVENT_TIMER_STRLEN];
time_t uptime; time_t uptime;
char up_str[MONOTIME_STRLEN]; char up_str[MONOTIME_STRLEN];

6
zebra/zebra_evpn_mh.c
View File

@ -3139,7 +3139,7 @@ static void zebra_evpn_es_show_entry_detail(struct vty *vty,
char alg_buf[EVPN_DF_ALG_STR_LEN]; char alg_buf[EVPN_DF_ALG_STR_LEN];
struct zebra_evpn_es_vtep *es_vtep; struct zebra_evpn_es_vtep *es_vtep;
struct listnode *node; struct listnode *node;
char thread_buf[THREAD_TIMER_STRLEN]; char thread_buf[EVENT_TIMER_STRLEN];
if (json) { if (json) {
json_object *json_vteps; json_object *json_vteps;
@ -3522,7 +3522,7 @@ DEFPY(zebra_evpn_mh_uplink, zebra_evpn_mh_uplink_cmd, "[no] evpn mh uplink",
void zebra_evpn_mh_json(json_object *json) void zebra_evpn_mh_json(json_object *json)
{ {
json_object *json_array; json_object *json_array;
char thread_buf[THREAD_TIMER_STRLEN]; char thread_buf[EVENT_TIMER_STRLEN];
json_object_int_add(json, "macHoldtime", zmh_info->mac_hold_time); json_object_int_add(json, "macHoldtime", zmh_info->mac_hold_time);
json_object_int_add(json, "neighHoldtime", zmh_info->neigh_hold_time); json_object_int_add(json, "neighHoldtime", zmh_info->neigh_hold_time);
@ -3555,7 +3555,7 @@ void zebra_evpn_mh_json(json_object *json)
void zebra_evpn_mh_print(struct vty *vty) void zebra_evpn_mh_print(struct vty *vty)
{ {
char pd_buf[ZEBRA_PROTODOWN_RC_STR_LEN]; char pd_buf[ZEBRA_PROTODOWN_RC_STR_LEN];
char thread_buf[THREAD_TIMER_STRLEN]; char thread_buf[EVENT_TIMER_STRLEN];
vty_out(vty, "EVPN MH:\n"); vty_out(vty, "EVPN MH:\n");
vty_out(vty, " mac-holdtime: %ds, neigh-holdtime: %ds\n", vty_out(vty, " mac-holdtime: %ds, neigh-holdtime: %ds\n",

2
zebra/zebra_evpn_neigh.c
View File

@ -1706,7 +1706,7 @@ void zebra_evpn_print_neigh(struct zebra_neigh *n, void *ctxt,
struct zebra_vrf *zvrf = NULL; struct zebra_vrf *zvrf = NULL;
struct timeval detect_start_time = {0, 0}; struct timeval detect_start_time = {0, 0};
char timebuf[MONOTIME_STRLEN]; char timebuf[MONOTIME_STRLEN];
char thread_buf[THREAD_TIMER_STRLEN]; char thread_buf[EVENT_TIMER_STRLEN];
time_t uptime; time_t uptime;
char up_str[MONOTIME_STRLEN]; char up_str[MONOTIME_STRLEN];