zebra: Convert time to uint64_t for zclient data structures

Signed-off-by: Donald Sharp <sharpd@nvidia.com>

diff --git a/zebra/zserv.c b/zebra/zserv.c
index f76b29deff94b1b1dc7a5092a5555cb9eeb65841..ebe246ffbcc127542d08c23bb89ca34353a6ebd3 100644 (file)
--- a/zebra/zserv.c
+++ b/zebra/zserv.c
@@ -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 */

diff --git a/zebra/zserv.h b/zebra/zserv.h
index 9986cc9f7e3cf7f6e8963216f92b665290bf0260..db7b70d7c45fe4d96d9c503ac48dc391f50c0db8 100644 (file)
--- a/zebra/zserv.h
+++ b/zebra/zserv.h
@@ -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