Rename lttng_event_rule_userspace_probe to lttng_event_rule_kernel_uprobe

[lttng-tools.git] / src / bin / lttng-sessiond / cmd.c

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index f0d5c571da18aa3e7752ef2307dfdf0afd12e3a5..9ae4d1974293a9197362f92b244eaca8f3543aff 100644 (file)
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -681,34 +681,34 @@ static int list_lttng_kernel_events(char *channel_name,
                event.filter = (unsigned char) !!kevent->filter_expression;
 
                switch (kevent->event->instrumentation) {
-               case LTTNG_KERNEL_TRACEPOINT:
+               case LTTNG_KERNEL_ABI_TRACEPOINT:
                        event.type = LTTNG_EVENT_TRACEPOINT;
                        break;
-               case LTTNG_KERNEL_KRETPROBE:
+               case LTTNG_KERNEL_ABI_KRETPROBE:
                        event.type = LTTNG_EVENT_FUNCTION;
                        memcpy(&event.attr.probe, &kevent->event->u.kprobe,
-                                       sizeof(struct lttng_kernel_kprobe));
+                                       sizeof(struct lttng_kernel_abi_kprobe));
                        break;
-               case LTTNG_KERNEL_KPROBE:
+               case LTTNG_KERNEL_ABI_KPROBE:
                        event.type = LTTNG_EVENT_PROBE;
                        memcpy(&event.attr.probe, &kevent->event->u.kprobe,
-                                       sizeof(struct lttng_kernel_kprobe));
+                                       sizeof(struct lttng_kernel_abi_kprobe));
                        break;
-               case LTTNG_KERNEL_UPROBE:
+               case LTTNG_KERNEL_ABI_UPROBE:
                        event.type = LTTNG_EVENT_USERSPACE_PROBE;
                        break;
-               case LTTNG_KERNEL_FUNCTION:
+               case LTTNG_KERNEL_ABI_FUNCTION:
                        event.type = LTTNG_EVENT_FUNCTION;
                        memcpy(&event.attr.ftrace, &kevent->event->u.ftrace,
-                                       sizeof(struct lttng_kernel_function));
+                                       sizeof(struct lttng_kernel_abi_function));
                        break;
-               case LTTNG_KERNEL_NOOP:
+               case LTTNG_KERNEL_ABI_NOOP:
                        event.type = LTTNG_EVENT_NOOP;
                        break;
-               case LTTNG_KERNEL_SYSCALL:
+               case LTTNG_KERNEL_ABI_SYSCALL:
                        event.type = LTTNG_EVENT_SYSCALL;
                        break;
-               case LTTNG_KERNEL_ALL:
+               case LTTNG_KERNEL_ABI_ALL:
                        /* fall-through. */
                default:
                        assert(0);
@@ -5028,6 +5028,11 @@ enum lttng_error_code snapshot_record(struct ltt_session *session,
                                consumer_copy_output(snapshot_output->consumer);
                strcpy(snapshot_kernel_consumer_output->chunk_path,
                        snapshot_chunk_name);
+
+               /* Copy the original domain subdir. */
+               strcpy(snapshot_kernel_consumer_output->domain_subdir,
+                               original_kernel_consumer_output->domain_subdir);
+
                ret = consumer_copy_sockets(snapshot_kernel_consumer_output,
                                original_kernel_consumer_output);
                if (ret < 0) {
@@ -5050,6 +5055,11 @@ enum lttng_error_code snapshot_record(struct ltt_session *session,
                                consumer_copy_output(snapshot_output->consumer);
                strcpy(snapshot_ust_consumer_output->chunk_path,
                        snapshot_chunk_name);
+
+               /* Copy the original domain subdir. */
+               strcpy(snapshot_ust_consumer_output->domain_subdir,
+                               original_ust_consumer_output->domain_subdir);
+
                ret = consumer_copy_sockets(snapshot_ust_consumer_output,
                                original_ust_consumer_output);
                if (ret < 0) {