X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer.c;h=c2153798b16472d0743b0732659af9b33a1dfe14;hb=6f6a85590e2bd7b3d46af38a4fd7a439d3e1fbc0;hp=eed346d06253a2e44ec0298ab846b3e386da839f;hpb=584fc280d529740882a24c87a431e547b5acf8e0;p=lttng-tools.git

diff --git a/src/common/consumer.c b/src/common/consumer.c
index eed346d06..c2153798b 100644
--- a/src/common/consumer.c
+++ b/src/common/consumer.c
@@ -285,6 +285,17 @@ static void free_channel_rcu(struct rcu_head *head)
 	struct lttng_consumer_channel *channel =
 		caa_container_of(node, struct lttng_consumer_channel, node);
 
+	switch (consumer_data.type) {
+	case LTTNG_CONSUMER_KERNEL:
+		break;
+	case LTTNG_CONSUMER32_UST:
+	case LTTNG_CONSUMER64_UST:
+		lttng_ustconsumer_free_channel(channel);
+		break;
+	default:
+		ERR("Unknown consumer_data type");
+		abort();
+	}
 	free(channel);
 }
 
@@ -1575,6 +1586,12 @@ ssize_t lttng_consumer_on_read_subbuffer_mmap(
 			outfd = stream->out_fd;
 
 			if (stream->index_fd >= 0) {
+				ret = close(stream->index_fd);
+				if (ret < 0) {
+					PERROR("Closing index");
+					goto end;
+				}
+				stream->index_fd = -1;
 				ret = index_create_file(stream->chan->pathname,
 						stream->name, stream->uid, stream->gid,
 						stream->chan->tracefile_size,
@@ -1758,6 +1775,12 @@ ssize_t lttng_consumer_on_read_subbuffer_splice(
 			outfd = stream->out_fd;
 
 			if (stream->index_fd >= 0) {
+				ret = close(stream->index_fd);
+				if (ret < 0) {
+					PERROR("Closing index");
+					goto end;
+				}
+				stream->index_fd = -1;
 				ret = index_create_file(stream->chan->pathname,
 						stream->name, stream->uid, stream->gid,
 						stream->chan->tracefile_size,
@@ -2190,10 +2213,10 @@ restart:
 		DBG("Metadata poll return from wait with %d fd(s)",
 				LTTNG_POLL_GETNB(&events));
 		health_poll_exit();
-		DBG("Metadata event catched in thread");
+		DBG("Metadata event caught in thread");
 		if (ret < 0) {
 			if (errno == EINTR) {
-				ERR("Poll EINTR catched");
+				ERR("Poll EINTR caught");
 				goto restart;
 			}
 			if (LTTNG_POLL_GETNB(&events) == 0) {
@@ -2333,7 +2356,7 @@ restart:
 				consumer_del_metadata_stream(stream, metadata_ht);
 			} else {
 				ERR("Unexpected poll events %u for sock %d", revents, pollfd);
-				rcu_read_unlock;
+				rcu_read_unlock();
 				goto end;
 			}
 			/* Release RCU lock for the stream looked up */
@@ -2773,10 +2796,10 @@ restart:
 		DBG("Channel poll return from wait with %d fd(s)",
 				LTTNG_POLL_GETNB(&events));
 		health_poll_exit();
-		DBG("Channel event catched in thread");
+		DBG("Channel event caught in thread");
 		if (ret < 0) {
 			if (errno == EINTR) {
-				ERR("Poll EINTR catched");
+				ERR("Poll EINTR caught");
 				goto restart;
 			}
 			if (LTTNG_POLL_GETNB(&events) == 0) {