Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Flow: Rename IPFIX exporter.
[vpp.git]
/
src
/
plugins
/
ioam
/
export-common
/
ioam_export.h
diff --git
a/src/plugins/ioam/export-common/ioam_export.h
b/src/plugins/ioam/export-common/ioam_export.h
index
e84dab0
..
36d71d2
100644
(file)
--- a/
src/plugins/ioam/export-common/ioam_export.h
+++ b/
src/plugins/ioam/export-common/ioam_export.h
@@
-21,8
+21,8
@@
#include <vnet/ip/ip4_packet.h>
#include <vnet/ip/ip6_packet.h>
#include <vnet/ip/ip6_hop_by_hop.h>
#include <vnet/ip/ip4_packet.h>
#include <vnet/ip/ip6_packet.h>
#include <vnet/ip/ip6_hop_by_hop.h>
-#include <vnet/
i
p/udp.h>
-#include <vnet/
flow
/ipfix_packet.h>
+#include <vnet/
ud
p/udp.h>
+#include <vnet/
ipfix-export
/ipfix_packet.h>
#include <vppinfra/pool.h>
#include <vppinfra/hash.h>
#include <vppinfra/pool.h>
#include <vppinfra/hash.h>
@@
-33,6
+33,8
@@
typedef struct ioam_export_buffer
{
typedef struct ioam_export_buffer
{
+ /** Required for pool_get_aligned */
+ CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
/* Allocated buffer */
u32 buffer_index;
u64 touched_at;
/* Allocated buffer */
u32 buffer_index;
u64 touched_at;
@@
-76,11
+78,6
@@
typedef struct
u32 export_process_node_index;
} ioam_export_main_t;
u32 export_process_node_index;
} ioam_export_main_t;
-extern ioam_export_main_t ioam_export_main;
-extern ioam_export_main_t vxlan_gpe_ioam_export_main;
-
-extern vlib_node_registration_t export_node;
-extern vlib_node_registration_t vxlan_export_node;
#define DEFAULT_EXPORT_SIZE (3 * CLIB_CACHE_LINE_BYTES)
/*
#define DEFAULT_EXPORT_SIZE (3 * CLIB_CACHE_LINE_BYTES)
/*
@@
-482,8
+479,8
@@
do { \
from = vlib_frame_vector_args (F); \
n_left_from = (F)->n_vectors; \
next_index = (N)->cached_next_index; \
from = vlib_frame_vector_args (F); \
n_left_from = (F)->n_vectors; \
next_index = (N)->cached_next_index; \
- while (__sync_lock_test_and_set ((EM)->lockp[(VM)->
cpu_index], 1));
\
- my_buf = ioam_export_get_my_buffer (EM, (VM)->
cpu_index);
\
+ while (__sync_lock_test_and_set ((EM)->lockp[(VM)->
thread_index], 1));
\
+ my_buf = ioam_export_get_my_buffer (EM, (VM)->
thread_index);
\
my_buf->touched_at = vlib_time_now (VM); \
while (n_left_from > 0) \
{ \
my_buf->touched_at = vlib_time_now (VM); \
while (n_left_from > 0) \
{ \
@@
-625,7
+622,7
@@
do { \
} \
vlib_node_increment_counter (VM, export_node.index, \
EXPORT_ERROR_RECORDED, pkts_recorded); \
} \
vlib_node_increment_counter (VM, export_node.index, \
EXPORT_ERROR_RECORDED, pkts_recorded); \
- *(EM)->lockp[(VM)->
cpu_index] = 0;
\
+ *(EM)->lockp[(VM)->
thread_index] = 0;
\
} while(0)
#endif /* __included_ioam_export_h__ */
} while(0)
#endif /* __included_ioam_export_h__ */