session: fix coverity warning 13/31913/2
authorFlorin Coras <fcoras@cisco.com>
Tue, 6 Apr 2021 22:54:14 +0000 (15:54 -0700)
committerDamjan Marion <dmarion@me.com>
Wed, 7 Apr 2021 11:58:03 +0000 (11:58 +0000)
Type: fix

Signed-off-by: Florin Coras <fcoras@cisco.com>
Change-Id: Id2c06f49bcae1a26a2d16d58f9da7a4d3175bf3c

src/vnet/session/session.h
src/vnet/session/session_node.c

index 93278d6..a05ecb4 100644 (file)
@@ -104,7 +104,7 @@ typedef struct session_worker_
   u32 **session_to_enqueue;
 
   /** Timerfd used to periodically signal wrk session queue node */
-  u32 timerfd;
+  int timerfd;
 
   /** Worker flags */
   session_wrk_flag_t flags;
index d7adbb5..d40411c 100644 (file)
@@ -1445,7 +1445,7 @@ session_wrk_tfd_timeout (session_wrk_state_t state, u32 thread_index)
 }
 
 static inline void
-session_wrk_state_update (session_worker_t *wrk, session_wrk_state_t state)
+session_wrk_set_state (session_worker_t *wrk, session_wrk_state_t state)
 {
   u64 time_ns;
 
@@ -1464,7 +1464,7 @@ session_wrk_update_state (session_worker_t *wrk)
       if (pool_elts (wrk->event_elts) == 3 &&
          vlib_last_vectors_per_main_loop (vm) < 1)
        {
-         session_wrk_state_update (wrk, SESSION_WRK_INTERRUPT);
+         session_wrk_set_state (wrk, SESSION_WRK_INTERRUPT);
          vlib_node_set_state (vm, session_queue_node.index,
                               VLIB_NODE_STATE_INTERRUPT);
        }
@@ -1474,20 +1474,20 @@ session_wrk_update_state (session_worker_t *wrk)
       if (pool_elts (wrk->event_elts) > 3 ||
          vlib_last_vectors_per_main_loop (vm) > 1)
        {
-         session_wrk_state_update (wrk, SESSION_WRK_POLLING);
+         session_wrk_set_state (wrk, SESSION_WRK_POLLING);
          vlib_node_set_state (vm, session_queue_node.index,
                               VLIB_NODE_STATE_POLLING);
        }
       else if (PREDICT_FALSE (!pool_elts (wrk->sessions)))
        {
-         session_wrk_state_update (wrk, SESSION_WRK_IDLE);
+         session_wrk_set_state (wrk, SESSION_WRK_IDLE);
        }
     }
   else
     {
       if (pool_elts (wrk->event_elts))
        {
-         session_wrk_state_update (wrk, SESSION_WRK_INTERRUPT);
+         session_wrk_set_state (wrk, SESSION_WRK_INTERRUPT);
        }
     }
 }