Remove connect/disconnect sessiond from lttng API

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

diff --git a/lttng/commands/enable_events.c b/lttng/commands/enable_events.c
index d4af4b3d3a1e647ae9b42dcb2738279ddcfbd830..65bd19575950be32af3ec3154857ff16b784fe2c 100644 (file)
--- a/lttng/commands/enable_events.c
+++ b/lttng/commands/enable_events.c
@@ -152,7 +152,7 @@ error:
 static int enable_events(void)
 {
        int err, ret = CMD_SUCCESS;
-       char *event_name, *channel_name;
+       char *event_name, *channel_name = NULL;
        struct lttng_event ev;
 
        if (set_session_name(opt_session_name) < 0) {
@@ -191,10 +191,13 @@ static int enable_events(void)
                        ev.type = opt_event_type;
 
                        switch (opt_event_type) {
-                       case LTTNG_EVENT_TRACEPOINTS:
+                       case LTTNG_EVENT_TRACEPOINT:
                                ret = lttng_kernel_enable_event(&ev, channel_name);
+                               if (ret < 0) {
+                                       ERR("Unable to find event %s", ev.name);
+                               }
                                break;
-                       case LTTNG_EVENT_KPROBES:
+                       case LTTNG_EVENT_KPROBE:
                                ret = parse_kprobe_opts(&ev, opt_kprobe);
                                if (ret < 0) {
                                        ERR("Unable to parse kprobe options");
@@ -235,6 +238,9 @@ static int enable_events(void)
        }
 
 error:
+       if (opt_channel_name == NULL) {
+               free(channel_name);
+       }
        return ret;
 }
 
@@ -252,7 +258,7 @@ int cmd_enable_events(int argc, const char **argv)
        poptReadDefaultConfig(pc, 0);
 
        /* Default event type */
-       opt_event_type = LTTNG_KERNEL_TRACEPOINTS;
+       opt_event_type = LTTNG_EVENT_TRACEPOINT;
 
        while ((opt = poptGetNextOpt(pc)) != -1) {
                switch (opt) {
@@ -265,13 +271,13 @@ int cmd_enable_events(int argc, const char **argv)
                        opt_cmd_name = poptGetOptArg(pc);
                        break;
                case OPT_TRACEPOINT:
-                       opt_event_type = LTTNG_EVENT_TRACEPOINTS;
+                       opt_event_type = LTTNG_EVENT_TRACEPOINT;
                        break;
                case OPT_MARKER:
                        ret = CMD_NOT_IMPLEMENTED;
                        goto end;
                case OPT_KPROBE:
-                       opt_event_type = LTTNG_EVENT_KPROBES;
+                       opt_event_type = LTTNG_EVENT_KPROBE;
                        opt_kprobe = poptGetOptArg(pc);
                        break;
                case OPT_FUNCTION: