X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.c;h=fc8728dd21da9b4d68a417323f41fbe0c7a6f225;hp=6fb328eb9ca0cfd991328d227445d1aa6fbdadca;hb=c30aaa51f34105a7f20b9ceb39866001843db6e6;hpb=53a80697a772bc2e260e3dff006f910be6709f04

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index 6fb328eb9..fc8728dd2 100644
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -27,12 +27,13 @@
 #include <urcu/compiler.h>
 
 #include <common/common.h>
+#include <common/sessiond-comm/sessiond-comm.h>
 
+#include "fd-limit.h"
+#include "health.h"
 #include "ust-app.h"
 #include "ust-consumer.h"
 #include "ust-ctl.h"
-#include "fd-limit.h"
-#include "../../common/sessiond-comm/sessiond-comm.h"
 
 /*
  * Delete ust context safely. RCU read lock must be held before calling
@@ -395,6 +396,8 @@ int create_ust_channel_context(struct ust_app_channel *ua_chan,
 {
 	int ret;
 
+	health_code_update(&health_thread_cmd);
+
 	ret = ustctl_add_context(app->sock, &ua_ctx->ctx,
 			ua_chan->obj, &ua_ctx->obj);
 	if (ret < 0) {
@@ -406,6 +409,7 @@ int create_ust_channel_context(struct ust_app_channel *ua_chan,
 	DBG2("UST app context created successfully for channel %s", ua_chan->name);
 
 error:
+	health_code_update(&health_thread_cmd);
 	return ret;
 }
 
@@ -418,6 +422,8 @@ int create_ust_event_context(struct ust_app_event *ua_event,
 {
 	int ret;
 
+	health_code_update(&health_thread_cmd);
+
 	ret = ustctl_add_context(app->sock, &ua_ctx->ctx,
 			ua_event->obj, &ua_ctx->obj);
 	if (ret < 0) {
@@ -429,6 +435,7 @@ int create_ust_event_context(struct ust_app_event *ua_event,
 	DBG2("UST app context created successfully for event %s", ua_event->name);
 
 error:
+	health_code_update(&health_thread_cmd);
 	return ret;
 }
 
@@ -441,8 +448,11 @@ int set_ust_event_filter(struct ust_app_event *ua_event,
 {
 	int ret;
 
+	health_code_update(&health_thread_cmd);
+
 	if (!ua_event->filter) {
-		return 0;
+		ret = 0;
+		goto error;
 	}
 
 	ret = ustctl_set_filter(app->sock, ua_event->filter,
@@ -454,6 +464,7 @@ int set_ust_event_filter(struct ust_app_event *ua_event,
 	DBG2("UST filter set successfully for event %s", ua_event->name);
 
 error:
+	health_code_update(&health_thread_cmd);
 	return ret;
 }
 
@@ -465,6 +476,8 @@ static int disable_ust_event(struct ust_app *app,
 {
 	int ret;
 
+	health_code_update(&health_thread_cmd);
+
 	ret = ustctl_disable(app->sock, ua_event->obj);
 	if (ret < 0) {
 		ERR("UST app event %s disable failed for app (pid: %d) "
@@ -477,6 +490,7 @@ static int disable_ust_event(struct ust_app *app,
 			ua_event->attr.name, app->pid);
 
 error:
+	health_code_update(&health_thread_cmd);
 	return ret;
 }
 
@@ -488,6 +502,8 @@ static int disable_ust_channel(struct ust_app *app,
 {
 	int ret;
 
+	health_code_update(&health_thread_cmd);
+
 	ret = ustctl_disable(app->sock, ua_chan->obj);
 	if (ret < 0) {
 		ERR("UST app channel %s disable failed for app (pid: %d) "
@@ -500,6 +516,7 @@ static int disable_ust_channel(struct ust_app *app,
 			ua_chan->name, app->pid);
 
 error:
+	health_code_update(&health_thread_cmd);
 	return ret;
 }
 
@@ -511,6 +528,8 @@ static int enable_ust_channel(struct ust_app *app,
 {
 	int ret;
 
+	health_code_update(&health_thread_cmd);
+
 	ret = ustctl_enable(app->sock, ua_chan->obj);
 	if (ret < 0) {
 		ERR("UST app channel %s enable failed for app (pid: %d) "
@@ -525,6 +544,7 @@ static int enable_ust_channel(struct ust_app *app,
 			ua_chan->name, app->pid);
 
 error:
+	health_code_update(&health_thread_cmd);
 	return ret;
 }
 
@@ -536,6 +556,8 @@ static int enable_ust_event(struct ust_app *app,
 {
 	int ret;
 
+	health_code_update(&health_thread_cmd);
+
 	ret = ustctl_enable(app->sock, ua_event->obj);
 	if (ret < 0) {
 		ERR("UST app event %s enable failed for app (pid: %d) "
@@ -548,6 +570,7 @@ static int enable_ust_event(struct ust_app *app,
 			ua_event->attr.name, app->pid);
 
 error:
+	health_code_update(&health_thread_cmd);
 	return ret;
 }
 
@@ -560,6 +583,8 @@ static int open_ust_metadata(struct ust_app *app,
 	int ret;
 	struct lttng_ust_channel_attr uattr;
 
+	health_code_update(&health_thread_cmd);
+
 	uattr.overwrite = ua_sess->metadata->attr.overwrite;
 	uattr.subbuf_size = ua_sess->metadata->attr.subbuf_size;
 	uattr.num_subbuf = ua_sess->metadata->attr.num_subbuf;
@@ -587,6 +612,7 @@ static int open_ust_metadata(struct ust_app *app,
 	ua_sess->metadata->handle = ua_sess->metadata->obj->handle;
 
 error:
+	health_code_update(&health_thread_cmd);
 	return ret;
 }
 
@@ -598,6 +624,8 @@ static int create_ust_stream(struct ust_app *app,
 {
 	int ret;
 
+	health_code_update(&health_thread_cmd);
+
 	/* We are going to receive 2 fds, we need to reserve them. */
 	ret = lttng_fd_get(LTTNG_FD_APPS, 2);
 	if (ret < 0) {
@@ -612,6 +640,7 @@ static int create_ust_stream(struct ust_app *app,
 	}
 
 error:
+	health_code_update(&health_thread_cmd);
 	return ret;
 }
 
