Pass lttng_event struct to the set_filter API call

[lttng-tools.git] / src / bin / lttng / commands / enable_events.c

diff --git a/src/bin/lttng/commands/enable_events.c b/src/bin/lttng/commands/enable_events.c
index a2c8a68b233e0ed7beeef1b893c7f453b874e08d..cdd137cc9193d3aed0efdfee037546b97c958402 100644 (file)
--- a/src/bin/lttng/commands/enable_events.c
+++ b/src/bin/lttng/commands/enable_events.c
@@ -301,6 +301,7 @@ int loglevel_str_to_value(const char *inputstr)
 static int enable_events(char *session_name)
 {
        int err, ret = CMD_SUCCESS, warn = 0;
+       unsigned int event_enabled = 0;
        char *event_name, *channel_name = NULL;
        struct lttng_event ev;
        struct lttng_domain dom;
@@ -358,7 +359,7 @@ static int enable_events(char *session_name)
                                ev.loglevel = loglevel_str_to_value(opt_loglevel);
                                if (ev.loglevel == -1) {
                                        ERR("Unknown loglevel %s", opt_loglevel);
-                                       ret = -1;
+                                       ret = -LTTNG_ERR_INVALID;
                                        goto error;
                                }
                        } else {
@@ -366,10 +367,13 @@ static int enable_events(char *session_name)
                        }
                }
 
+               /* Reset flag before enabling a new event. */
+               event_enabled = 0;
+
                ret = lttng_enable_event(handle, &ev, channel_name);
                if (ret < 0) {
                        switch (-ret) {
-                       case LTTCOMM_KERN_EVENT_EXIST:
+                       case LTTNG_ERR_KERN_EVENT_EXIST:
                                WARN("Kernel events already enabled (channel %s, session %s)",
                                                channel_name, session_name);
                                break;
@@ -380,25 +384,17 @@ static int enable_events(char *session_name)
                        }
                        goto end;
                }
-               if (opt_filter) {
-                       ret = lttng_set_event_filter(handle, ev.name, channel_name,
-                                               opt_filter);
-                       if (ret < 0) {
-                               ERR("Error setting filter");
-                               ret = -1;
-                               goto error;
-                       }
-               }
+               event_enabled = 1;
 
                switch (opt_event_type) {
                case LTTNG_EVENT_TRACEPOINT:
                        if (opt_loglevel) {
                                MSG("All %s tracepoints are enabled in channel %s for loglevel %s",
-                                       opt_kernel ? "kernel" : "UST", channel_name,
-                                       opt_loglevel);
+                                               opt_kernel ? "kernel" : "UST", channel_name,
+                                               opt_loglevel);
                        } else {
                                MSG("All %s tracepoints are enabled in channel %s",
-                                       opt_kernel ? "kernel" : "UST", channel_name);
+                                               opt_kernel ? "kernel" : "UST", channel_name);
 
                        }
                        break;
@@ -411,11 +407,11 @@ static int enable_events(char *session_name)
                case LTTNG_EVENT_ALL:
                        if (opt_loglevel) {
                                MSG("All %s events are enabled in channel %s for loglevel %s",
-                                       opt_kernel ? "kernel" : "UST", channel_name,
-                                       opt_loglevel);
+                                               opt_kernel ? "kernel" : "UST", channel_name,
+                                               opt_loglevel);
                        } else {
                                MSG("All %s events are enabled in channel %s",
-                                       opt_kernel ? "kernel" : "UST", channel_name);
+                                               opt_kernel ? "kernel" : "UST", channel_name);
                        }
                        break;
                default:
@@ -425,6 +421,42 @@ static int enable_events(char *session_name)
                         */
                        goto error;
                }
