[lttng-dev] [PATCH lttng-tools 2/2] Cleanup: remove "disabled" flag for new release cycle

[Jérémie Galarneau]

Merged, thanks!

Jérémie

On Wed, Nov 12, 2014 at 6:18 PM, Mathieu Desnoyers
<mathieu.desnoyers at efficios.com> wrote:
> Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers at efficios.com>
> ---
>  src/bin/lttng-sessiond/trace-ust.c |  5 -----
>  src/bin/lttng-sessiond/ust-app.c   | 21 ---------------------
>  2 files changed, 26 deletions(-)
>
> diff --git a/src/bin/lttng-sessiond/trace-ust.c b/src/bin/lttng-sessiond/trace-ust.c
> index ac980fd..1f6fd52 100644
> --- a/src/bin/lttng-sessiond/trace-ust.c
> +++ b/src/bin/lttng-sessiond/trace-ust.c
> @@ -419,11 +419,6 @@ struct ltt_ust_event *trace_ust_create_event(struct lttng_event *ev,
>                 ERR("Unknown ust loglevel type (%d)", ev->loglevel_type);
>                 goto error_free_event;
>         }
> -       /*
> -        * Fix for enabler race. Enable is now done explicitly by
> -        * sessiond after setting filter.
> -        */
> -       lue->attr.disabled = 1;
>
>         /* Same layout. */
>         lue->filter_expression = filter_expression;
> diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
> index 7e4bf94..c2d2074 100644
> --- a/src/bin/lttng-sessiond/ust-app.c
> +++ b/src/bin/lttng-sessiond/ust-app.c
> @@ -1471,27 +1471,6 @@ int create_ust_event(struct ust_app *app, struct ust_app_session *ua_sess,
>                         }
>                         goto error;
>                 }
> -       } else {
> -               ret = disable_ust_event(app, ua_sess, ua_event);
> -               if (ret < 0) {
> -                       /*
> -                        * If we hit an EPERM, something is wrong with our disable call. If
> -                        * we get an EEXIST, there is a problem on the tracer side since we
> -                        * just created it.
> -                        */
> -                       switch (ret) {
> -                       case -LTTNG_UST_ERR_PERM:
> -                               /* Code flow problem */
> -                               assert(0);
> -                       case -LTTNG_UST_ERR_EXIST:
> -                               /* It's OK for our use case. */
> -                               ret = 0;
> -                               break;
> -                       default:
> -                               break;
> -                       }
> -                       goto error;
> -               }
>         }
>
>  error:
> --
> 2.1.1
>



-- 
Jérémie Galarneau
EfficiOS Inc.
http://www.efficios.com