X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-consumer.c;h=0fe560661a0b125ceefc3a545d8fc020f1a57854;hb=ca806b0b247f89c62ac628a7779ae84049a8c2d7;hp=25dc7ed1c6da96c5fa8cfba14e95d78dab0e9ac1;hpb=a2814ea7573bf5edd5323d6f89c48ff14105db69;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ust-consumer.c b/src/bin/lttng-sessiond/ust-consumer.c
index 25dc7ed1c..0fe560661 100644
--- a/src/bin/lttng-sessiond/ust-consumer.c
+++ b/src/bin/lttng-sessiond/ust-consumer.c
@@ -6,13 +6,13 @@
  */
 
 #define _LGPL_SOURCE
-#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <inttypes.h>
 
+#include <common/compat/errno.h>
 #include <common/common.h>
 #include <common/consumer/consumer.h>
 #include <common/defaults.h>
@@ -42,17 +42,17 @@ static int ask_channel_creation(struct ust_app_session *ua_sess,
 	uint64_t key, chan_reg_key;
 	char *pathname = NULL;
 	struct lttcomm_consumer_msg msg;
-	struct ust_registry_channel *chan_reg;
+	struct ust_registry_channel *ust_reg_chan;
 	char shm_path[PATH_MAX] = "";
 	char root_shm_path[PATH_MAX] = "";
 	bool is_local_trace;
 	size_t consumer_path_offset = 0;
 
-	assert(ua_sess);
-	assert(ua_chan);
-	assert(socket);
-	assert(consumer);
-	assert(registry);
+	LTTNG_ASSERT(ua_sess);
+	LTTNG_ASSERT(ua_chan);
+	LTTNG_ASSERT(socket);
+	LTTNG_ASSERT(consumer);
+	LTTNG_ASSERT(registry);
 
 	DBG2("Asking UST consumer for channel");
 
@@ -97,7 +97,7 @@ static int ask_channel_creation(struct ust_app_session *ua_sess,
 		chan_reg_key = ua_chan->key;
 	}
 
-	if (ua_chan->attr.type == LTTNG_UST_CHAN_METADATA) {
+	if (ua_chan->attr.type == LTTNG_UST_ABI_CHAN_METADATA) {
 		chan_id = -1U;
 		/*
 		 * Metadata channels shm_path (buffers) are handled within
@@ -105,9 +105,9 @@ static int ask_channel_creation(struct ust_app_session *ua_sess,
 		 * those buffer files.
 		 */
 	} else {
-		chan_reg = ust_registry_channel_find(registry, chan_reg_key);
-		assert(chan_reg);
-		chan_id = chan_reg->chan_id;
+		ust_reg_chan = ust_registry_channel_find(registry, chan_reg_key);
+		LTTNG_ASSERT(ust_reg_chan);
+		chan_id = ust_reg_chan->chan_id;
 		if (ua_sess->shm_path[0]) {
 			strncpy(shm_path, ua_sess->shm_path, sizeof(shm_path));
 			shm_path[sizeof(shm_path) - 1] = '\0';
@@ -123,7 +123,7 @@ static int ask_channel_creation(struct ust_app_session *ua_sess,
 	}
 
 	switch (ua_chan->attr.output) {
-	case LTTNG_UST_MMAP:
+	case LTTNG_UST_ABI_MMAP:
 	default:
 		output = LTTNG_EVENT_MMAP;
 		break;
@@ -151,7 +151,7 @@ static int ask_channel_creation(struct ust_app_session *ua_sess,
 			ua_chan->tracefile_count,
 			ua_sess->id,
 			ua_sess->output_traces,
-			ua_sess->real_credentials.uid,
+			lttng_credentials_get_uid(&ua_sess->real_credentials),
 			ua_chan->attr.blocking_timeout,
 			root_shm_path, shm_path,
 			trace_chunk,
@@ -170,10 +170,10 @@ static int ask_channel_creation(struct ust_app_session *ua_sess,
 		goto error;
 	}
 	/* Communication protocol error. */
-	assert(key == ua_chan->key);
+	LTTNG_ASSERT(key == ua_chan->key);
 	/* We need at least one where 1 stream for 1 cpu. */
 	if (ua_sess->output_traces) {
-		assert(ua_chan->expected_stream_count > 0);
+		LTTNG_ASSERT(ua_chan->expected_stream_count > 0);
 	}
 
 	DBG2("UST ask channel %" PRIu64 " successfully done with %u stream(s)", key,
@@ -201,11 +201,11 @@ int ust_consumer_ask_channel(struct ust_app_session *ua_sess,
 {
 	int ret;
 
-	assert(ua_sess);
-	assert(ua_chan);
-	assert(consumer);
-	assert(socket);
-	assert(registry);
+	LTTNG_ASSERT(ua_sess);
+	LTTNG_ASSERT(ua_chan);
+	LTTNG_ASSERT(consumer);
+	LTTNG_ASSERT(socket);
+	LTTNG_ASSERT(registry);
 
 	if (!consumer->enabled) {
 		ret = -LTTNG_ERR_NO_CONSUMER;
@@ -238,8 +238,8 @@ int ust_consumer_get_channel(struct consumer_socket *socket,
 	int ret;
 	struct lttcomm_consumer_msg msg;
 
-	assert(ua_chan);
-	assert(socket);
+	LTTNG_ASSERT(ua_chan);
+	LTTNG_ASSERT(socket);
 
 	memset(&msg, 0, sizeof(msg));
 	msg.cmd_type = LTTNG_CONSUMER_GET_CHANNEL;
@@ -255,7 +255,7 @@ int ust_consumer_get_channel(struct consumer_socket *socket,
 	}
 
 	/* First, get the channel from consumer. */
-	ret = ustctl_recv_channel_from_consumer(*socket->fd_ptr, &ua_chan->obj);
+	ret = lttng_ust_ctl_recv_channel_from_consumer(*socket->fd_ptr, &ua_chan->obj);
 	if (ret < 0) {
 		if (ret != -EPIPE) {
 			ERR("Error recv channel from consumer %d with ret %d",
@@ -278,7 +278,7 @@ int ust_consumer_get_channel(struct consumer_socket *socket,
 		}
 
 		/* Stream object is populated by this call if successful. */
-		ret = ustctl_recv_stream_from_consumer(*socket->fd_ptr, &stream->obj);
+		ret = lttng_ust_ctl_recv_stream_from_consumer(*socket->fd_ptr, &stream->obj);
 		if (ret < 0) {
 			free(stream);
 			if (ret == -LTTNG_UST_ERR_NOENT) {
@@ -302,7 +302,7 @@ int ust_consumer_get_channel(struct consumer_socket *socket,
 	}
 
 	/* This MUST match or else we have a synchronization problem. */
-	assert(ua_chan->expected_stream_count == ua_chan->streams.count);
+	LTTNG_ASSERT(ua_chan->expected_stream_count == ua_chan->streams.count);
 
 	/* Wait for confirmation that we can proceed with the streams. */
 	ret = consumer_recv_status_reply(socket);
@@ -332,8 +332,8 @@ int ust_consumer_destroy_channel(struct consumer_socket *socket,
 	int ret;
 	struct lttcomm_consumer_msg msg;
 
-	assert(ua_chan);
-	assert(socket);
+	LTTNG_ASSERT(ua_chan);
+	LTTNG_ASSERT(socket);
 
 	memset(&msg, 0, sizeof(msg));
 	msg.cmd_type = LTTNG_CONSUMER_DESTROY_CHANNEL;
@@ -363,15 +363,15 @@ int ust_consumer_send_stream_to_ust(struct ust_app *app,
 {
 	int ret;
 
-	assert(app);
-	assert(stream);
-	assert(channel);
+	LTTNG_ASSERT(app);
+	LTTNG_ASSERT(stream);
+	LTTNG_ASSERT(channel);
 
 	DBG2("UST consumer send stream to app %d", app->sock);
 
 	/* Relay stream to application. */
 	pthread_mutex_lock(&app->sock_lock);
-	ret = ustctl_send_stream_to_ust(app->sock, channel->obj, stream->obj);
+	ret = lttng_ust_ctl_send_stream_to_ust(app->sock, channel->obj, stream->obj);
 	pthread_mutex_unlock(&app->sock_lock);
 	if (ret < 0) {
 		if (ret != -EPIPE && ret != -LTTNG_UST_ERR_EXITING) {
@@ -398,17 +398,17 @@ int ust_consumer_send_channel_to_ust(struct ust_app *app,
 {
 	int ret;
 
-	assert(app);
-	assert(ua_sess);
-	assert(channel);
-	assert(channel->obj);
+	LTTNG_ASSERT(app);
+	LTTNG_ASSERT(ua_sess);
+	LTTNG_ASSERT(channel);
+	LTTNG_ASSERT(channel->obj);
 
 	DBG2("UST app send channel to sock %d pid %d (name: %s, key: %" PRIu64 ")",
 			app->sock, app->pid, channel->name, channel->tracing_channel_id);
 
 	/* Send stream to application. */
 	pthread_mutex_lock(&app->sock_lock);
-	ret = ustctl_send_channel_to_ust(app->sock, ua_sess->handle, channel->obj);
+	ret = lttng_ust_ctl_send_channel_to_ust(app->sock, ua_sess->handle, channel->obj);
 	pthread_mutex_unlock(&app->sock_lock);
 	if (ret < 0) {
 		if (ret != -EPIPE && ret != -LTTNG_UST_ERR_EXITING) {
@@ -438,7 +438,7 @@ int ust_consumer_metadata_request(struct consumer_socket *socket)
 	struct ust_registry_session *ust_reg;
 	struct lttcomm_consumer_msg msg;
 
-	assert(socket);
+	LTTNG_ASSERT(socket);
 
 	rcu_read_lock();
 	health_code_update();
@@ -481,7 +481,7 @@ int ust_consumer_metadata_request(struct consumer_socket *socket)
 		}
 		ust_reg = reg_pid->registry->reg.ust;
 	}
-	assert(ust_reg);
+	LTTNG_ASSERT(ust_reg);
 
 	pthread_mutex_lock(&ust_reg->lock);
 	ret_push = ust_app_push_metadata(ust_reg, socket, 1);