nat: use correct data types for memory sizes

[vpp.git] / src / plugins / lacp / ptx_machine.c

diff --git a/src/plugins/lacp/ptx_machine.c b/src/plugins/lacp/ptx_machine.c
index 7e604cc..bd4150f 100644 (file)
--- a/src/plugins/lacp/ptx_machine.c
+++ b/src/plugins/lacp/ptx_machine.c
@@ -74,8 +74,8 @@ lacp_machine_t lacp_ptx_machine = {
 int
 lacp_ptx_action_no_periodic (void *p1, void *p2)
 {
-  vlib_main_t *vm = (vlib_main_t *) p1;
-  slave_if_t *sif = (slave_if_t *) p2;
+  vlib_main_t *vm = p1;
+  slave_if_t *sif = p2;
 
   lacp_stop_timer (&sif->periodic_timer);
   lacp_ptx_post_short_timeout_event (vm, sif);
@@ -85,8 +85,8 @@ lacp_ptx_action_no_periodic (void *p1, void *p2)
 int
 lacp_ptx_action_slow_periodic (void *p1, void *p2)
 {
-  vlib_main_t *vm = (vlib_main_t *) p1;
-  slave_if_t *sif = (slave_if_t *) p2;
+  vlib_main_t *vm = p1;
+  slave_if_t *sif = p2;
   u8 timer_expired;
   lacp_main_t *lm = &lacp_main;
 
@@ -115,8 +115,8 @@ lacp_ptx_action_slow_periodic (void *p1, void *p2)
 int
 lacp_ptx_action_fast_periodic (void *p1, void *p2)
 {
-  vlib_main_t *vm = (vlib_main_t *) p1;
-  slave_if_t *sif = (slave_if_t *) p2;
+  vlib_main_t *vm = p1;
+  slave_if_t *sif = p2;
   u8 timer_expired;
   lacp_main_t *lm = &lacp_main;
 
@@ -150,8 +150,8 @@ lacp_ptx_action_fast_periodic (void *p1, void *p2)
 int
 lacp_ptx_action_timer_expired (void *p1, void *p2)
 {
-  vlib_main_t *vm = (vlib_main_t *) p1;
-  slave_if_t *sif = (slave_if_t *) p2;
+  vlib_main_t *vm = p1;
+  slave_if_t *sif = p2;
 
   if (!(sif->partner.state & LACP_STATE_LACP_ACTIVITY) &&
       !(sif->actor.state & LACP_STATE_LACP_ACTIVITY))
@@ -183,8 +183,7 @@ format_ptx_event (u8 * s, va_list * args)
     {.str = NULL}
   };
   int e = va_arg (*args, int);
-  lacp_event_struct *event_entry =
-    (lacp_event_struct *) & lacp_ptx_event_array;
+  lacp_event_struct *event_entry = lacp_ptx_event_array;
 
   if (e >= (sizeof (lacp_ptx_event_array) / sizeof (*event_entry)))
     s = format (s, "Bad event %d", e);
@@ -198,11 +197,26 @@ void
 lacp_ptx_debug_func (slave_if_t * sif, int event, int state,
                     lacp_fsm_state_t * transition)
 {
-  clib_warning ("%U-PTX: event %U, old state %U, new state %U",
-               format_vnet_sw_if_index_name, vnet_get_main (),
-               sif->sw_if_index, format_ptx_event,
-               event, format_ptx_sm_state, state, format_ptx_sm_state,
-               transition->next_state);
+  vlib_worker_thread_t *w = vlib_worker_threads + os_get_thread_index ();
+  /* *INDENT-OFF* */
+  ELOG_TYPE_DECLARE (e) =
+    {
+      .format = "%s",
+      .format_args = "T4",
+    };
+  /* *INDENT-ON* */
+  struct
+  {
+    u32 event;
+  } *ed = 0;
+
+  ed = ELOG_TRACK_DATA (&vlib_global_main.elog_main, e, w->elog_track);
+  ed->event =
+    elog_string (&vlib_global_main.elog_main, "%U-PTX: %U, %U->%U%c",
+                format_vnet_sw_if_index_name, vnet_get_main (),
+                sif->sw_if_index, format_ptx_event, event,
+                format_ptx_sm_state, state, format_ptx_sm_state,
+                transition->next_state, 0);
 }
 
 void