hash: add local variable

[vpp.git] / src / vppinfra / tw_timer_template.c

diff --git a/src/vppinfra/tw_timer_template.c b/src/vppinfra/tw_timer_template.c
index e78c309..6e8a58d 100644 (file)
--- a/src/vppinfra/tw_timer_template.c
+++ b/src/vppinfra/tw_timer_template.c
@@ -292,7 +292,7 @@ timer_add (TWT (tw_timer_wheel) * tw, TWT (tw_timer) * t, u64 interval)
  * @param u64 interval timer interval in ticks
  * @returns handle needed to cancel the timer
  */
-u32
+__clib_export u32
 TW (tw_timer_start) (TWT (tw_timer_wheel) * tw, u32 user_id, u32 timer_id,
                     u64 interval)
 {
@@ -349,7 +349,7 @@ int TW (scan_for_handle) (TWT (tw_timer_wheel) * tw, u32 handle)
  * @param tw_timer_wheel_t * tw timer wheel object pointer
  * @param u32 handle timer cancellation returned by tw_timer_start
  */
-void TW (tw_timer_stop) (TWT (tw_timer_wheel) * tw, u32 handle)
+__clib_export void TW (tw_timer_stop) (TWT (tw_timer_wheel) * tw, u32 handle)
 {
   TWT (tw_timer) * t;
 
@@ -376,7 +376,8 @@ void TW (tw_timer_stop) (TWT (tw_timer_wheel) * tw, u32 handle)
   pool_put_index (tw->timers, handle);
 }
 
-int TW (tw_timer_handle_is_free) (TWT (tw_timer_wheel) * tw, u32 handle)
+__clib_export int
+TW (tw_timer_handle_is_free) (TWT (tw_timer_wheel) * tw, u32 handle)
 {
   return pool_is_free_index (tw->timers, handle);
 }
@@ -387,8 +388,8 @@ int TW (tw_timer_handle_is_free) (TWT (tw_timer_wheel) * tw, u32 handle)
  * @param u32 handle timer returned by tw_timer_start
  * @param u32 interval timer interval in ticks
  */
-void TW (tw_timer_update) (TWT (tw_timer_wheel) * tw, u32 handle,
-                          u64 interval)
+__clib_export void
+TW (tw_timer_update) (TWT (tw_timer_wheel) * tw, u32 handle, u64 interval)
 {
   TWT (tw_timer) * t;
   t = pool_elt_at_index (tw->timers, handle);
@@ -403,7 +404,7 @@ void TW (tw_timer_update) (TWT (tw_timer_wheel) * tw, u32 handle,
  *   expired timer handles. The callback is optional.
  * @param f64 timer_interval_in_seconds
  */
-void
+__clib_export void
 TW (tw_timer_wheel_init) (TWT (tw_timer_wheel) * tw,
                          void *expired_timer_callback,
                          f64 timer_interval_in_seconds, u32 max_expirations)
@@ -423,7 +424,7 @@ TW (tw_timer_wheel_init) (TWT (tw_timer_wheel) * tw,
   tw->ticks_per_second = 1.0 / timer_interval_in_seconds;
 
   vec_validate (tw->expired_timer_handles, 0);
-  _vec_len (tw->expired_timer_handles) = 0;
+  vec_set_len (tw->expired_timer_handles, 0);
 
   for (ring = 0; ring < TW_TIMER_WHEELS; ring++)
     {
@@ -450,7 +451,7 @@ TW (tw_timer_wheel_init) (TWT (tw_timer_wheel) * tw,
  * @brief Free a tw timer wheel template instance
  * @param tw_timer_wheel_t * tw timer wheel object pointer
  */
-void TW (tw_timer_wheel_free) (TWT (tw_timer_wheel) * tw)
+__clib_export void TW (tw_timer_wheel_free) (TWT (tw_timer_wheel) * tw)
 {
   int i, j;
   tw_timer_wheel_slot_t *ts;
@@ -533,23 +534,9 @@ static inline
       return callback_vector_arg;
     }
 
-  /*
-   * Refuse to do anything if we're about to process way too many slots.
-   * Should never come anywhere close to happening, with the possible exception
-   * of cases involving a large forward jump in the timebase.
-   */
-  if (nticks > (1 << (TW_RING_SHIFT + 1)))
-    {
-      if (nticks / tw->ticks_per_second > 100e-3)
-       clib_warning ("Excessive nticks %u at %.6f last run %.6f",
-                     nticks, now, tw->last_run_time);
-      tw->last_run_time = now;
-      return callback_vector_arg;
-    }
-
   if (callback_vector_arg == 0)
     {
-      _vec_len (tw->expired_timer_handles) = 0;
+      vec_set_len (tw->expired_timer_handles, 0);
       callback_vector = tw->expired_timer_handles;
     }
   else
@@ -824,13 +811,14 @@ static inline
   return callback_vector;
 }
 
-u32 *TW (tw_timer_expire_timers) (TWT (tw_timer_wheel) * tw, f64 now)
+__clib_export u32 *TW (tw_timer_expire_timers) (TWT (tw_timer_wheel) * tw,
+                                               f64 now)
 {
   return TW (tw_timer_expire_timers_internal) (tw, now, 0 /* no vector */ );
 }
 
-u32 *TW (tw_timer_expire_timers_vec) (TWT (tw_timer_wheel) * tw, f64 now,
-                                     u32 * vec)
+__clib_export u32 *TW (tw_timer_expire_timers_vec) (TWT (tw_timer_wheel) * tw,
+                                                   f64 now, u32 * vec)
 {
   return TW (tw_timer_expire_timers_internal) (tw, now, vec);
 }
@@ -843,7 +831,8 @@ u32 *TW (tw_timer_expire_timers_vec) (TWT (tw_timer_wheel) * tw, f64 now,
  * when timers are removed from fast wheel slots.
  */
 
-u32 TW (tw_timer_first_expires_in_ticks) (TWT (tw_timer_wheel) * tw)
+__clib_export u32
+TW (tw_timer_first_expires_in_ticks) (TWT (tw_timer_wheel) * tw)
 {
   u32 first_expiring_index, fast_ring_index;
   i32 delta;