X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=3349ff000f415d60073760085f8fce0de156c105;hb=f2bda80eb1fe2f73dda9a7590d9960cdccb0f733;hp=3fab5af02e94d7194fca8033755cbb7abfb93f4e;hpb=588c4b0d153e8919b8d9159b69ce0db8fbe52af0;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index 3fab5af02..3349ff000 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -34,8 +34,8 @@
 #include <lttng/channel.h>
 #include <lttng/condition/condition-internal.h>
 #include <lttng/condition/condition.h>
-#include <lttng/condition/on-event-internal.h>
-#include <lttng/condition/on-event.h>
+#include <lttng/condition/event-rule-matches-internal.h>
+#include <lttng/condition/event-rule-matches.h>
 #include <lttng/error-query-internal.h>
 #include <lttng/event-rule/event-rule-internal.h>
 #include <lttng/event-rule/event-rule.h>
@@ -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);
 
@@ -4629,11 +4631,11 @@ end:
 	return ret_code;
 }
 
-int cmd_list_triggers(struct command_ctx *cmd_ctx,
+enum lttng_error_code cmd_list_triggers(struct command_ctx *cmd_ctx,
 		struct notification_thread_handle *notification_thread,
 		struct lttng_triggers **return_triggers)
 {
-	int ret = 0;
+	int ret;
 	enum lttng_error_code ret_code;
 	struct lttng_triggers *triggers = NULL;
 
@@ -4641,16 +4643,21 @@ int cmd_list_triggers(struct command_ctx *cmd_ctx,
 	ret_code = notification_thread_command_list_triggers(
 			notification_thread, cmd_ctx->creds.uid, &triggers);
 	if (ret_code != LTTNG_OK) {
-		ret = ret_code;
+		goto end;
+	}
+
+	ret = lttng_triggers_remove_hidden_triggers(triggers);
+	if (ret) {
+		ret_code = LTTNG_ERR_UNK;
 		goto end;
 	}
 
 	*return_triggers = triggers;
 	triggers = NULL;
-	ret = LTTNG_OK;
+	ret_code = LTTNG_OK;
 end:
 	lttng_triggers_destroy(triggers);
-	return ret;
+	return ret_code;
 }
 
 enum lttng_error_code cmd_execute_error_query(const struct lttng_credentials *cmd_creds,
@@ -4660,7 +4667,7 @@ enum lttng_error_code cmd_execute_error_query(const struct lttng_credentials *cm
 {
 	enum lttng_error_code ret_code;
 	const struct lttng_trigger *query_target_trigger;
-	struct lttng_action *query_target_action;
+	const struct lttng_action *query_target_action = NULL;
 	struct lttng_trigger *matching_trigger = NULL;
 	const char *trigger_name;
 	uid_t trigger_owner;
@@ -4671,6 +4678,10 @@ enum lttng_error_code cmd_execute_error_query(const struct lttng_credentials *cm
 	case LTTNG_ERROR_QUERY_TARGET_TYPE_TRIGGER:
 		query_target_trigger = lttng_error_query_trigger_borrow_target(query);
 		break;
+	case LTTNG_ERROR_QUERY_TARGET_TYPE_CONDITION:
+		query_target_trigger =
+				lttng_error_query_condition_borrow_target(query);
+		break;
 	case LTTNG_ERROR_QUERY_TARGET_TYPE_ACTION:
 		query_target_trigger = lttng_error_query_action_borrow_trigger_target(
 				query);
@@ -4700,7 +4711,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);
@@ -4746,6 +4757,21 @@ enum lttng_error_code cmd_execute_error_query(const struct lttng_credentials *cm
 		}
 
 		break;
+	case LTTNG_ERROR_QUERY_TARGET_TYPE_CONDITION:
+	{
+		trigger_status = lttng_trigger_condition_add_error_results(
+				matching_trigger, results);
+
+		switch (trigger_status) {
+		case LTTNG_TRIGGER_STATUS_OK:
+			break;
+		default:
+			ret_code = LTTNG_ERR_UNK;
+			goto end;
+		}
+
+		break;
+	}
 	case LTTNG_ERROR_QUERY_TARGET_TYPE_ACTION:
 	{
 		const enum lttng_action_status action_status =
@@ -4763,6 +4789,7 @@ enum lttng_error_code cmd_execute_error_query(const struct lttng_credentials *cm
 		break;
 	}
 	default:
+		abort();
 		break;
 	}
 
@@ -5025,6 +5052,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) {
@@ -5047,6 +5079,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) {