Ede_Vau
/
frr
mirror of https://github.com/FRRouting/frr.git
1
1
Fork 0
Code Issues Releases Wiki Activity

zebra: Convert time to uint64_t for zclient data structures 

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
Donald Sharp 2022-08-17 18:58:50 -04:00
parent bce18b18fe
commit ef03888333
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
zebra/zserv.c
View File

@ -228,8 +228,7 @@ static void zserv_write(struct thread *thread)
case BUFFER_ERROR:
goto zwrite_fail;
case BUFFER_PENDING:
atomic_store_explicit(&client->last_write_time,
(uint32_t)monotime(NULL),
atomic_store_explicit(&client->last_write_time, monotime(NULL),
memory_order_relaxed);
zserv_client_event(client, ZSERV_CLIENT_WRITE);
return;
@ -264,8 +263,7 @@ static void zserv_write(struct thread *thread)
case BUFFER_ERROR:
goto zwrite_fail;
case BUFFER_PENDING:
atomic_store_explicit(&client->last_write_time,
(uint32_t)monotime(NULL),
atomic_store_explicit(&client->last_write_time, monotime(NULL),
memory_order_relaxed);
zserv_client_event(client, ZSERV_CLIENT_WRITE);
return;
@ -276,8 +274,8 @@ static void zserv_write(struct thread *thread)
atomic_store_explicit(&client->last_write_cmd, wcmd,
memory_order_relaxed);
atomic_store_explicit(&client->last_write_time,
(uint32_t)monotime(NULL), memory_order_relaxed);
atomic_store_explicit(&client->last_write_time, monotime(NULL),
memory_order_relaxed);
return;
@ -748,7 +746,7 @@ static struct zserv *zserv_client_create(int sock)
client->wb = buffer_new(0);
TAILQ_INIT(&(client->gr_info_queue));
atomic_store_explicit(&client->connect_time, (uint32_t) monotime(NULL),
atomic_store_explicit(&client->connect_time, monotime(NULL),
memory_order_relaxed);
/* Initialize flags */

10
zebra/zserv.h
View File

@ -216,15 +216,15 @@ struct zserv {
*/
/* monotime of client creation */
_Atomic uint32_t connect_time;
_Atomic uint64_t connect_time;
/* monotime of last message received */
_Atomic uint32_t last_read_time;
_Atomic uint64_t last_read_time;
/* monotime of last message sent */
_Atomic uint32_t last_write_time;
_Atomic uint64_t last_write_time;
/* command code of last message read */
_Atomic uint32_t last_read_cmd;
_Atomic uint64_t last_read_cmd;
/* command code of last message written */
_Atomic uint32_t last_write_cmd;
_Atomic uint64_t last_write_cmd;
/*
* Number of instances configured with