X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=liblttng-consumer%2Flttng-consumer.c;h=0811e68ca8e8368c7695f92f37a44c906b42b7c0;hp=0d8dd00143fb6d75b52b0e53c81088e853abaccc;hb=6df2e2c977b698cc6b8f15c90b649516674028f9;hpb=effcf122563da70fc22a5dcadf4fce3476035c54

diff --git a/liblttng-consumer/lttng-consumer.c b/liblttng-consumer/lttng-consumer.c
index 0d8dd0014..0811e68ca 100644
--- a/liblttng-consumer/lttng-consumer.c
+++ b/liblttng-consumer/lttng-consumer.c
@@ -129,7 +129,8 @@ void consumer_del_stream(struct lttng_consumer_stream *stream)
 			}
 		}
 		break;
-	case LTTNG_CONSUMER_UST:
+	case LTTNG_CONSUMER32_UST:
+	case LTTNG_CONSUMER64_UST:
 		lttng_ustconsumer_del_stream(stream);
 		break;
 	default:
@@ -173,7 +174,9 @@ struct lttng_consumer_stream *consumer_allocate_stream(
 		enum lttng_consumer_stream_state state,
 		uint64_t mmap_len,
 		enum lttng_event_output output,
-		const char *path_name)
+		const char *path_name,
+		uid_t uid,
+		gid_t gid)
 {
 	struct lttng_consumer_stream *stream;
 	int ret;
@@ -198,13 +201,16 @@ struct lttng_consumer_stream *consumer_allocate_stream(
 	stream->mmap_len = mmap_len;
 	stream->mmap_base = NULL;
 	stream->output = output;
+	stream->uid = uid;
+	stream->gid = gid;
 	strncpy(stream->path_name, path_name, PATH_MAX - 1);
 	stream->path_name[PATH_MAX - 1] = '\0';
 
 	switch (consumer_data.type) {
 	case LTTNG_CONSUMER_KERNEL:
 		break;
-	case LTTNG_CONSUMER_UST:
+	case LTTNG_CONSUMER32_UST:
+	case LTTNG_CONSUMER64_UST:
 		stream->cpu = stream->chan->cpucount++;
 		ret = lttng_ustconsumer_allocate_stream(stream);
 		if (ret) {
@@ -244,7 +250,8 @@ int consumer_add_stream(struct lttng_consumer_stream *stream)
 	switch (consumer_data.type) {
 	case LTTNG_CONSUMER_KERNEL:
 		break;
-	case LTTNG_CONSUMER_UST:
+	case LTTNG_CONSUMER32_UST:
+	case LTTNG_CONSUMER64_UST:
 		/* Streams are in CPU number order (we rely on this) */
 		stream->cpu = stream->chan->nr_streams++;
 		break;
@@ -289,7 +296,8 @@ void consumer_del_channel(struct lttng_consumer_channel *channel)
 	switch (consumer_data.type) {
 	case LTTNG_CONSUMER_KERNEL:
 		break;
-	case LTTNG_CONSUMER_UST:
+	case LTTNG_CONSUMER32_UST:
+	case LTTNG_CONSUMER64_UST:
 		lttng_ustconsumer_del_channel(channel);
 		break;
 	default:
@@ -344,7 +352,8 @@ struct lttng_consumer_channel *consumer_allocate_channel(
 		channel->mmap_base = NULL;
 		channel->mmap_len = 0;
 		break;
-	case LTTNG_CONSUMER_UST:
+	case LTTNG_CONSUMER32_UST:
+	case LTTNG_CONSUMER64_UST:
 		ret = lttng_ustconsumer_allocate_channel(channel);
 		if (ret) {
 			free(channel);
@@ -656,7 +665,8 @@ int lttng_consumer_on_read_subbuffer_mmap(
 	switch (consumer_data.type) {
 	case LTTNG_CONSUMER_KERNEL:
 		return lttng_kconsumer_on_read_subbuffer_mmap(ctx, stream, len);
-	case LTTNG_CONSUMER_UST:
+	case LTTNG_CONSUMER32_UST:
+	case LTTNG_CONSUMER64_UST:
 		return lttng_ustconsumer_on_read_subbuffer_mmap(ctx, stream, len);
 	default:
 		ERR("Unknown consumer_data type");
@@ -676,7 +686,8 @@ int lttng_consumer_on_read_subbuffer_splice(
 	switch (consumer_data.type) {
 	case LTTNG_CONSUMER_KERNEL:
 		return lttng_kconsumer_on_read_subbuffer_splice(ctx, stream, len);
-	case LTTNG_CONSUMER_UST:
+	case LTTNG_CONSUMER32_UST:
+	case LTTNG_CONSUMER64_UST:
 		return -ENOSYS;
 	default:
 		ERR("Unknown consumer_data type");
@@ -697,7 +708,8 @@ int lttng_consumer_take_snapshot(struct lttng_consumer_local_data *ctx,
 	switch (consumer_data.type) {
 	case LTTNG_CONSUMER_KERNEL:
 		return lttng_kconsumer_take_snapshot(ctx, stream);
-	case LTTNG_CONSUMER_UST:
+	case LTTNG_CONSUMER32_UST:
+	case LTTNG_CONSUMER64_UST:
 		return lttng_ustconsumer_take_snapshot(ctx, stream);
 	default:
 		ERR("Unknown consumer_data type");
@@ -720,7 +732,8 @@ int lttng_consumer_get_produced_snapshot(
 	switch (consumer_data.type) {
 	case LTTNG_CONSUMER_KERNEL:
 		return lttng_kconsumer_get_produced_snapshot(ctx, stream, pos);
-	case LTTNG_CONSUMER_UST:
+	case LTTNG_CONSUMER32_UST:
+	case LTTNG_CONSUMER64_UST:
 		return lttng_ustconsumer_get_produced_snapshot(ctx, stream, pos);
 	default:
 		ERR("Unknown consumer_data type");
@@ -735,7 +748,8 @@ int lttng_consumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 	switch (consumer_data.type) {
 	case LTTNG_CONSUMER_KERNEL:
 		return lttng_kconsumer_recv_cmd(ctx, sock, consumer_sockpoll);
-	case LTTNG_CONSUMER_UST:
+	case LTTNG_CONSUMER32_UST:
+	case LTTNG_CONSUMER64_UST:
 		return lttng_ustconsumer_recv_cmd(ctx, sock, consumer_sockpoll);
 	default:
 		ERR("Unknown consumer_data type");
@@ -862,7 +876,8 @@ void *lttng_consumer_thread_poll_fds(void *data)
 				num_hup++;
 			} else if ((pollfd[i].revents & POLLHUP) &&
 					!(pollfd[i].revents & POLLIN)) {
-				if (consumer_data.type == LTTNG_CONSUMER_UST) {
+				if (consumer_data.type == LTTNG_CONSUMER32_UST
+						|| consumer_data.type == LTTNG_CONSUMER64_UST) {
 					DBG("Polling fd %d tells it has hung up. Attempting flush and read.",
 						pollfd[i].fd);
 					if (!local_stream[i]->hangup_flush_done) {
@@ -1034,7 +1049,8 @@ int lttng_consumer_read_subbuffer(struct lttng_consumer_stream *stream,
 	switch (consumer_data.type) {
 	case LTTNG_CONSUMER_KERNEL:
 		return lttng_kconsumer_read_subbuffer(stream, ctx);
-	case LTTNG_CONSUMER_UST:
+	case LTTNG_CONSUMER32_UST:
+	case LTTNG_CONSUMER64_UST:
 		return lttng_ustconsumer_read_subbuffer(stream, ctx);
 	default:
 		ERR("Unknown consumer_data type");
@@ -1048,7 +1064,8 @@ int lttng_consumer_on_recv_stream(struct lttng_consumer_stream *stream)
 	switch (consumer_data.type) {
 	case LTTNG_CONSUMER_KERNEL:
 		return lttng_kconsumer_on_recv_stream(stream);
-	case LTTNG_CONSUMER_UST:
+	case LTTNG_CONSUMER32_UST:
+	case LTTNG_CONSUMER64_UST:
 		return lttng_ustconsumer_on_recv_stream(stream);
 	default:
 		ERR("Unknown consumer_data type");