+               if (opt_filter && event_enabled) {
+                       ret = lttng_set_event_filter(handle, &ev, channel_name,
+                                               opt_filter);
+                       if (ret < 0) {
+                               fprintf(stderr, "Ret filter: %d\n", ret);
+                               switch (-ret) {
+                               case LTTNG_ERR_FILTER_EXIST:
+                                       WARN("Filter on events is already enabled"
+                                                       " (channel %s, session %s)",
+                                               channel_name, session_name);
+                                       break;
+                               case LTTNG_ERR_FILTER_INVAL:
+                               case LTTNG_ERR_FILTER_NOMEM:
+                                       ERR("%s", lttng_strerror(ret));
+                               default:
+                                       ERR("Setting filter: '%s'", opt_filter);
+                                       /*
+                                        * The event was successfully enabled before so when
+                                        * failing to set a filter, disable the event. This has
+                                        * been discussed in bug #343 on why we do that.
+                                        */
+                                       err = lttng_disable_event(handle, ev.name, channel_name);
+                                       if (err < 0) {
+                                               ERR("Disabling all events after filter error: %s",
+                                                               lttng_strerror(err));
+                                       } else {
+                                               WARN("All events of channel %s have been disabled due "
+                                                               "to a filter error", channel_name);
+                                       }
+                                       break;
+                               }
+                               goto error;
+                       } else {
+                               MSG("Filter '%s' successfully set", opt_filter);
+                       }
+               }
                goto end;
        }
 
@@ -520,7 +552,7 @@ static int enable_events(char *session_name)
                                ev.loglevel = loglevel_str_to_value(opt_loglevel);
                                if (ev.loglevel == -1) {
                                        ERR("Unknown loglevel %s", opt_loglevel);
-                                       ret = -1;
+                                       ret = -LTTNG_ERR_INVALID;
                                        goto error;
                                }
                        } else {
@@ -532,11 +564,14 @@ static int enable_events(char *session_name)
                        goto error;
                }
 
+               /* Reset flag before enabling a new event. */
+               event_enabled = 0;
+
                ret = lttng_enable_event(handle, &ev, channel_name);
                if (ret < 0) {
                        /* Turn ret to positive value to handle the positive error code */
                        switch (-ret) {
-                       case LTTCOMM_KERN_EVENT_EXIST:
+                       case LTTNG_ERR_KERN_EVENT_EXIST:
                                WARN("Kernel event %s already enabled (channel %s, session %s)",
                                                event_name, channel_name, session_name);
                                break;
@@ -549,14 +584,42 @@ static int enable_events(char *session_name)
                } else {
                        MSG("%s event %s created in channel %s",
                                        opt_kernel ? "kernel": "UST", event_name, channel_name);
+                       event_enabled = 1;
                }
-               if (opt_filter) {
-                       ret = lttng_set_event_filter(handle, ev.name,
-                               channel_name, opt_filter);
+               if (opt_filter && event_enabled) {
+                       ret = lttng_set_event_filter(handle, &ev, channel_name,
+                                       opt_filter);
                        if (ret < 0) {
-                               ERR("Error setting filter");
-                               ret = -1;
+                               switch (-ret) {
+                               case LTTNG_ERR_FILTER_EXIST:
+                                       WARN("Filter on event %s is already enabled"
+                                                       " (channel %s, session %s)",
+                                               event_name, channel_name, session_name);
+                                       break;
+                               case LTTNG_ERR_FILTER_INVAL:
+                               case LTTNG_ERR_FILTER_NOMEM:
+                                       ERR("%s", lttng_strerror(ret));
+                               default:
+                                       ERR("Setting filter for event %s: '%s'", ev.name,
+                                                       opt_filter);
+                                       /*
+                                        * The event was successfully enabled before so when
+                                        * failing to set a filter, disable the event. This has
+                                        * been discussed in bug #343 on why we do that.
+                                        */
+                                       err = lttng_disable_event(handle, ev.name, channel_name);
+                                       if (err < 0) {
+                                               ERR("Disabling event %s after filter error: %s",
+                                                               ev.name, lttng_strerror(err));
+                                       } else {
+                                               WARN("Event %s of channel %s has been disabled due "
+                                                               "to a filter error", ev.name, channel_name);
+                                       }
+                                       break;
+                               }
                                goto error;
+                       } else {
+                               MSG("Filter '%s' successfully set", opt_filter);
                        }
                }