lkml.org 
[lkml]   [2022]   [Mar]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
SubjectRe: [PATCH v2 02/19] netfs: Generate enums from trace symbol mapping lists
From
Date
On Tue, 2022-03-08 at 23:25 +0000, David Howells wrote:
> netfs has a number of lists of symbols for use in tracing, listed in an
> enum and then listed again in a symbol->string mapping for use with
> __print_symbolic(). This is, however, redundant.
>
> Instead, use the symbol->string mapping list to also generate the enum
> where the enum is in the same file.
>
> Signed-off-by: David Howells <dhowells@redhat.com>
> cc: linux-cachefs@redhat.com
>
> Link: https://lore.kernel.org/r/164622980839.3564931.5673300162465266909.stgit@warthog.procyon.org.uk/ # v1
> ---
>
> include/trace/events/netfs.h | 57 ++++++++++--------------------------------
> 1 file changed, 14 insertions(+), 43 deletions(-)
>
> diff --git a/include/trace/events/netfs.h b/include/trace/events/netfs.h
> index e6f4ebbb4c69..88d9a74dd346 100644
> --- a/include/trace/events/netfs.h
> +++ b/include/trace/events/netfs.h
> @@ -15,49 +15,6 @@
> /*
> * Define enums for tracing information.
> */
> -#ifndef __NETFS_DECLARE_TRACE_ENUMS_ONCE_ONLY
> -#define __NETFS_DECLARE_TRACE_ENUMS_ONCE_ONLY
> -
> -enum netfs_read_trace {
> - netfs_read_trace_expanded,
> - netfs_read_trace_readahead,
> - netfs_read_trace_readpage,
> - netfs_read_trace_write_begin,
> -};
> -
> -enum netfs_rreq_trace {
> - netfs_rreq_trace_assess,
> - netfs_rreq_trace_done,
> - netfs_rreq_trace_free,
> - netfs_rreq_trace_resubmit,
> - netfs_rreq_trace_unlock,
> - netfs_rreq_trace_unmark,
> - netfs_rreq_trace_write,
> -};
> -
> -enum netfs_sreq_trace {
> - netfs_sreq_trace_download_instead,
> - netfs_sreq_trace_free,
> - netfs_sreq_trace_prepare,
> - netfs_sreq_trace_resubmit_short,
> - netfs_sreq_trace_submit,
> - netfs_sreq_trace_terminated,
> - netfs_sreq_trace_write,
> - netfs_sreq_trace_write_skip,
> - netfs_sreq_trace_write_term,
> -};
> -
> -enum netfs_failure {
> - netfs_fail_check_write_begin,
> - netfs_fail_copy_to_cache,
> - netfs_fail_read,
> - netfs_fail_short_readpage,
> - netfs_fail_short_write_begin,
> - netfs_fail_prepare_write,
> -};
> -
> -#endif
> -
> #define netfs_read_traces \
> EM(netfs_read_trace_expanded, "EXPANDED ") \
> EM(netfs_read_trace_readahead, "READAHEAD") \
> @@ -98,6 +55,20 @@ enum netfs_failure {
> EM(netfs_fail_short_write_begin, "short-write-begin") \
> E_(netfs_fail_prepare_write, "prep-write")
>
> +#ifndef __NETFS_DECLARE_TRACE_ENUMS_ONCE_ONLY
> +#define __NETFS_DECLARE_TRACE_ENUMS_ONCE_ONLY
> +
> +#undef EM
> +#undef E_
> +#define EM(a, b) a,
> +#define E_(a, b) a
> +
> +enum netfs_read_trace { netfs_read_traces } __mode(byte);
> +enum netfs_rreq_trace { netfs_rreq_traces } __mode(byte);
> +enum netfs_sreq_trace { netfs_sreq_traces } __mode(byte);
> +enum netfs_failure { netfs_failures } __mode(byte);
> +

Should you undef EM and E_ here after creating these?

> +#endif
>
> /*
> * Export enum symbols via userspace.
>
>

Looks fine otherwise:

Acked-by: Jeff Layton <jlayton@redhat.com>

\
 
 \ /
  Last update: 2022-03-09 16:31    [W:0.275 / U:0.568 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site