@@ -623,6 +652,8 @@ static int create_ust_channel(struct ust_app *app,
 {
 	int ret;
 
+	health_code_update(&health_thread_cmd);
+
 	/* TODO: remove cast and use lttng-ust-abi.h */
 
 	/* We are going to receive 2 fds, we need to reserve them. */
@@ -631,6 +662,9 @@ static int create_ust_channel(struct ust_app *app,
 		ERR("Exhausted number of available FD upon create channel");
 		goto error;
 	}
+
+	health_code_update(&health_thread_cmd);
+
 	ret = ustctl_create_channel(app->sock, ua_sess->handle,
 			(struct lttng_ust_channel_attr *)&ua_chan->attr, &ua_chan->obj);
 	if (ret < 0) {
@@ -647,6 +681,8 @@ static int create_ust_channel(struct ust_app *app,
 	DBG2("UST app channel %s created successfully for pid:%d and sock:%d",
 			ua_chan->name, app->pid, app->sock);
 
+	health_code_update(&health_thread_cmd);
+
 	/* If channel is not enabled, disable it on the tracer */
 	if (!ua_chan->enabled) {
 		ret = disable_ust_channel(app, ua_sess, ua_chan);
@@ -656,6 +692,7 @@ static int create_ust_channel(struct ust_app *app,
 	}
 
 error:
+	health_code_update(&health_thread_cmd);
 	return ret;
 }
 
@@ -668,6 +705,8 @@ int create_ust_event(struct ust_app *app, struct ust_app_session *ua_sess,
 {
 	int ret = 0;
 
+	health_code_update(&health_thread_cmd);
+
 	/* Create UST event on tracer */
 	ret = ustctl_create_event(app->sock, &ua_event->attr, ua_chan->obj,
 			&ua_event->obj);
@@ -686,6 +725,8 @@ int create_ust_event(struct ust_app *app, struct ust_app_session *ua_sess,
 	DBG2("UST app event %s created successfully for pid:%d",
 			ua_event->attr.name, app->pid);
 
+	health_code_update(&health_thread_cmd);
+
 	/* If event not enabled, disable it on the tracer */
 	if (ua_event->enabled == 0) {
 		ret = disable_ust_event(app, ua_sess, ua_event);
@@ -711,6 +752,7 @@ int create_ust_event(struct ust_app *app, struct ust_app_session *ua_sess,
 	}
 
 error:
+	health_code_update(&health_thread_cmd);
 	return ret;
 }
 
@@ -914,6 +956,8 @@ static struct ust_app_session *create_ust_app_session(
 	int ret;
 	struct ust_app_session *ua_sess;
 
+	health_code_update(&health_thread_cmd);
+
 	ua_sess = lookup_session_by_app(usess, app);
 	if (ua_sess == NULL) {
 		DBG2("UST app pid: %d session id %d not found, creating it",
@@ -926,6 +970,8 @@ static struct ust_app_session *create_ust_app_session(
 		shadow_copy_session(ua_sess, usess, app);
 	}
 
+	health_code_update(&health_thread_cmd);
+
 	if (ua_sess->handle == -1) {
 		ret = ustctl_create_session(app->sock);
 		if (ret < 0) {
@@ -945,10 +991,12 @@ static struct ust_app_session *create_ust_app_session(
 	}
 
 end:
+	health_code_update(&health_thread_cmd);
 	return ua_sess;
 
 error:
 	delete_ust_app_session(-1, ua_sess);
+	health_code_update(&health_thread_cmd);
 	return NULL;
 }
 
@@ -1357,8 +1405,10 @@ int ust_app_register(struct ust_register_msg *msg, int sock)
 	struct ust_app *lta;
 	int ret;
 
-	if ((msg->bits_per_long == 64 && ust_consumerd64_fd == -EINVAL)
-			|| (msg->bits_per_long == 32 && ust_consumerd32_fd == -EINVAL)) {
+	if ((msg->bits_per_long == 64 &&
+				(uatomic_read(&ust_consumerd64_fd) == -EINVAL))
+			|| (msg->bits_per_long == 32 &&
+				(uatomic_read(&ust_consumerd32_fd) == -EINVAL))) {
 		ERR("Registration failed: application \"%s\" (pid: %d) has "
 			"%d-bit long, but no consumerd for this long size is available.\n",
 			msg->name, msg->pid, msg->bits_per_long);
@@ -1509,6 +1559,8 @@ int ust_app_list_events(struct lttng_event **events)
 	cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, app, pid_n.node) {
 		struct lttng_ust_tracepoint_iter uiter;
 
+		health_code_update(&health_thread_cmd);
+
 		if (!app->compatible) {
 			/*
 			 * TODO: In time, we should notice the caller of this error by
@@ -1525,6 +1577,7 @@ int ust_app_list_events(struct lttng_event **events)
 
 		while ((ret = ustctl_tracepoint_list_get(app->sock, handle,
 						&uiter)) != -ENOENT) {
+			health_code_update(&health_thread_cmd);
 			if (count >= nbmem) {
 				DBG2("Reallocating event list from %zu to %zu entries", nbmem,
 						2 * nbmem);
@@ -1553,6 +1606,7 @@ int ust_app_list_events(struct lttng_event **events)
 rcu_error:
 	rcu_read_unlock();
 error:
+	health_code_update(&health_thread_cmd);
 	return ret;
 }
 
@@ -1580,6 +1634,8 @@ int ust_app_list_event_fields(struct lttng_event_field **fields)
 	cds_lfht_for_each_entry(ust_app_ht->ht, &iter.iter, app, pid_n.node) {
 		struct lttng_ust_field_iter uiter;
 
+		health_code_update(&health_thread_cmd);
+
 		if (!app->compatible) {
 			/*
 			 * TODO: In time, we should notice the caller of this error by
@@ -1596,6 +1652,7 @@ int ust_app_list_event_fields(struct lttng_event_field **fields)
 
 		while ((ret = ustctl_tracepoint_field_list_get(app->sock, handle,
 						&uiter)) != -ENOENT) {
+			health_code_update(&health_thread_cmd);
 			if (count >= nbmem) {
 				DBG2("Reallocating event field list from %zu to %zu entries", nbmem,
 						2 * nbmem);
@@ -1610,6 +1667,7 @@ int ust_app_list_event_fields(struct lttng_event_field **fields)
 
 			memcpy(tmp[count].field_name, uiter.field_name, LTTNG_UST_SYM_NAME_LEN);
 			tmp[count].type = uiter.type;
+			tmp[count].nowrite = uiter.nowrite;
 
 			memcpy(tmp[count].event.name, uiter.event_name, LTTNG_UST_SYM_NAME_LEN);
 			tmp[count].event.loglevel = uiter.loglevel;
@@ -1628,6 +1686,7 @@ int ust_app_list_event_fields(struct lttng_event_field **fields)
 rcu_error:
 	rcu_read_unlock();
 error:
+	health_code_update(&health_thread_cmd);
 	return ret;
 }
 
@@ -2099,7 +2158,7 @@ int ust_app_start_trace(struct ltt_ust_session *usess, struct ust_app *app)
 	struct ust_app_session *ua_sess;
 	struct ust_app_channel *ua_chan;
 	struct ltt_ust_stream *ustream;
-	int consumerd_fd;
+	struct consumer_socket *socket;
 
 	DBG("Starting tracing for ust app pid %d", app->pid);
 
@@ -2119,11 +2178,26 @@ int ust_app_start_trace(struct ltt_ust_session *usess, struct ust_app *app)
 		goto skip_setup;
 	}
 
+	/* Create directories if consumer is LOCAL and has a path defined. */
+	if (usess->consumer->type == CONSUMER_DST_LOCAL &&
+			strlen(usess->consumer->dst.trace_path) > 0) {
+		ret = run_as_mkdir_recursive(usess->consumer->dst.trace_path,
+				S_IRWXU | S_IRWXG, usess->uid, usess->gid);
+		if (ret < 0) {
+			if (ret != -EEXIST) {
+				ERR("Trace directory creation error");
+				ret = -1;
+				goto error_rcu_unlock;
+			}
+		}
+	}
+
 	/* Indicate that the session has been started once */
 	ua_sess->started = 1;
 
 	ret = create_ust_app_metadata(ua_sess, usess->pathname, app);
 	if (ret < 0) {
+		ret = LTTNG_ERR_UST_META_FAIL;
 		goto error_rcu_unlock;
 	}
 
@@ -2146,20 +2220,27 @@ int ust_app_start_trace(struct ltt_ust_session *usess, struct ust_app *app)
 				free(ustream);
 				goto error_rcu_unlock;
 			}
+
+			health_code_update(&health_thread_cmd);
+
 			ret = ustctl_create_stream(app->sock, ua_chan->obj,
 					&ustream->obj);
 			if (ret < 0) {
 				/* Got all streams */
 				lttng_fd_put(LTTNG_FD_APPS, 2);
 				free(ustream);
+				ret = LTTNG_ERR_UST_STREAM_FAIL;
 				break;
 			}
 			ustream->handle = ustream->obj->handle;
 
+			health_code_update(&health_thread_cmd);
+
 			/* Order is important */
 			cds_list_add_tail(&ustream->list, &ua_chan->streams.head);
 			ret = snprintf(ustream->name, sizeof(ustream->name), "%s_%u",
-					ua_chan->name, ua_chan->streams.count++);
+					ua_chan->name, ua_chan->streams.count);
+			ua_chan->streams.count++;
 			if (ret < 0) {
 				PERROR("asprintf UST create stream");
 				/*
@@ -2171,14 +2252,24 @@ int ust_app_start_trace(struct ltt_ust_session *usess, struct ust_app *app)
 			DBG2("UST stream %d ready (handle: %d)", ua_chan->streams.count,
 					ustream->handle);
 		}
+
+		health_code_update(&health_thread_cmd);
 	}
 
 	switch (app->bits_per_long) {
 	case 64:
-		consumerd_fd = ust_consumerd64_fd;
+		socket = consumer_find_socket(uatomic_read(&ust_consumerd64_fd),
+				usess->consumer);
+		if (socket == NULL) {
+			goto skip_setup;
+		}
 		break;
 	case 32:
-		consumerd_fd = ust_consumerd32_fd;
+		socket = consumer_find_socket(uatomic_read(&ust_consumerd32_fd),
+				usess->consumer);
+		if (socket == NULL) {
+			goto skip_setup;
+		}
 		break;
 	default:
 		ret = -EINVAL;
@@ -2186,11 +2277,13 @@ int ust_app_start_trace(struct ltt_ust_session *usess, struct ust_app *app)
 	}
 
 	/* Setup UST consumer socket and send fds to it */
-	ret = ust_consumer_send_session(consumerd_fd, ua_sess, usess->consumer);
+	ret = ust_consumer_send_session(ua_sess, usess->consumer, socket);
 	if (ret < 0) {
 		goto error_rcu_unlock;
 	}
 
+	health_code_update(&health_thread_cmd);
+
 skip_setup:
 	/* This start the UST tracing */
 	ret = ustctl_start_session(app->sock, ua_sess->handle);
@@ -2199,15 +2292,19 @@ skip_setup:
 		goto error_rcu_unlock;
 	}
 
+	health_code_update(&health_thread_cmd);
+
 	/* Quiescent wait after starting trace */
 	ustctl_wait_quiescent(app->sock);
 
 end:
 	rcu_read_unlock();
+	health_code_update(&health_thread_cmd);
 	return 0;
 
 error_rcu_unlock:
 	rcu_read_unlock();
+	health_code_update(&health_thread_cmd);
 	return -1;
 }
 
@@ -2242,6 +2339,8 @@ int ust_app_stop_trace(struct ltt_ust_session *usess, struct ust_app *app)
 	 */
 	assert(ua_sess->started == 1);
 
+	health_code_update(&health_thread_cmd);
+
 	/* This inhibits UST tracing */
 	ret = ustctl_stop_session(app->sock, ua_sess->handle);
 	if (ret < 0) {
@@ -2249,12 +2348,17 @@ int ust_app_stop_trace(struct ltt_ust_session *usess, struct ust_app *app)
 		goto error_rcu_unlock;
 	}
 
+	health_code_update(&health_thread_cmd);
+
 	/* Quiescent wait after stopping trace */
 	ustctl_wait_quiescent(app->sock);
 
+	health_code_update(&health_thread_cmd);
+
 	/* Flushing buffers */
 	cds_lfht_for_each_entry(ua_sess->channels->ht, &iter.iter, ua_chan,
 			node.node) {
+		health_code_update(&health_thread_cmd);
 		ret = ustctl_sock_flush_buffer(app->sock, ua_chan->obj);
 		if (ret < 0) {
 			ERR("UST app PID %d channel %s flush failed with ret %d",
@@ -2264,6 +2368,8 @@ int ust_app_stop_trace(struct ltt_ust_session *usess, struct ust_app *app)
 		}
 	}
 
+	health_code_update(&health_thread_cmd);
+
 	/* Flush all buffers before stopping */
 	ret = ustctl_sock_flush_buffer(app->sock, ua_sess->metadata->obj);
 	if (ret < 0) {
@@ -2273,10 +2379,12 @@ int ust_app_stop_trace(struct ltt_ust_session *usess, struct ust_app *app)
 
 end:
 	rcu_read_unlock();
+	health_code_update(&health_thread_cmd);
 	return 0;
 
 error_rcu_unlock:
 	rcu_read_unlock();
+	health_code_update(&health_thread_cmd);
 	return -1;
 }
 
@@ -2312,8 +2420,10 @@ int ust_app_destroy_trace(struct ltt_ust_session *usess, struct ust_app *app)
 	obj.shm_fd = -1;
 	obj.wait_fd = -1;
 	obj.memory_map_size = 0;
+	health_code_update(&health_thread_cmd);
 	ustctl_release_object(app->sock, &obj);
 
+	health_code_update(&health_thread_cmd);
 	delete_ust_app_session(app->sock, ua_sess);
 
 	/* Quiescent wait after stopping trace */
@@ -2321,10 +2431,12 @@ int ust_app_destroy_trace(struct ltt_ust_session *usess, struct ust_app *app)
 
 end:
 	rcu_read_unlock();
+	health_code_update(&health_thread_cmd);
 	return 0;
 
 error_rcu_unlock:
 	rcu_read_unlock();
+	health_code_update(&health_thread_cmd);
 	return -1;
 }
 
@@ -2805,29 +2917,33 @@ int ust_app_validate_version(int sock)
 	app = find_app_by_sock(sock);
 	assert(app);
 
+	health_code_update(&health_thread_cmd);
+
 	ret = ustctl_tracer_version(sock, &app->version);
 	if (ret < 0) {
 		goto error;
 	}
 
 	/* Validate version */
-	if (app->version.major > UST_APP_MAJOR_VERSION) {
+	if (app->version.major != UST_APP_MAJOR_VERSION) {
 		goto error;
 	}
 
-	DBG2("UST app PID %d is compatible with major version %d "
-			"(supporting <= %d)", app->pid, app->version.major,
+	DBG2("UST app PID %d is compatible with internal major version %d "
+			"(supporting == %d)", app->pid, app->version.major,
 			UST_APP_MAJOR_VERSION);
 	app->compatible = 1;
 	rcu_read_unlock();
+	health_code_update(&health_thread_cmd);
 	return 0;
 
 error:
-	DBG2("UST app PID %d is not compatible with major version %d "
-			"(supporting <= %d)", app->pid, app->version.major,
+	DBG2("UST app PID %d is not compatible with internal major version %d "
+			"(supporting == %d)", app->pid, app->version.major,
 			UST_APP_MAJOR_VERSION);
 	app->compatible = 0;
 	rcu_read_unlock();
+	health_code_update(&health_thread_cmd);
 	return -1;
 }
 
@@ -2851,6 +2967,8 @@ int ust_app_calibrate_glb(struct lttng_ust_calibrate *calibrate)
 			continue;
 		}
 
+		health_code_update(&health_thread_cmd);
+
 		ret = ustctl_calibrate(app->sock, calibrate);
 		if (ret < 0) {
 			switch (ret) {
@@ -2871,5 +2989,7 @@ int ust_app_calibrate_glb(struct lttng_ust_calibrate *calibrate)
 
 	rcu_read_unlock();
 
+	health_code_update(&health_thread_cmd);
+
 	return ret;
 }