X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvppinfra%2Ftw_timer_template.h;h=f77b64e091405c4d43a4afc407cfd6f35911d0a3;hb=2de9c0f92;hp=76755609451c76336f8105c7b19a8c7ec697d485;hpb=4af9ba1dabe3dbd4a2dd3d8c71434477c5ea81b9;p=vpp.git

diff --git a/src/vppinfra/tw_timer_template.h b/src/vppinfra/tw_timer_template.h
index 76755609451..f77b64e0914 100644
--- a/src/vppinfra/tw_timer_template.h
+++ b/src/vppinfra/tw_timer_template.h
@@ -19,6 +19,7 @@
 
 #include <vppinfra/clib.h>
 #include <vppinfra/pool.h>
+#include <vppinfra/bitmap.h>
 
 #ifndef _twt
 #define _twt(a,b) a##b##_t
@@ -169,6 +170,13 @@ typedef enum
 } tw_ring_index_t;
 #endif /* __defined_tw_timer_wheel_slot__ */
 
+typedef CLIB_PACKED (struct
+		     {
+		     u8 timer_id;
+		     u32 pool_index;
+		     u32 handle;
+		     }) TWT (trace);
+
 typedef struct
 {
   /** Timer pool */
@@ -189,9 +197,6 @@ typedef struct
   /** current tick */
   u64 current_tick;
 
-  /** first expiration time */
-  u64 first_expires_tick;
-
   /** current wheel indices */
   u32 current_index[TW_TIMER_WHEELS];
 
@@ -202,20 +207,37 @@ typedef struct
   tw_timer_wheel_slot_t overflow;
 #endif
 
+#if TW_FAST_WHEEL_BITMAP > 0
+  /** Fast wheel slot occupancy bitmap */
+  uword *fast_slot_bitmap;
+#endif
+
   /** expired timer callback, receives a vector of handles */
   void (*expired_timer_callback) (u32 * expired_timer_handles);
 
-  /** vector of expired timers */
+  /** vectors of expired timers */
   u32 *expired_timer_handles;
 
   /** maximum expirations */
   u32 max_expirations;
+
+  /** current trace index */
+#if TW_START_STOP_TRACE_SIZE > 0
+  /* Start/stop/expire tracing */
+  u32 trace_index;
+  u32 trace_wrapped;
+    TWT (trace) traces[TW_START_STOP_TRACE_SIZE];
+#endif
+
 } TWT (tw_timer_wheel);
 
 u32 TW (tw_timer_start) (TWT (tw_timer_wheel) * tw,
 			 u32 pool_index, u32 timer_id, u64 interval);
 
 void TW (tw_timer_stop) (TWT (tw_timer_wheel) * tw, u32 handle);
+int TW (tw_timer_handle_is_free) (TWT (tw_timer_wheel) * tw, u32 handle);
+void TW (tw_timer_update) (TWT (tw_timer_wheel) * tw, u32 handle,
+			   u64 interval);
 
 void TW (tw_timer_wheel_init) (TWT (tw_timer_wheel) * tw,
 			       void *expired_timer_callback,
@@ -226,6 +248,15 @@ void TW (tw_timer_wheel_free) (TWT (tw_timer_wheel) * tw);
 u32 *TW (tw_timer_expire_timers) (TWT (tw_timer_wheel) * tw, f64 now);
 u32 *TW (tw_timer_expire_timers_vec) (TWT (tw_timer_wheel) * tw, f64 now,
 				      u32 * vec);
+#if TW_FAST_WHEEL_BITMAP
+u32 TW (tw_timer_first_expires_in_ticks) (TWT (tw_timer_wheel) * tw);
+#endif
+
+#if TW_START_STOP_TRACE_SIZE > 0
+void TW (tw_search_trace) (TWT (tw_timer_wheel) * tw, u32 handle);
+void TW (tw_timer_trace) (TWT (tw_timer_wheel) * tw, u32 timer_id,
+			  u32 pool_index, u32 handle);
+#endif
 
 /*
  * fd.io coding-style-patch-verification: ON