X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer%2Fconsumer.c;h=cbd3f67a900d211fc6173de56464a4faa47c754f;hb=18acc0a479471e15fb7b7fc3ca5f38e7ce8f72d3;hp=a903ff9d2a643cda5c090f23ea84829416a55292;hpb=d85707b0cf4196ea0242f514211a84a144ccea77;p=lttng-tools.git

diff --git a/src/common/consumer/consumer.c b/src/common/consumer/consumer.c
index a903ff9d2..cbd3f67a9 100644
--- a/src/common/consumer/consumer.c
+++ b/src/common/consumer/consumer.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011 Julien Desfossez <julien.desfossez@polymtl.ca>
+ * Copyright (C) 2011 EfficiOS Inc.
  * Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  * Copyright (C) 2012 David Goulet <dgoulet@efficios.com>
  *
@@ -8,6 +8,7 @@
  */
 
 #include "common/index/ctf-index.h"
+#include <stdint.h>
 #define _LGPL_SOURCE
 #include <assert.h>
 #include <poll.h>
@@ -178,7 +179,6 @@ static void clean_channel_stream_list(struct lttng_consumer_channel *channel)
 	/* Delete streams that might have been left in the stream list. */
 	cds_list_for_each_entry_safe(stream, stmp, &channel->streams.head,
 			send_node) {
-		cds_list_del(&stream->send_node);
 		/*
 		 * Once a stream is added to this list, the buffers were created so we
 		 * have a guarantee that this call will succeed. Setting the monitor
@@ -3386,6 +3386,8 @@ ssize_t lttng_consumer_read_subbuffer(struct lttng_consumer_stream *stream,
 
 	if (!locked_by_caller) {
 		stream->read_subbuffer_ops.lock(stream);
+	} else {
+		stream->read_subbuffer_ops.assert_locked(stream);
 	}
 
 	if (stream->read_subbuffer_ops.on_wake_up) {
@@ -3561,18 +3563,22 @@ error:
  * This will create a relayd socket pair and add it to the relayd hash table.
  * The caller MUST acquire a RCU read side lock before calling it.
  */
- void consumer_add_relayd_socket(uint64_t net_seq_idx, int sock_type,
-		struct lttng_consumer_local_data *ctx, int sock,
+void consumer_add_relayd_socket(uint64_t net_seq_idx,
+		int sock_type,
+		struct lttng_consumer_local_data *ctx,
+		int sock,
 		struct pollfd *consumer_sockpoll,
-		struct lttcomm_relayd_sock *relayd_sock, uint64_t sessiond_id,
-		uint64_t relayd_session_id)
+		uint64_t sessiond_id,
+		uint64_t relayd_session_id,
+		uint32_t relayd_version_major,
+		uint32_t relayd_version_minor,
+		enum lttcomm_sock_proto relayd_socket_protocol)
 {
 	int fd = -1, ret = -1, relayd_created = 0;
 	enum lttcomm_return_code ret_code = LTTCOMM_CONSUMERD_SUCCESS;
 	struct consumer_relayd_sock_pair *relayd = NULL;
 
 	assert(ctx);
-	assert(relayd_sock);
 
 	DBG("Consumer adding relayd socket (idx: %" PRIu64 ")", net_seq_idx);
 
@@ -3641,54 +3647,25 @@ error:
 	switch (sock_type) {
 	case LTTNG_STREAM_CONTROL:
 		/* Copy received lttcomm socket */
-		lttcomm_copy_sock(&relayd->control_sock.sock, &relayd_sock->sock);
-		ret = lttcomm_create_sock(&relayd->control_sock.sock);
-		/* Handle create_sock error. */
-		if (ret < 0) {
-			ret_code = LTTCOMM_CONSUMERD_ENOMEM;
-			goto error;
-		}
-		/*
-		 * Close the socket created internally by
-		 * lttcomm_create_sock, so we can replace it by the one
-		 * received from sessiond.
-		 */
-		if (close(relayd->control_sock.sock.fd)) {
-			PERROR("close");
-		}
+		ret = lttcomm_populate_sock_from_open_socket(
+				&relayd->control_sock.sock, fd,
+				relayd_socket_protocol);
 
-		/* Assign new file descriptor */
-		relayd->control_sock.sock.fd = fd;
 		/* Assign version values. */
-		relayd->control_sock.major = relayd_sock->major;
-		relayd->control_sock.minor = relayd_sock->minor;
+		relayd->control_sock.major = relayd_version_major;
+		relayd->control_sock.minor = relayd_version_minor;
 
 		relayd->relayd_session_id = relayd_session_id;
 
 		break;
 	case LTTNG_STREAM_DATA:
 		/* Copy received lttcomm socket */
-		lttcomm_copy_sock(&relayd->data_sock.sock, &relayd_sock->sock);
-		ret = lttcomm_create_sock(&relayd->data_sock.sock);
-		/* Handle create_sock error. */
-		if (ret < 0) {
-			ret_code = LTTCOMM_CONSUMERD_ENOMEM;
-			goto error;
-		}
-		/*
-		 * Close the socket created internally by
-		 * lttcomm_create_sock, so we can replace it by the one
-		 * received from sessiond.
-		 */
-		if (close(relayd->data_sock.sock.fd)) {
-			PERROR("close");
-		}
-
-		/* Assign new file descriptor */
-		relayd->data_sock.sock.fd = fd;
+		ret = lttcomm_populate_sock_from_open_socket(
+				&relayd->data_sock.sock, fd,
+				relayd_socket_protocol);
 		/* Assign version values. */
-		relayd->data_sock.major = relayd_sock->major;
-		relayd->data_sock.minor = relayd_sock->minor;
+		relayd->data_sock.major = relayd_version_major;
+		relayd->data_sock.minor = relayd_version_minor;
 		break;
 	default:
 		ERR("Unknown relayd socket type (%d)", sock_type);
@@ -3696,6 +3673,11 @@ error:
 		goto error;
 	}
 
+	if (ret < 0) {
+		ret_code = LTTCOMM_CONSUMERD_FATAL;
+		goto error;
+	}
+
 	DBG("Consumer %s socket created successfully with net idx %" PRIu64 " (fd: %d)",
 			sock_type == LTTNG_STREAM_CONTROL ? "control" : "data",
 			relayd->net_seq_idx, fd);