X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=liblttng-consumer%2Flttng-consumer.c;h=293d5f808ea0d2f68d441554563b239911fd02b8;hb=7ad0a0cb283d4004cf9274df8eec4e3530864fc7;hp=5311860e01ac3d5c145991c194d3f3a32060d96f;hpb=b5c5fc2947ec79834e054e0117414b717faeee4d;p=lttng-tools.git

diff --git a/liblttng-consumer/lttng-consumer.c b/liblttng-consumer/lttng-consumer.c
index 5311860e0..293d5f808 100644
--- a/liblttng-consumer/lttng-consumer.c
+++ b/liblttng-consumer/lttng-consumer.c
@@ -63,6 +63,9 @@ static struct lttng_consumer_stream *consumer_find_stream(int key)
 {
 	struct lttng_consumer_stream *iter;
 
+	/* Negative keys are lookup failures */
+	if (key < 0)
+		return NULL;
 	cds_list_for_each_entry(iter, &consumer_data.stream_list.head, list) {
 		if (iter->key == key) {
 			DBG("Found stream key %d", key);
@@ -72,10 +75,22 @@ static struct lttng_consumer_stream *consumer_find_stream(int key)
 	return NULL;
 }
 
+static void consumer_steal_stream_key(int key)
+{
+	struct lttng_consumer_stream *stream;
+
+	stream = consumer_find_stream(key);
+	if (stream)
+		stream->key = -1;
+}
+
 static struct lttng_consumer_channel *consumer_find_channel(int key)
 {
 	struct lttng_consumer_channel *iter;
 
+	/* Negative keys are lookup failures */
+	if (key < 0)
+		return NULL;
 	cds_list_for_each_entry(iter, &consumer_data.channel_list.head, list) {
 		if (iter->key == key) {
 			DBG("Found channel key %d", key);
@@ -85,6 +100,15 @@ static struct lttng_consumer_channel *consumer_find_channel(int key)
 	return NULL;
 }
 
+static void consumer_steal_channel_key(int key)
+{
+	struct lttng_consumer_channel *channel;
+
+	channel = consumer_find_channel(key);
+	if (channel)
+		channel->key = -1;
+}
+
 /*
  * Remove a stream from the global list protected by a mutex. This
  * function is also responsible for freeing its data structures.
@@ -181,6 +205,7 @@ struct lttng_consumer_stream *consumer_allocate_stream(
 	case LTTNG_CONSUMER_KERNEL:
 		break;
 	case LTTNG_CONSUMER_UST:
+		stream->cpu = stream->chan->cpucount++;
 		ret = lttng_ustconsumer_allocate_stream(stream);
 		if (ret) {
 			free(stream);
@@ -210,11 +235,8 @@ int consumer_add_stream(struct lttng_consumer_stream *stream)
 	int ret = 0;
 
 	pthread_mutex_lock(&consumer_data.lock);
-	/* Check if already exist */
-	if (consumer_find_stream(stream->key)) {
-		ret = -1;
-		goto end;
-	}
+	/* Steal stream identifier, for UST */
+	consumer_steal_stream_key(stream->key);
 	cds_list_add(&stream->list, &consumer_data.stream_list.head);
 	consumer_data.stream_count++;
 	consumer_data.need_update = 1;
@@ -304,7 +326,7 @@ struct lttng_consumer_channel *consumer_allocate_channel(
 	struct lttng_consumer_channel *channel;
 	int ret;
 
-	channel = malloc(sizeof(*channel));
+	channel = zmalloc(sizeof(*channel));
 	if (channel == NULL) {
 		perror("malloc struct lttng_consumer_channel");
 		goto end;
@@ -349,18 +371,12 @@ end:
  */
 int consumer_add_channel(struct lttng_consumer_channel *channel)
 {
-	int ret = 0;
-
 	pthread_mutex_lock(&consumer_data.lock);
-	/* Check if already exist */
-	if (consumer_find_channel(channel->key)) {
-		ret = -1;
-		goto end;
-	}
+	/* Steal channel identifier, for UST */
+	consumer_steal_channel_key(channel->key);
 	cds_list_add(&channel->list, &consumer_data.channel_list.head);
-end:
 	pthread_mutex_unlock(&consumer_data.lock);
-	return ret;
+	return 0;
 }
 
 /*
@@ -545,7 +561,8 @@ void lttng_consumer_sync_trace_file(
  */
 struct lttng_consumer_local_data *lttng_consumer_create(
 		enum lttng_consumer_type type,
-		int (*buffer_ready)(struct lttng_consumer_stream *stream),
+		int (*buffer_ready)(struct lttng_consumer_stream *stream,
+			struct lttng_consumer_local_data *ctx),
 		int (*recv_channel)(struct lttng_consumer_channel *channel),
 		int (*recv_stream)(struct lttng_consumer_stream *stream),
 		int (*update_stream)(int stream_key, uint32_t state))
@@ -805,7 +822,7 @@ void *lttng_consumer_thread_poll_fds(void *data)
 			goto end;
 		}
 
-		/* No FDs and consumer_quit, kconsumer_cleanup the thread */
+		/* No FDs and consumer_quit, consumer_cleanup the thread */
 		if (nb_fd == 0 && consumer_quit == 1) {
 			goto end;
 		}
@@ -816,42 +833,52 @@ void *lttng_consumer_thread_poll_fds(void *data)
 		 * array. We want to prioritize array update over
 		 * low-priority reads.
 		 */
-		if (pollfd[nb_fd].revents == POLLIN) {
+		if (pollfd[nb_fd].revents & POLLIN) {
 			DBG("consumer_poll_pipe wake up");
 			tmp2 = read(ctx->consumer_poll_pipe[0], &tmp, 1);
 			if (tmp2 < 0) {
-				perror("read kconsumer poll");
+				perror("read consumer poll");
 			}
 			continue;
 		}
 
 		/* Take care of high priority channels first. */
 		for (i = 0; i < nb_fd; i++) {
-			switch(pollfd[i].revents) {
-			case POLLERR:
+			if (pollfd[i].revents & POLLPRI) {
+				DBG("Urgent read on fd %d", pollfd[i].fd);
+				high_prio = 1;
+				ret = ctx->on_buffer_ready(local_stream[i], ctx);
+				/* it's ok to have an unavailable sub-buffer */
+				if (ret == EAGAIN) {
+					ret = 0;
+				}
+			} else if (pollfd[i].revents & POLLERR) {
 				ERR("Error returned in polling fd %d.", pollfd[i].fd);
 				consumer_del_stream(local_stream[i]);
 				num_hup++;
-				break;
-			case POLLHUP:
-				DBG("Polling fd %d tells it has hung up.", pollfd[i].fd);
-				consumer_del_stream(local_stream[i]);
-				num_hup++;
-				break;
-			case POLLNVAL:
+			} else if (pollfd[i].revents & POLLNVAL) {
 				ERR("Polling fd %d tells fd is not open.", pollfd[i].fd);
 				consumer_del_stream(local_stream[i]);
 				num_hup++;
-				break;
-			case POLLPRI:
-				DBG("Urgent read on fd %d", pollfd[i].fd);
-				high_prio = 1;
-				ret = ctx->on_buffer_ready(local_stream[i]);
-				/* it's ok to have an unavailable sub-buffer */
-				if (ret == EAGAIN) {
-					ret = 0;
+			} else if ((pollfd[i].revents & POLLHUP) &&
+					!(pollfd[i].revents & POLLIN)) {
+				if (consumer_data.type == LTTNG_CONSUMER_UST) {
+					DBG("Polling fd %d tells it has hung up. Attempting flush and read.",
+						pollfd[i].fd);
+					if (!local_stream[i]->hangup_flush_done) {
+						lttng_ustconsumer_on_stream_hangup(local_stream[i]);
+						/* try reading after flush */
+						ret = ctx->on_buffer_ready(local_stream[i], ctx);
+						/* it's ok to have an unavailable sub-buffer */
+						if (ret == EAGAIN) {
+							ret = 0;
+						}
+					}
+				} else {
+					DBG("Polling fd %d tells it has hung up.", pollfd[i].fd);
 				}
-				break;
+				consumer_del_stream(local_stream[i]);
+				num_hup++;
 			}
 		}
 
@@ -867,9 +894,9 @@ void *lttng_consumer_thread_poll_fds(void *data)
 		/* Take care of low priority channels. */
 		if (high_prio == 0) {
 			for (i = 0; i < nb_fd; i++) {
-				if (pollfd[i].revents == POLLIN) {
+				if (pollfd[i].revents & POLLIN) {
 					DBG("Normal read on fd %d", pollfd[i].fd);
-					ret = ctx->on_buffer_ready(local_stream[i]);
+					ret = ctx->on_buffer_ready(local_stream[i], ctx);
 					/* it's ok to have an unavailable subbuffer */
 					if (ret == EAGAIN) {
 						ret = 0;
@@ -1002,3 +1029,32 @@ end:
 	}
 	return NULL;
 }
+
+int lttng_consumer_read_subbuffer(struct lttng_consumer_stream *stream,
+		struct lttng_consumer_local_data *ctx)
+{
+	switch (consumer_data.type) {
+	case LTTNG_CONSUMER_KERNEL:
+		return lttng_kconsumer_read_subbuffer(stream, ctx);
+	case LTTNG_CONSUMER_UST:
+		return lttng_ustconsumer_read_subbuffer(stream, ctx);
+	default:
+		ERR("Unknown consumer_data type");
+		assert(0);
+		return -ENOSYS;
+	}
+}
+
+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:
+		return lttng_ustconsumer_on_recv_stream(stream);
+	default:
+		ERR("Unknown consumer_data type");
+		assert(0);
+		return -ENOSYS;
+	}
+}