From 102e8a5d60728cfaa8e60733ee21c3759edabfbe Mon Sep 17 00:00:00 2001 From: Filip Tehlar Date: Tue, 22 Jun 2021 08:37:26 +0000 Subject: policer: api cleanup Use autogenerated code. Does not change API definitions. Type: improvement Signed-off-by: Filip Tehlar Change-Id: I5dd30870443a22a7da65f6b5a6d3967991e2aceb --- src/vnet/policer/policer.h | 2 ++ src/vnet/policer/policer_api.c | 60 +++++------------------------------------- src/vnet/vnet_all_api_h.h | 1 - 3 files changed, 9 insertions(+), 54 deletions(-) (limited to 'src/vnet') diff --git a/src/vnet/policer/policer.h b/src/vnet/policer/policer.h index d9c4ed2a451..2687064bf0d 100644 --- a/src/vnet/policer/policer.h +++ b/src/vnet/policer/policer.h @@ -49,6 +49,8 @@ typedef struct /* frame queue for thread handoff */ u32 fq_index; + + u16 msg_id_base; } vnet_policer_main_t; extern vnet_policer_main_t vnet_policer_main; diff --git a/src/vnet/policer/policer_api.c b/src/vnet/policer/policer_api.c index c3a9800e201..1382d17e2de 100644 --- a/src/vnet/policer/policer_api.c +++ b/src/vnet/policer/policer_api.c @@ -24,30 +24,13 @@ #include #include -#include - -#define vl_typedefs /* define message structures */ -#include -#undef vl_typedefs - -#define vl_endianfun /* define message structures */ -#include -#undef vl_endianfun - -/* instantiate all the print functions we know about */ -#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__) -#define vl_printfun -#include -#undef vl_printfun +#include +#include +#include +#define REPLY_MSG_ID_BASE vnet_policer_main.msg_id_base #include -#define foreach_vpe_api_msg \ - _ (POLICER_ADD_DEL, policer_add_del) \ - _ (POLICER_BIND, policer_bind) \ - _ (POLICER_INPUT, policer_input) \ - _ (POLICER_DUMP, policer_dump) - static void vl_api_policer_add_del_t_handler (vl_api_policer_add_del_t * mp) { @@ -150,7 +133,7 @@ send_policer_details (u8 *name, qos_pol_cfg_params_st *config, mp = vl_msg_api_alloc (sizeof (*mp)); clib_memset (mp, 0, sizeof (*mp)); - mp->_vl_msg_id = ntohs (VL_API_POLICER_DETAILS); + mp->_vl_msg_id = ntohs (REPLY_MSG_ID_BASE + VL_API_POLICER_DETAILS); mp->context = context; mp->cir = htonl (config->rb.kbps.cir_kbps); mp->eir = htonl (config->rb.kbps.eir_kbps); @@ -233,43 +216,14 @@ vl_api_policer_dump_t_handler (vl_api_policer_dump_t * mp) } } -/* - * policer_api_hookup - * Add vpe's API message handlers to the table. - * vlib has already mapped shared memory and - * added the client registration handlers. - * See .../vlib-api/vlibmemory/memclnt_vlib.c:memclnt_process() - */ -#define vl_msg_name_crc_list -#include -#undef vl_msg_name_crc_list - -static void -setup_message_id_table (api_main_t * am) -{ -#define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id); - foreach_vl_msg_name_crc_policer; -#undef _ -} - +#include static clib_error_t * policer_api_hookup (vlib_main_t * vm) { - api_main_t *am = vlibapi_get_main (); - -#define _(N,n) \ - vl_msg_api_set_handlers(VL_API_##N, #n, \ - vl_api_##n##_t_handler, \ - vl_noop_handler, \ - vl_api_##n##_t_endian, \ - vl_api_##n##_t_print, \ - sizeof(vl_api_##n##_t), 1); - foreach_vpe_api_msg; -#undef _ /* * Set up the (msg_name, crc, message-id) table */ - setup_message_id_table (am); + REPLY_MSG_ID_BASE = setup_message_id_table (); return 0; } diff --git a/src/vnet/vnet_all_api_h.h b/src/vnet/vnet_all_api_h.h index 53f61fa8803..872729cc441 100644 --- a/src/vnet/vnet_all_api_h.h +++ b/src/vnet/vnet_all_api_h.h @@ -46,7 +46,6 @@ #include #include #include -#include #include #include #include -- cgit 1.2.3-korg r-240715'>oper-240715 Integration testsGrokmirror user
aboutsummaryrefslogtreecommitdiffstats
path: root/tests/vpp/perf/l2/10ge2p1x710-eth-l2bdbasemaclrn-macip-iacl1sl-100kflows-ndrpdr.robot
blob: 313c3d1e23295d370453acf74f27b88ac301779a (plain) 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146