hsa: proxy listener support addition of fifo segments

[vpp.git] / src / plugins / wireguard / wireguard_timer.c

diff --git a/src/plugins/wireguard/wireguard_timer.c b/src/plugins/wireguard/wireguard_timer.c
old mode 100755 (executable)
new mode 100644 (file)
index b7fd689..b245b85
--- a/src/plugins/wireguard/wireguard_timer.c
+++ b/src/plugins/wireguard/wireguard_timer.c
@@ -62,7 +62,6 @@ start_timer_thread_fn (void *arg)
 {
   wg_timers_args *a = arg;
   wg_peer_t *peer = wg_peer_get (a->peer_idx);
-
   start_timer (peer, a->timer_id, a->interval_ticks);
   return 0;
 }
@@ -75,8 +74,11 @@ start_timer_from_mt (u32 peer_idx, u32 timer_id, u32 interval_ticks)
     .timer_id = timer_id,
     .interval_ticks = interval_ticks,
   };
-
-  vl_api_rpc_call_main_thread (start_timer_thread_fn, (u8 *) & a, sizeof (a));
+  wg_peer_t *peer = wg_peer_get (peer_idx);
+  if (PREDICT_FALSE (!peer->timers_dispatched[timer_id]))
+    if (!clib_atomic_cmp_and_swap (&peer->timers_dispatched[timer_id], 0, 1))
+      vl_api_rpc_call_main_thread (start_timer_thread_fn, (u8 *) &a,
+                                  sizeof (a));
 }
 
 static inline u32
@@ -295,6 +297,9 @@ expired_timer_callback (u32 * expired_timers)
 
       peer = wg_peer_get (pool_index);
       peer->timers[timer_id] = ~0;
+
+      /* Under barrier, no sync needed */
+      peer->timers_dispatched[timer_id] = 0;
     }
 
   for (i = 0; i < vec_len (expired_timers); i++)
@@ -334,7 +339,6 @@ wg_timer_wheel_init ()
   tw_timer_wheel_init_16t_2w_512sl (tw,
                                    expired_timer_callback,
                                    WG_TICK /* timer period in s */ , ~0);
-  tw->last_run_time = vlib_time_now (wmp->vlib_main);
 }
 
 static uword
@@ -342,6 +346,28 @@ wg_timer_mngr_fn (vlib_main_t * vm, vlib_node_runtime_t * rt,
                  vlib_frame_t * f)
 {
   wg_main_t *wmp = &wg_main;
+  uword event_type = 0;
+
+  /* Park the process until the feature is configured */
+  while (1)
+    {
+      vlib_process_wait_for_event (vm);
+      event_type = vlib_process_get_events (vm, 0);
+      if (event_type == WG_START_EVENT)
+       {
+         break;
+       }
+      else
+       {
+         clib_warning ("Unknown event type %d", event_type);
+       }
+    }
+  /*
+   * Reset the timer wheel time so it won't try to
+   * expire Avogadro's number of time slots.
+   */
+  wmp->timer_wheel.last_run_time = vlib_time_now (vm);
+
   while (1)
     {
       vlib_process_wait_for_event_or_clock (vm, WG_TICK);
@@ -377,6 +403,18 @@ VLIB_REGISTER_NODE (wg_timer_mngr_node, static) = {
 };
 /* *INDENT-ON* */
 
+void
+wg_feature_init (wg_main_t * wmp)
+{
+  if (wmp->feature_init)
+    return;
+  vlib_process_signal_event (wmp->vlib_main, wg_timer_mngr_node.index,
+                            WG_START_EVENT, 0);
+  wmp->feature_init = 1;
+}
+
+
+
 /*
  * fd.io coding-style-patch-verification: ON
  *