nat: use correct data types for memory sizes

[vpp.git] / src / plugins / ioam / analyse / ioam_summary_export.c

diff --git a/src/plugins/ioam/analyse/ioam_summary_export.c b/src/plugins/ioam/analyse/ioam_summary_export.c
index 9a2667f..12907d8 100644 (file)
--- a/src/plugins/ioam/analyse/ioam_summary_export.c
+++ b/src/plugins/ioam/analyse/ioam_summary_export.c
@@ -21,7 +21,9 @@
 u8 *
 ioam_template_rewrite (flow_report_main_t * frm, flow_report_t * fr,
                       ip4_address_t * collector_address,
-                      ip4_address_t * src_address, u16 collector_port)
+                      ip4_address_t * src_address, u16 collector_port,
+                      ipfix_report_element_t * elts,
+                      u32 n_elts, u32 * stream_index)
 {
   ip4_header_t *ip;
   udp_header_t *udp;
@@ -148,8 +150,7 @@ ioam_analyse_add_ipfix_record (flow_report_t * fr,
                               ip6_address_t * src, ip6_address_t * dst,
                               u16 src_port, u16 dst_port)
 {
-  while (__sync_lock_test_and_set (record->writer_lock, 1))
-    ;
+  clib_spinlock_lock (&record->writer_lock);
 
   int field_index = 0;
   u16 tmp;
@@ -257,7 +258,7 @@ ioam_analyse_add_ipfix_record (flow_report_t * fr,
   *(record->chached_data_list) = *record;
   record->chached_data_list->chached_data_list = NULL;
 
-  *(record->writer_lock) = 0;
+  clib_spinlock_unlock (&record->writer_lock);
   return offset;
 }
 
@@ -286,7 +287,7 @@ ioam_send_flows (flow_report_main_t * frm, flow_report_t * fr,
 
   stream = &frm->streams[fr->stream_index];
 
-  memset (&temp, 0, sizeof (ip6_address_t));
+  clib_memset (&temp, 0, sizeof (ip6_address_t));
 
   aggregated_data = ioam_analyser_main.aggregated_data;
   data_len = vec_len (aggregated_data);
@@ -398,14 +399,15 @@ ioam_flow_create (u8 del)
   int rv;
   u32 domain_id = 0;
   flow_report_main_t *frm = &flow_report_main;
+  u16 template_id;
 
-  memset (&args, 0, sizeof (args));
+  clib_memset (&args, 0, sizeof (args));
   args.rewrite_callback = ioam_template_rewrite;
   args.flow_data_callback = ioam_send_flows;
   del ? (args.is_add = 0) : (args.is_add = 1);
   args.domain_id = domain_id;
 
-  rv = vnet_flow_report_add_del (frm, &args);
+  rv = vnet_flow_report_add_del (frm, &args, &template_id);
 
   switch (rv)
     {
@@ -424,15 +426,15 @@ ioam_flow_create (u8 del)
 clib_error_t *
 ioam_flow_report_init (vlib_main_t * vm)
 {
-  clib_error_t *error;
-
-  if ((error = vlib_call_init_function (vm, flow_report_init)))
-    return error;
-
   return 0;
 }
 
-VLIB_INIT_FUNCTION (ioam_flow_report_init);
+/* *INDENT-OFF* */
+VLIB_INIT_FUNCTION (ioam_flow_report_init) =
+{
+  .runs_after = VLIB_INITS("flow_report_init"),
+};
+/* *INDENT-ON* */
 
 /*
  * fd.io coding-style-patch-verification: ON