Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
API: Change ip4_address and ip6_address to use type alias.
[vpp.git]
/
src
/
plugins
/
ioam
/
analyse
/
ioam_analyse.h
diff --git
a/src/plugins/ioam/analyse/ioam_analyse.h
b/src/plugins/ioam/analyse/ioam_analyse.h
index
3e04c1c
..
3aec7a7
100644
(file)
--- a/
src/plugins/ioam/analyse/ioam_analyse.h
+++ b/
src/plugins/ioam/analyse/ioam_analyse.h
@@
-21,6
+21,7
@@
#include <vppinfra/types.h>
#include <ioam/lib-e2e/e2e_util.h>
#include <ioam/lib-trace/trace_util.h>
#include <vppinfra/types.h>
#include <ioam/lib-e2e/e2e_util.h>
#include <ioam/lib-trace/trace_util.h>
+#include <ioam/lib-trace/trace_config.h>
#define IOAM_FLOW_TEMPLATE_ID 260
#define IOAM_TRACE_MAX_NODES 10
#define IOAM_FLOW_TEMPLATE_ID 260
#define IOAM_TRACE_MAX_NODES 10
@@
-95,6
+96,8
@@
typedef struct
*/
typedef struct ioam_analyser_data_t_
{
*/
typedef struct ioam_analyser_data_t_
{
+ CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
+
u8 is_free;
u8 pad[3];
u8 is_free;
u8 pad[3];
@@
-188,7
+191,7
@@
ip6_ioam_analyse_set_paths_down (ioam_analyser_data_t * data)
ioam_path_map_t *path;
u8 k, i;
ioam_path_map_t *path;
u8 k, i;
- while (
__sync_lock_test_and_set (data->writer_lock, 1
))
+ while (
clib_atomic_test_and_set (data->writer_lock
))
;
trace_data = &data->trace_data;
;
trace_data = &data->trace_data;
@@
-205,7
+208,7
@@
ip6_ioam_analyse_set_paths_down (ioam_analyser_data_t * data)
for (k = 0; k < trace_record->num_nodes; k++)
path[k].state_up = 0;
}
for (k = 0; k < trace_record->num_nodes; k++)
path[k].state_up = 0;
}
-
*(data->writer_lock) = 0
;
+
clib_atomic_release (data->writer_lock)
;
}
always_inline void
}
always_inline void
@@
-222,7
+225,7
@@
ip6_ioam_analyse_hbh_trace_loopback (ioam_analyser_data_t * data,
u16 size_of_traceopt_per_node;
u16 size_of_all_traceopts;
u16 size_of_traceopt_per_node;
u16 size_of_all_traceopts;
- while (
__sync_lock_test_and_set (data->writer_lock, 1
))
+ while (
clib_atomic_test_and_set (data->writer_lock
))
;
trace_data = &data->trace_data;
;
trace_data = &data->trace_data;
@@
-274,7
+277,7
@@
ip6_ioam_analyse_hbh_trace_loopback (ioam_analyser_data_t * data,
}
}
end:
}
}
end:
-
*(data->writer_lock) = 0
;
+
clib_atomic_release (data->writer_lock)
;
}
always_inline int
}
always_inline int
@@
-292,7
+295,7
@@
ip6_ioam_analyse_hbh_trace (ioam_analyser_data_t * data,
ioam_path_map_t *path = NULL;
ioam_analyse_trace_record *trace_record;
ioam_path_map_t *path = NULL;
ioam_analyse_trace_record *trace_record;
- while (
__sync_lock_test_and_set (data->writer_lock, 1
))
+ while (
clib_atomic_test_and_set (data->writer_lock
))
;
trace_data = &data->trace_data;
;
trace_data = &data->trace_data;
@@
-406,7
+409,7
@@
found_match:
(u32) ((sum + delay) / (data->seqno_data.rx_packets + 1));
}
DONE:
(u32) ((sum + delay) / (data->seqno_data.rx_packets + 1));
}
DONE:
-
*(data->writer_lock) = 0
;
+
clib_atomic_release (data->writer_lock)
;
return 0;
}
return 0;
}
@@
-414,13
+417,14
@@
always_inline int
ip6_ioam_analyse_hbh_e2e (ioam_analyser_data_t * data,
ioam_e2e_packet_t * e2e, u16 len)
{
ip6_ioam_analyse_hbh_e2e (ioam_analyser_data_t * data,
ioam_e2e_packet_t * e2e, u16 len)
{
- while (
__sync_lock_test_and_set (data->writer_lock, 1
))
+ while (
clib_atomic_test_and_set (data->writer_lock
))
;
ioam_analyze_seqno (&data->seqno_data,
(u64) clib_net_to_host_u32 (e2e->e2e_data));
;
ioam_analyze_seqno (&data->seqno_data,
(u64) clib_net_to_host_u32 (e2e->e2e_data));
- *(data->writer_lock) = 0;
+ clib_atomic_release (data->writer_lock);
+
return 0;
}
return 0;
}
@@
-507,7
+511,8
@@
ioam_analyse_init_data (ioam_analyser_data_t * data)
data->writer_lock = clib_mem_alloc_aligned (CLIB_CACHE_LINE_BYTES,
CLIB_CACHE_LINE_BYTES);
data->writer_lock = clib_mem_alloc_aligned (CLIB_CACHE_LINE_BYTES,
CLIB_CACHE_LINE_BYTES);
- *(data->writer_lock) = 0;
+
+ clib_atomic_release (data->writer_lock);
trace_data = &(data->trace_data);
for (j = 0; j < IOAM_MAX_PATHS_PER_FLOW; j++)
trace_data = &(data->trace_data);
for (j = 0; j < IOAM_MAX_PATHS_PER_FLOW; j++)