X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fkernel.c;h=75c680ec91f47364c53ba11bb3ab20ae0a515cdc;hb=857d49f38c4fa51ca671c4884235118c5458e5c1;hp=2031bfb38f4ca3825f37067a2ddbca50890e54f8;hpb=b5d133fcae57d4adb5ff4c7c6487d166b649eb51;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/kernel.c b/src/bin/lttng-sessiond/kernel.c
index 2031bfb38..75c680ec9 100644
--- a/src/bin/lttng-sessiond/kernel.c
+++ b/src/bin/lttng-sessiond/kernel.c
@@ -69,6 +69,7 @@ int kernel_add_channel_context(struct ltt_kernel_channel *chan,
 
 end:
 	cds_list_add_tail(&ctx->list, &chan->ctx_list);
+	ctx->in_list = true;
 	ctx = NULL;
 error:
 	if (ctx) {
@@ -1028,12 +1029,10 @@ int kernel_snapshot_record(struct ltt_kernel_session *ksess,
 
 		/* For each channel, ask the consumer to snapshot it. */
 		cds_list_for_each_entry(chan, &ksess->channel_list.head, list) {
-			pthread_mutex_lock(socket->lock);
 			ret = consumer_snapshot_channel(socket, chan->fd, output, 0,
 					ksess->uid, ksess->gid,
 					DEFAULT_KERNEL_TRACE_DIR, wait,
 					nb_packets_per_stream);
-			pthread_mutex_unlock(socket->lock);
 			if (ret < 0) {
 				ret = LTTNG_ERR_KERN_CONSUMER_FAIL;
 				(void) kernel_consumer_destroy_metadata(socket,
@@ -1043,11 +1042,9 @@ int kernel_snapshot_record(struct ltt_kernel_session *ksess,
 		}
 
 		/* Snapshot metadata, */
-		pthread_mutex_lock(socket->lock);
 		ret = consumer_snapshot_channel(socket, ksess->metadata->fd, output,
 				1, ksess->uid, ksess->gid,
 				DEFAULT_KERNEL_TRACE_DIR, wait, 0);
-		pthread_mutex_unlock(socket->lock);
 		if (ret < 0) {
 			ret = LTTNG_ERR_KERN_CONSUMER_FAIL;
 			goto error_consumer;
@@ -1125,3 +1122,79 @@ int kernel_supports_ring_buffer_snapshot_sample_positions(int tracer_fd)
 error:
 	return ret;
 }
+
+/*
+ *  Clear a kernel session.
+ *
+ * Return LTTNG_OK on success or else an LTTng error code.
+ */
+enum lttng_error_code kernel_clear_session(struct ltt_session *session)
+{
+	int ret;
+	enum lttng_error_code status = LTTNG_OK;
+	struct consumer_socket *socket;
+	struct lttng_ht_iter iter;
+	struct ltt_kernel_session *ksess = session->kernel_session;
+
+	assert(ksess);
+	assert(ksess->consumer);
+
+	DBG("Clear kernel session %s (session %" PRIu64 ")",
+			session->name, session->id);
+
+	rcu_read_lock();
+
+	/*
+	 * Note that this loop will end after one iteration given that there is
+	 * only one kernel consumer.
+	 */
+	cds_lfht_for_each_entry(ksess->consumer->socks->ht, &iter.iter,
+			socket, node.node) {
+		struct ltt_kernel_channel *chan;
+
+		/* For each channel, ask the consumer to clear it. */
+		cds_list_for_each_entry(chan, &ksess->channel_list.head, list) {
+			DBG("Clear kernel channel %" PRIu64 ", session %s",
+					chan->key, session->name);
+			ret = consumer_clear_channel(socket, chan->key,
+					ksess->consumer);
+			if (ret < 0) {
+				goto error;
+			}
+		}
+
+		if (!ksess->metadata) {
+			/*
+			 * Nothing to do for the metadata.
+			 * This is a snpashot session.
+			 * The metadata is genererated on the fly.
+			 */
+			continue;
+		}
+
+		/*
+		 * Clear the metadata channel.
+		 * Metadata channel is not cleared per se but we still need to
+		 * perform rotation operation on it behind the scene.
+		 */
+		ret = consumer_clear_channel(socket, ksess->metadata->key,
+				ksess->consumer);
+		if (ret < 0) {
+			goto error;
+		}
+	}
+
+	goto end;
+error:
+	switch (-ret) {
+	case LTTCOMM_CONSUMERD_RELAYD_DISALLOW_CLEAR:
+	      status = LTTNG_ERR_CLEAR_RELAY_DISALLOW;
+	      break;
+	default:
+	      status = LTTNG_ERR_CLEAR_FAIL_CONSUMER;
+	      break;
+	}
+end:
+	rcu_read_unlock();
+	return status;
+}