X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.c;h=c902b21768bb3c6dd2e4e059cc6e76b52be84bcd;hb=ec4723516f5a1375c4639447225965f8735aadd3;hp=c00dd2877fd08d1aed942ac1fce52ab4ff25d3c8;hpb=27a3be486f8cc9364d4861b7d163ad3e1426e9b3;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index c00dd2877..c902b2176 100644
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -27,7 +27,7 @@
 #include <common/hashtable/utils.h>
 #include <lttng/event-rule/event-rule.h>
 #include <lttng/event-rule/event-rule-internal.h>
-#include <lttng/event-rule/tracepoint.h>
+#include <lttng/event-rule/user-tracepoint.h>
 #include <lttng/condition/condition.h>
 #include <lttng/condition/event-rule-matches-internal.h>
 #include <lttng/condition/event-rule-matches.h>
@@ -2022,9 +2022,6 @@ static int init_ust_event_notifier_from_event_rule(
 	int loglevel = -1, ret = 0;
 	const char *pattern;
 
-	/* For now only LTTNG_EVENT_RULE_TYPE_TRACEPOINT are supported. */
-	assert(lttng_event_rule_get_type(rule) ==
-			LTTNG_EVENT_RULE_TYPE_TRACEPOINT);
 
 	memset(event_notifier, 0, sizeof(*event_notifier));
 
@@ -2042,13 +2039,16 @@ static int init_ust_event_notifier_from_event_rule(
 	} else {
 		const struct lttng_log_level_rule *log_level_rule;
 
-		status = lttng_event_rule_tracepoint_get_pattern(rule, &pattern);
+		assert(lttng_event_rule_get_type(rule) ==
+				LTTNG_EVENT_RULE_TYPE_USER_TRACEPOINT);
+
+		status = lttng_event_rule_user_tracepoint_get_name_pattern(rule, &pattern);
 		if (status != LTTNG_EVENT_RULE_STATUS_OK) {
 			/* At this point, this is a fatal error. */
 			abort();
 		}
 
-		status = lttng_event_rule_tracepoint_get_log_level_rule(
+		status = lttng_event_rule_user_tracepoint_get_log_level_rule(
 				rule, &log_level_rule);
 		if (status == LTTNG_EVENT_RULE_STATUS_UNSET) {
 			ust_loglevel_type = LTTNG_UST_ABI_LOGLEVEL_ALL;
@@ -2106,6 +2106,7 @@ static int create_ust_event_notifier(struct ust_app *app,
 	const struct lttng_event_rule *event_rule = NULL;
 	unsigned int capture_bytecode_count = 0, i;
 	enum lttng_condition_status cond_status;
+	enum lttng_event_rule_type event_rule_type;
 
 	health_code_update();
 	assert(app->event_notifier_group.object);
@@ -2121,7 +2122,14 @@ static int create_ust_event_notifier(struct ust_app *app,
 	assert(condition_status == LTTNG_CONDITION_STATUS_OK);
 
 	assert(event_rule);
-	assert(lttng_event_rule_get_type(event_rule) == LTTNG_EVENT_RULE_TYPE_TRACEPOINT);
+
+	event_rule_type = lttng_event_rule_get_type(event_rule);
+	assert(event_rule_type == LTTNG_EVENT_RULE_TYPE_USER_TRACEPOINT ||
+			event_rule_type == LTTNG_EVENT_RULE_TYPE_JUL_LOGGING ||
+			event_rule_type ==
+					LTTNG_EVENT_RULE_TYPE_LOG4J_LOGGING ||
+			event_rule_type ==
+					LTTNG_EVENT_RULE_TYPE_PYTHON_LOGGING);
 
 	init_ust_event_notifier_from_event_rule(event_rule, &event_notifier);
 	event_notifier.event.token = ua_event_notifier_rule->token;
@@ -3005,7 +3013,7 @@ static int duplicate_stream_object(struct buffer_reg_stream *reg_stream,
 	assert(reg_stream);
 	assert(stream);
 
-	/* Reserve the amount of file descriptor we need. */
+	/* Duplicating a stream requires 2 new fds. Reserve them. */
 	ret = lttng_fd_get(LTTNG_FD_APPS, 2);
 	if (ret < 0) {
 		ERR("Exhausted number of available FD upon duplicate stream");
@@ -3041,7 +3049,7 @@ static int duplicate_channel_object(struct buffer_reg_channel *buf_reg_chan,
 	assert(buf_reg_chan);
 	assert(ua_chan);
 
-	/* Need two fds for the channel. */
+	/* Duplicating a channel requires 1 new fd. Reserve it. */
 	ret = lttng_fd_get(LTTNG_FD_APPS, 1);
 	if (ret < 0) {
 		ERR("Exhausted number of available FD upon duplicate channel");
@@ -5895,14 +5903,16 @@ void ust_app_synchronize(struct ltt_ust_session *usess,
 	ret = find_or_create_ust_app_session(usess, app, &ua_sess, NULL);
 	if (ret < 0) {
 		/* Tracer is probably gone or ENOMEM. */
-		goto error;
+		if (ua_sess) {
+			destroy_app_session(app, ua_sess);
+		}
+		goto end;
 	}
 	assert(ua_sess);
 
 	pthread_mutex_lock(&ua_sess->lock);
 	if (ua_sess->deleted) {
-		pthread_mutex_unlock(&ua_sess->lock);
-		goto end;
+		goto deleted_session;
 	}
 
 	rcu_read_lock();
@@ -5920,23 +5930,15 @@ void ust_app_synchronize(struct ltt_ust_session *usess,
 	 */
 	ret = create_ust_app_metadata(ua_sess, app, usess->consumer);
 	if (ret < 0) {
-		goto error_unlock;
+		ERR("Metadata creation failed for app sock %d for session id %" PRIu64,
+				app->sock, usess->id);
 	}
 
 	rcu_read_unlock();
 
-end:
+deleted_session:
 	pthread_mutex_unlock(&ua_sess->lock);
-	/* Everything went well at this point. */
-	return;
-
-error_unlock:
-	rcu_read_unlock();
-	pthread_mutex_unlock(&ua_sess->lock);
-error:
-	if (ua_sess) {
-		destroy_app_session(app, ua_sess);
-	}
+end:
 	return;
 }