Fix: Only list kernel enablers when listing events
authorJérémie Galarneau <jeremie.galarneau@efficios.com>
Tue, 8 Mar 2016 17:06:14 +0000 (12:06 -0500)
committerJérémie Galarneau <jeremie.galarneau@efficios.com>
Tue, 8 Mar 2016 17:06:14 +0000 (12:06 -0500)
lttng list would list kernel enablers and individual enabled
syscalls which would result in a confusing output.

For instance, enabling the "open" syscall with a filter would
result in a list output displaying both the enabler,
the syscall's name + its filter, and the syscall on its own,
without any mention of an enabled filter.

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
src/bin/lttng-sessiond/cmd.c

index 38db11ebb210eda8113c563d41ae8256b9e9c317..33ecff0622612239edadc978eef4d1da6540ee94 100644 (file)
@@ -590,7 +590,7 @@ static int list_lttng_kernel_events(char *channel_name,
        if (nb_event == 0) {
                *total_size = 0;
                *events = NULL;
-               goto syscall;
+               goto end;
        }
 
        /* Compute required extended infos size */
@@ -653,19 +653,7 @@ static int list_lttng_kernel_events(char *channel_name,
                        &extended_at);
        }
 
-syscall:
-       if (syscall_table) {
-               ssize_t new_size;
-
-               new_size = syscall_list_channel(kchan, events, nb_event);
-               if (new_size < 0) {
-                       free(events);
-                       ret = -new_size;
-                       goto error;
-               }
-               nb_event = new_size;
-       }
-
+end:
        return nb_event;
 
 error:
This page took 0.035147 seconds and 4 git commands to generate.