Fix: out of sync lttng_ust_ctl_sigbug_handle() prototype

[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 14c9bbd10993a415881cca30cb4de938d59bc205..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);
@@ -4315,12 +4315,12 @@ enum lttng_error_code synchronize_tracer_notifier_register(
        assert(trigger_status == LTTNG_TRIGGER_STATUS_OK);
 
        assert(condition);
-       assert(lttng_condition_get_type(condition) == LTTNG_CONDITION_TYPE_ON_EVENT);
+       assert(lttng_condition_get_type(condition) ==
+                       LTTNG_CONDITION_TYPE_EVENT_RULE_MATCHES);
 
        trigger_status = lttng_trigger_get_name(trigger, &trigger_name);
        trigger_name = trigger_status == LTTNG_TRIGGER_STATUS_OK ?
-                       trigger_name :
-                       "(unnamed)";
+                       trigger_name : "(anonymous)";
 
        session_lock_list();
        switch (trigger_domain) {
@@ -4385,6 +4385,7 @@ end_unlock_session_list:
 
 enum lttng_error_code cmd_register_trigger(const struct lttng_credentials *cmd_creds,
                struct lttng_trigger *trigger,
+               bool is_trigger_anonymous,
                struct notification_thread_handle *notification_thread,
                struct lttng_trigger **return_trigger)
 {
@@ -4395,7 +4396,7 @@ enum lttng_error_code cmd_register_trigger(const struct lttng_credentials *cmd_c
 
        trigger_status = lttng_trigger_get_name(trigger, &trigger_name);
        trigger_name = trigger_status == LTTNG_TRIGGER_STATUS_OK ?
-                       trigger_name : "(unnamed)";
+                       trigger_name : "(anonymous)";
 
        trigger_status = lttng_trigger_get_owner_uid(
                trigger, &trigger_owner);
@@ -4443,8 +4444,8 @@ enum lttng_error_code cmd_register_trigger(const struct lttng_credentials *cmd_c
         * it is safe to use without any locking as its properties are
         * immutable.
         */
-       ret_code = notification_thread_command_register_trigger(notification_thread,
-                       trigger);
+       ret_code = notification_thread_command_register_trigger(
+                       notification_thread, trigger, is_trigger_anonymous);
        if (ret_code != LTTNG_OK) {
                DBG("Failed to register trigger to notification thread: trigger name = '%s', trigger owner uid = %d, error code = %d",
                                trigger_name, (int) trigger_owner, ret_code);
@@ -4453,7 +4454,7 @@ enum lttng_error_code cmd_register_trigger(const struct lttng_credentials *cmd_c
 
        trigger_status = lttng_trigger_get_name(trigger, &trigger_name);
        trigger_name = trigger_status == LTTNG_TRIGGER_STATUS_OK ?
-                       trigger_name : "(unnamed)";
+                       trigger_name : "(anonymous)";
 
        /*
         * Synchronize tracers if the trigger adds an event notifier.
@@ -4497,7 +4498,8 @@ enum lttng_error_code synchronize_tracer_notifier_unregister(
                                        trigger);
 
        assert(condition);
-       assert(lttng_condition_get_type(condition) == LTTNG_CONDITION_TYPE_ON_EVENT);
+       assert(lttng_condition_get_type(condition) ==
+                       LTTNG_CONDITION_TYPE_EVENT_RULE_MATCHES);
 
        session_lock_list();
        switch (trigger_domain) {
@@ -4554,7 +4556,7 @@ enum lttng_error_code cmd_unregister_trigger(const struct lttng_credentials *cmd
        struct lttng_trigger *sessiond_trigger = NULL;
 
        trigger_status = lttng_trigger_get_name(trigger, &trigger_name);
-       trigger_name = trigger_status == LTTNG_TRIGGER_STATUS_OK ? trigger_name : "(unnamed)";
+       trigger_name = trigger_status == LTTNG_TRIGGER_STATUS_OK ? trigger_name : "(anonymous)";
        trigger_status = lttng_trigger_get_owner_uid(trigger, &trigger_owner);
        assert(trigger_status == LTTNG_TRIGGER_STATUS_OK);
 
@@ -4700,7 +4702,7 @@ enum lttng_error_code cmd_execute_error_query(const struct lttng_credentials *cm
 
        trigger_status = lttng_trigger_get_name(matching_trigger, &trigger_name);
        trigger_name = trigger_status == LTTNG_TRIGGER_STATUS_OK ?
-                       trigger_name : "(unnamed)";
+                       trigger_name : "(anonymous)";
        trigger_status = lttng_trigger_get_owner_uid(matching_trigger,
                        &trigger_owner);
        assert(trigger_status == LTTNG_TRIGGER_STATUS_OK);
@@ -5026,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) {
@@ -5048,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) {