rxrpc: Fix handling of enums-to-string translation in tracing
Fix the way enum values are translated into strings in AF_RXRPC tracepoints. The problem with just doing a lookup in a normal flat array of strings or chars is that external tracing infrastructure can't find it. Rather, TRACE_DEFINE_ENUM must be used. Also sort the enums and string tables to make it easier to keep them in order so that a future patch to __print_symbolic() can be optimised to try a direct lookup into the table first before iterating over it. A couple of _proto() macro calls are removed because they refered to tables that got moved to the tracing infrastructure. The relevant data can be found by way of tracing. Signed-off-by: David Howells <dhowells@redhat.com>
This commit is contained in:
@@ -593,200 +593,6 @@ struct rxrpc_ack_summary {
|
||||
u8 cumulative_acks;
|
||||
};
|
||||
|
||||
enum rxrpc_skb_trace {
|
||||
rxrpc_skb_rx_cleaned,
|
||||
rxrpc_skb_rx_freed,
|
||||
rxrpc_skb_rx_got,
|
||||
rxrpc_skb_rx_lost,
|
||||
rxrpc_skb_rx_received,
|
||||
rxrpc_skb_rx_rotated,
|
||||
rxrpc_skb_rx_purged,
|
||||
rxrpc_skb_rx_seen,
|
||||
rxrpc_skb_tx_cleaned,
|
||||
rxrpc_skb_tx_freed,
|
||||
rxrpc_skb_tx_got,
|
||||
rxrpc_skb_tx_new,
|
||||
rxrpc_skb_tx_rotated,
|
||||
rxrpc_skb_tx_seen,
|
||||
rxrpc_skb__nr_trace
|
||||
};
|
||||
|
||||
extern const char rxrpc_skb_traces[rxrpc_skb__nr_trace][7];
|
||||
|
||||
enum rxrpc_conn_trace {
|
||||
rxrpc_conn_new_client,
|
||||
rxrpc_conn_new_service,
|
||||
rxrpc_conn_queued,
|
||||
rxrpc_conn_seen,
|
||||
rxrpc_conn_got,
|
||||
rxrpc_conn_put_client,
|
||||
rxrpc_conn_put_service,
|
||||
rxrpc_conn__nr_trace
|
||||
};
|
||||
|
||||
extern const char rxrpc_conn_traces[rxrpc_conn__nr_trace][4];
|
||||
|
||||
enum rxrpc_client_trace {
|
||||
rxrpc_client_activate_chans,
|
||||
rxrpc_client_alloc,
|
||||
rxrpc_client_chan_activate,
|
||||
rxrpc_client_chan_disconnect,
|
||||
rxrpc_client_chan_pass,
|
||||
rxrpc_client_chan_unstarted,
|
||||
rxrpc_client_cleanup,
|
||||
rxrpc_client_count,
|
||||
rxrpc_client_discard,
|
||||
rxrpc_client_duplicate,
|
||||
rxrpc_client_exposed,
|
||||
rxrpc_client_replace,
|
||||
rxrpc_client_to_active,
|
||||
rxrpc_client_to_culled,
|
||||
rxrpc_client_to_idle,
|
||||
rxrpc_client_to_inactive,
|
||||
rxrpc_client_to_waiting,
|
||||
rxrpc_client_uncount,
|
||||
rxrpc_client__nr_trace
|
||||
};
|
||||
|
||||
extern const char rxrpc_client_traces[rxrpc_client__nr_trace][7];
|
||||
extern const char rxrpc_conn_cache_states[RXRPC_CONN__NR_CACHE_STATES][5];
|
||||
|
||||
enum rxrpc_call_trace {
|
||||
rxrpc_call_new_client,
|
||||
rxrpc_call_new_service,
|
||||
rxrpc_call_queued,
|
||||
rxrpc_call_queued_ref,
|
||||
rxrpc_call_seen,
|
||||
rxrpc_call_connected,
|
||||
rxrpc_call_release,
|
||||
rxrpc_call_got,
|
||||
rxrpc_call_got_userid,
|
||||
rxrpc_call_got_kernel,
|
||||
rxrpc_call_put,
|
||||
rxrpc_call_put_userid,
|
||||
rxrpc_call_put_kernel,
|
||||
rxrpc_call_put_noqueue,
|
||||
rxrpc_call_error,
|
||||
rxrpc_call__nr_trace
|
||||
};
|
||||
|
||||
extern const char rxrpc_call_traces[rxrpc_call__nr_trace][4];
|
||||
|
||||
enum rxrpc_transmit_trace {
|
||||
rxrpc_transmit_wait,
|
||||
rxrpc_transmit_queue,
|
||||
rxrpc_transmit_queue_last,
|
||||
rxrpc_transmit_rotate,
|
||||
rxrpc_transmit_rotate_last,
|
||||
rxrpc_transmit_await_reply,
|
||||
rxrpc_transmit_end,
|
||||
rxrpc_transmit__nr_trace
|
||||
};
|
||||
|
||||
extern const char rxrpc_transmit_traces[rxrpc_transmit__nr_trace][4];
|
||||
|
||||
enum rxrpc_receive_trace {
|
||||
rxrpc_receive_incoming,
|
||||
rxrpc_receive_queue,
|
||||
rxrpc_receive_queue_last,
|
||||
rxrpc_receive_front,
|
||||
rxrpc_receive_rotate,
|
||||
rxrpc_receive_end,
|
||||
rxrpc_receive__nr_trace
|
||||
};
|
||||
|
||||
extern const char rxrpc_receive_traces[rxrpc_receive__nr_trace][4];
|
||||
|
||||
enum rxrpc_recvmsg_trace {
|
||||
rxrpc_recvmsg_enter,
|
||||
rxrpc_recvmsg_wait,
|
||||
rxrpc_recvmsg_dequeue,
|
||||
rxrpc_recvmsg_hole,
|
||||
rxrpc_recvmsg_next,
|
||||
rxrpc_recvmsg_cont,
|
||||
rxrpc_recvmsg_full,
|
||||
rxrpc_recvmsg_data_return,
|
||||
rxrpc_recvmsg_terminal,
|
||||
rxrpc_recvmsg_to_be_accepted,
|
||||
rxrpc_recvmsg_return,
|
||||
rxrpc_recvmsg__nr_trace
|
||||
};
|
||||
|
||||
extern const char rxrpc_recvmsg_traces[rxrpc_recvmsg__nr_trace][5];
|
||||
|
||||
enum rxrpc_rtt_tx_trace {
|
||||
rxrpc_rtt_tx_ping,
|
||||
rxrpc_rtt_tx_data,
|
||||
rxrpc_rtt_tx__nr_trace
|
||||
};
|
||||
|
||||
extern const char rxrpc_rtt_tx_traces[rxrpc_rtt_tx__nr_trace][5];
|
||||
|
||||
enum rxrpc_rtt_rx_trace {
|
||||
rxrpc_rtt_rx_ping_response,
|
||||
rxrpc_rtt_rx_requested_ack,
|
||||
rxrpc_rtt_rx__nr_trace
|
||||
};
|
||||
|
||||
extern const char rxrpc_rtt_rx_traces[rxrpc_rtt_rx__nr_trace][5];
|
||||
|
||||
enum rxrpc_timer_trace {
|
||||
rxrpc_timer_begin,
|
||||
rxrpc_timer_init_for_reply,
|
||||
rxrpc_timer_init_for_send_reply,
|
||||
rxrpc_timer_expired,
|
||||
rxrpc_timer_set_for_ack,
|
||||
rxrpc_timer_set_for_ping,
|
||||
rxrpc_timer_set_for_resend,
|
||||
rxrpc_timer_set_for_send,
|
||||
rxrpc_timer__nr_trace
|
||||
};
|
||||
|
||||
extern const char rxrpc_timer_traces[rxrpc_timer__nr_trace][8];
|
||||
|
||||
enum rxrpc_propose_ack_trace {
|
||||
rxrpc_propose_ack_client_tx_end,
|
||||
rxrpc_propose_ack_input_data,
|
||||
rxrpc_propose_ack_ping_for_lost_ack,
|
||||
rxrpc_propose_ack_ping_for_lost_reply,
|
||||
rxrpc_propose_ack_ping_for_params,
|
||||
rxrpc_propose_ack_processing_op,
|
||||
rxrpc_propose_ack_respond_to_ack,
|
||||
rxrpc_propose_ack_respond_to_ping,
|
||||
rxrpc_propose_ack_retry_tx,
|
||||
rxrpc_propose_ack_rotate_rx,
|
||||
rxrpc_propose_ack_terminal_ack,
|
||||
rxrpc_propose_ack__nr_trace
|
||||
};
|
||||
|
||||
enum rxrpc_propose_ack_outcome {
|
||||
rxrpc_propose_ack_use,
|
||||
rxrpc_propose_ack_update,
|
||||
rxrpc_propose_ack_subsume,
|
||||
rxrpc_propose_ack__nr_outcomes
|
||||
};
|
||||
|
||||
extern const char rxrpc_propose_ack_traces[rxrpc_propose_ack__nr_trace][8];
|
||||
extern const char *const rxrpc_propose_ack_outcomes[rxrpc_propose_ack__nr_outcomes];
|
||||
|
||||
enum rxrpc_congest_change {
|
||||
rxrpc_cong_begin_retransmission,
|
||||
rxrpc_cong_cleared_nacks,
|
||||
rxrpc_cong_new_low_nack,
|
||||
rxrpc_cong_no_change,
|
||||
rxrpc_cong_progress,
|
||||
rxrpc_cong_retransmit_again,
|
||||
rxrpc_cong_rtt_window_end,
|
||||
rxrpc_cong_saw_nack,
|
||||
rxrpc_congest__nr_change
|
||||
};
|
||||
|
||||
extern const char rxrpc_congest_modes[NR__RXRPC_CONGEST_MODES][10];
|
||||
extern const char rxrpc_congest_changes[rxrpc_congest__nr_change][9];
|
||||
|
||||
extern const char *const rxrpc_pkts[];
|
||||
extern const char rxrpc_ack_names[RXRPC_ACK__INVALID + 1][4];
|
||||
|
||||
#include <trace/events/rxrpc.h>
|
||||
|
||||
/*
|
||||
|
||||
Reference in New Issue
Block a user