|
40 | 40 | MAX_MSG_TYPE_LENGTH,
|
41 | 41 | MAX_MSG_DATA_LENGTH
|
42 | 42 | ) + """
|
43 |
| -#define MIN(a,b) ({ __typeof__ (a) _a = (a); __typeof__ (b) _b = (b); _a < _b ? _a : _b; }) |
| 43 | +// A min() macro. Prefixed with _TRACEPOINT_TEST to avoid collision with other MIN macros. |
| 44 | +#define _TRACEPOINT_TEST_MIN(a,b) ({ __typeof__ (a) _a = (a); __typeof__ (b) _b = (b); _a < _b ? _a : _b; }) |
44 | 45 |
|
45 | 46 | struct p2p_message
|
46 | 47 | {
|
|
60 | 61 | bpf_usdt_readarg_p(3, ctx, &msg.peer_conn_type, MAX_PEER_CONN_TYPE_LENGTH);
|
61 | 62 | bpf_usdt_readarg_p(4, ctx, &msg.msg_type, MAX_MSG_TYPE_LENGTH);
|
62 | 63 | bpf_usdt_readarg(5, ctx, &msg.msg_size);
|
63 |
| - bpf_usdt_readarg_p(6, ctx, &msg.msg, MIN(msg.msg_size, MAX_MSG_DATA_LENGTH)); |
| 64 | + bpf_usdt_readarg_p(6, ctx, &msg.msg, _TRACEPOINT_TEST_MIN(msg.msg_size, MAX_MSG_DATA_LENGTH)); |
64 | 65 | inbound_messages.perf_submit(ctx, &msg, sizeof(msg));
|
65 | 66 | return 0;
|
66 | 67 | }
|
|
73 | 74 | bpf_usdt_readarg_p(3, ctx, &msg.peer_conn_type, MAX_PEER_CONN_TYPE_LENGTH);
|
74 | 75 | bpf_usdt_readarg_p(4, ctx, &msg.msg_type, MAX_MSG_TYPE_LENGTH);
|
75 | 76 | bpf_usdt_readarg(5, ctx, &msg.msg_size);
|
76 |
| - bpf_usdt_readarg_p(6, ctx, &msg.msg, MIN(msg.msg_size, MAX_MSG_DATA_LENGTH)); |
| 77 | + bpf_usdt_readarg_p(6, ctx, &msg.msg, _TRACEPOINT_TEST_MIN(msg.msg_size, MAX_MSG_DATA_LENGTH)); |
77 | 78 | outbound_messages.perf_submit(ctx, &msg, sizeof(msg));
|
78 | 79 | return 0;
|
79 | 80 | };
|
|
0 commit comments