2022-06-02 02:26:35

by sunliming

Subject: [PATCH] tracing: Simplify conditional compilation code in tracing_set_tracer()

Two conditional compilation directives "#ifdef CONFIG_TRACER_SNAPSHOT"
are used consecutively, and no other code in between. Simplify conditional
the compilation code and only use one "#ifdef CONFIG_TRACER_SNAPSHOT".

Signed-off-by: sunliming <[email protected]>
---
kernel/trace/trace.c | 2 --
1 file changed, 2 deletions(-)

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index f400800bc910..dc959e339512 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -6430,9 +6430,7 @@ int tracing_set_tracer(struct trace_array *tr, const char *buf)
synchronize_rcu();
free_snapshot(tr);
}
-#endif

-#ifdef CONFIG_TRACER_MAX_TRACE
if (t->use_max_tr && !had_max_tr) {
ret = tracing_alloc_snapshot_instance(tr);
if (ret < 0)
--
2.25.1

2022-06-02 19:21:59

by Steven Rostedt

Subject: Re: [PATCH] tracing: Simplify conditional compilation code in tracing_set_tracer()

On Thu, 2 Jun 2022 10:24:04 +0800
sunliming <[email protected]> wrote:

> Two conditional compilation directives "#ifdef CONFIG_TRACER_SNAPSHOT"
> are used consecutively, and no other code in between. Simplify conditional
> the compilation code and only use one "#ifdef CONFIG_TRACER_SNAPSHOT".

I think you mean CONFIG_TRACER_MAX_TRACE here.

-- Steve

>
> Signed-off-by: sunliming <[email protected]>
> ---
> kernel/trace/trace.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
> index f400800bc910..dc959e339512 100644
> --- a/kernel/trace/trace.c
> +++ b/kernel/trace/trace.c
> @@ -6430,9 +6430,7 @@ int tracing_set_tracer(struct trace_array *tr, const char *buf)
> synchronize_rcu();
> free_snapshot(tr);
> }
> -#endif
>
> -#ifdef CONFIG_TRACER_MAX_TRACE
> if (t->use_max_tr && !had_max_tr) {
> ret = tracing_alloc_snapshot_instance(tr);
> if (ret < 0)

2022-06-03 09:24:53

by sunliming

Subject: Re: [PATCH] tracing: Simplify conditional compilation code in tracing_set_tracer()

Steven Rostedt <[email protected]> 于2022年6月2日周四 20:26写道：
>
> On Thu, 2 Jun 2022 10:24:04 +0800
> sunliming <[email protected]> wrote:
>
> > Two conditional compilation directives "#ifdef CONFIG_TRACER_SNAPSHOT"
> > are used consecutively, and no other code in between. Simplify conditional
> > the compilation code and only use one "#ifdef CONFIG_TRACER_SNAPSHOT".
>
> I think you mean CONFIG_TRACER_MAX_TRACE here.
>
> -- Steve
>
> >
> > Signed-off-by: sunliming <[email protected]>
> > ---
> > kernel/trace/trace.c | 2 --
> > 1 file changed, 2 deletions(-)
> >
> > diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
> > index f400800bc910..dc959e339512 100644
> > --- a/kernel/trace/trace.c
> > +++ b/kernel/trace/trace.c
> > @@ -6430,9 +6430,7 @@ int tracing_set_tracer(struct trace_array *tr, const char *buf)
> > synchronize_rcu();
> > free_snapshot(tr);
> > }
> > -#endif
> >
> > -#ifdef CONFIG_TRACER_MAX_TRACE
> > if (t->use_max_tr && !had_max_tr) {
> > ret = tracing_alloc_snapshot_instance(tr);
> > if (ret < 0)
>
Yes, you are right. I am sorry about this low-level mistakes.