X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fkernel.c;h=ea0e75d7ff1910fa7d916941bb8befc93c400077;hb=c92af2a5fd6587a03f1a0e927fd734751032b3a1;hp=7bc713a35be7935250a0f96a63c480419c840706;hpb=1ae5e83e58569f50b38fde0afe3f2aa08010f354;p=deliverable%2Flttng-tools.git

diff --git a/src/bin/lttng-sessiond/kernel.c b/src/bin/lttng-sessiond/kernel.c
index 7bc713a35..ea0e75d7f 100644
--- a/src/bin/lttng-sessiond/kernel.c
+++ b/src/bin/lttng-sessiond/kernel.c
@@ -16,7 +16,6 @@
  */
 
 #define _LGPL_SOURCE
-#include <errno.h>
 #include <fcntl.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -37,6 +36,8 @@
 
 /*
  * Add context on a kernel channel.
+ *
+ * Assumes the ownership of ctx.
  */
 int kernel_add_channel_context(struct ltt_kernel_channel *chan,
 		struct ltt_kernel_context *ctx)
@@ -49,7 +50,7 @@ int kernel_add_channel_context(struct ltt_kernel_channel *chan,
 	DBG("Adding context to channel %s", chan->channel->name);
 	ret = kernctl_add_context(chan->fd, &ctx->ctx);
 	if (ret < 0) {
-		switch (errno) {
+		switch (-ret) {
 		case ENOSYS:
 			/* Exists but not available for this kernel */
 			ret = LTTNG_ERR_KERN_CONTEXT_UNAVAILABLE;
@@ -67,9 +68,12 @@ int kernel_add_channel_context(struct ltt_kernel_channel *chan,
 
 end:
 	cds_list_add_tail(&ctx->list, &chan->ctx_list);
-	return 0;
-
+	ctx->in_list = true;
+	ctx = NULL;
 error:
+	if (ctx) {
+		trace_kernel_destroy_context(ctx);
+	}
 	return ret;
 }
 
@@ -203,7 +207,7 @@ int kernel_create_event(struct lttng_event *ev,
 
 	ret = kernctl_create_event(channel->fd, event->event);
 	if (ret < 0) {
-		switch (errno) {
+		switch (-ret) {
 		case EEXIST:
 			break;
 		case ENOSYS:
@@ -215,7 +219,6 @@ int kernel_create_event(struct lttng_event *ev,
 		default:
 			PERROR("create event ioctl");
 		}
-		ret = -errno;
 		goto free_event;
 	}
 
@@ -236,7 +239,7 @@ int kernel_create_event(struct lttng_event *ev,
 
 	ret = kernctl_enable(event->fd);
 	if (ret < 0) {
-		switch (errno) {
+		switch (-ret) {
 		case EEXIST:
 			ret = LTTNG_ERR_KERN_EVENT_EXIST;
 			break;
@@ -283,7 +286,6 @@ int kernel_disable_channel(struct ltt_kernel_channel *chan)
 	ret = kernctl_disable(chan->fd);
 	if (ret < 0) {
 		PERROR("disable chan ioctl");
-		ret = errno;
 		goto error;
 	}
 
@@ -306,7 +308,7 @@ int kernel_enable_channel(struct ltt_kernel_channel *chan)
 	assert(chan);
 
 	ret = kernctl_enable(chan->fd);
-	if (ret < 0 && errno != EEXIST) {
+	if (ret < 0 && ret != -EEXIST) {
 		PERROR("Enable kernel chan");
 		goto error;
 	}
@@ -331,7 +333,7 @@ int kernel_enable_event(struct ltt_kernel_event *event)
 
 	ret = kernctl_enable(event->fd);
 	if (ret < 0) {
-		switch (errno) {
+		switch (-ret) {
 		case EEXIST:
 			ret = LTTNG_ERR_KERN_EVENT_EXIST;
 			break;
@@ -362,7 +364,7 @@ int kernel_disable_event(struct ltt_kernel_event *event)
 
 	ret = kernctl_disable(event->fd);
 	if (ret < 0) {
-		switch (errno) {
+		switch (-ret) {
 		case EEXIST:
 			ret = LTTNG_ERR_KERN_EVENT_EXIST;
 			break;
@@ -382,120 +384,217 @@ error:
 	return ret;
 }
 
-
-int kernel_track_pid(struct ltt_kernel_session *session, int pid)
+static
+struct lttng_tracker_list *get_id_tracker_list(struct ltt_kernel_session *session,
+		enum lttng_tracker_type tracker_type)
 {
-	int ret;
-
-	DBG("Kernel track PID %d for session id %" PRIu64 ".",
-			pid, session->id);
-	ret = kernctl_track_pid(session->fd, pid);
-	if (!ret) {
-		return LTTNG_OK;
-	}
-	switch (errno) {
-	case EINVAL:
-		return LTTNG_ERR_INVALID;
-	case ENOMEM:
-		return LTTNG_ERR_NOMEM;
-	case EEXIST:
-		return LTTNG_ERR_PID_TRACKED;
+	switch (tracker_type) {
+	case LTTNG_TRACKER_PID:
+		return session->tracker_list_pid;
+	case LTTNG_TRACKER_VPID:
+		return session->tracker_list_vpid;
+	case LTTNG_TRACKER_UID:
+		return session->tracker_list_uid;
+	case LTTNG_TRACKER_VUID:
+		return session->tracker_list_vuid;
+	case LTTNG_TRACKER_GID:
+		return session->tracker_list_gid;
+	case LTTNG_TRACKER_VGID:
+		return session->tracker_list_vgid;
 	default:
-		return LTTNG_ERR_UNK;
+		return NULL;
 	}
 }
 
-int kernel_untrack_pid(struct ltt_kernel_session *session, int pid)
+int kernel_track_id(enum lttng_tracker_type tracker_type,
+		struct ltt_kernel_session *session,
+		struct lttng_tracker_id *id)
 {
-	int ret;
+	int ret, value;
+	struct lttng_tracker_list *tracker_list;
 
-	DBG("Kernel untrack PID %d for session id %" PRIu64 ".",
-			pid, session->id);
-	ret = kernctl_untrack_pid(session->fd, pid);
-	if (!ret) {
-		return LTTNG_OK;
+	ret = lttng_tracker_id_lookup_string(tracker_type,
+			id, &value);
+	if (ret != LTTNG_OK) {
+		return ret;
 	}
-	switch (errno) {
+
+	/* Add to list. */
+	tracker_list = get_id_tracker_list(session, tracker_type);
+	if (!tracker_list) {
+		return LTTNG_ERR_INVALID;
+	}
+	ret = lttng_tracker_list_add(tracker_list, id);
+	if (ret != LTTNG_OK) {
+		return ret;
+	}
+
+	switch (tracker_type) {
+	case LTTNG_TRACKER_PID:
+		DBG("Kernel track PID %d for session id %" PRIu64 ".",
+				value, session->id);
+		ret = kernctl_track_pid(session->fd, value);
+		if (!ret) {
+			return LTTNG_OK;
+		}
+		break;
+	case LTTNG_TRACKER_VPID:
+		DBG("Kernel track VPID %d for session id %" PRIu64 ".",
+				value, session->id);
+		ret = kernctl_track_id(session->fd, LTTNG_TRACKER_VPID, value);
+		if (!ret) {
+			return LTTNG_OK;
+		}
+		break;
+	case LTTNG_TRACKER_UID:
+		DBG("Kernel track UID %d for session id %" PRIu64 ".",
+				value, session->id);
+		ret = kernctl_track_id(session->fd, LTTNG_TRACKER_UID, value);
+		if (!ret) {
+			return LTTNG_OK;
+		}
+		break;
+	case LTTNG_TRACKER_GID:
+		DBG("Kernel track GID %d for session id %" PRIu64 ".",
+				value, session->id);
+		ret = kernctl_track_id(session->fd, LTTNG_TRACKER_GID, value);
+		if (!ret) {
+			return LTTNG_OK;
+		}
+		break;
+	case LTTNG_TRACKER_VUID:
+		DBG("Kernel track VUID %d for session id %" PRIu64 ".",
+				value, session->id);
+		ret = kernctl_track_id(session->fd, LTTNG_TRACKER_VUID, value);
+		if (!ret) {
+			return LTTNG_OK;
+		}
+		break;
+	case LTTNG_TRACKER_VGID:
+		DBG("Kernel track VGID %d for session id %" PRIu64 ".",
+				value, session->id);
+		ret = kernctl_track_id(session->fd, LTTNG_TRACKER_VGID, value);
+		if (!ret) {
+			return LTTNG_OK;
+		}
+		break;
+	default:
+		return LTTNG_ERR_INVALID;
+	}
+	switch (-ret) {
 	case EINVAL:
 		return LTTNG_ERR_INVALID;
 	case ENOMEM:
 		return LTTNG_ERR_NOMEM;
-	case ENOENT:
-		return LTTNG_ERR_PID_NOT_TRACKED;
+	case EEXIST:
+		return LTTNG_ERR_ID_TRACKED;
 	default:
 		return LTTNG_ERR_UNK;
 	}
 }
 
-ssize_t kernel_list_tracker_pids(struct ltt_kernel_session *session,
-		int **_pids)
+int kernel_untrack_id(enum lttng_tracker_type tracker_type,
+		struct ltt_kernel_session *session,
+		struct lttng_tracker_id *id)
 {
-	int fd, ret;
-	int pid;
-	ssize_t nbmem, count = 0;
-	FILE *fp;
-	int *pids;
+	int ret, value;
+	struct lttng_tracker_list *tracker_list;
 
-	fd = kernctl_list_tracker_pids(session->fd);
-	if (fd < 0) {
-		PERROR("kernel tracker pids list");
-		goto error;
+	ret = lttng_tracker_id_lookup_string(tracker_type,
+			id, &value);
+	if (ret != LTTNG_OK) {
+		return ret;
 	}
 
-	fp = fdopen(fd, "r");
-	if (fp == NULL) {
-		PERROR("kernel tracker pids list fdopen");
-		goto error_fp;
+	/* Remove from list. */
+	tracker_list = get_id_tracker_list(session, tracker_type);
+	if (!tracker_list) {
+		return LTTNG_ERR_INVALID;
 	}
-
-	nbmem = KERNEL_TRACKER_PIDS_INIT_LIST_SIZE;
-	pids = zmalloc(sizeof(*pids) * nbmem);
-	if (pids == NULL) {
-		PERROR("alloc list pids");
-		count = -ENOMEM;
-		goto end;
+	ret = lttng_tracker_list_remove(tracker_list, id);
+	if (ret != LTTNG_OK) {
+		return ret;
 	}
 
-	while (fscanf(fp, "process { pid = %u; };\n", &pid) == 1) {
-		if (count >= nbmem) {
-			int *new_pids;
-			size_t new_nbmem;
-
-			new_nbmem = nbmem << 1;
-			DBG("Reallocating pids list from %zu to %zu entries",
-					nbmem, new_nbmem);
-			new_pids = realloc(pids, new_nbmem * sizeof(*new_pids));
-			if (new_pids == NULL) {
-				PERROR("realloc list events");
-				free(pids);
-				count = -ENOMEM;
-				goto end;
-			}
-			/* Zero the new memory */
-			memset(new_pids + nbmem, 0,
-				(new_nbmem - nbmem) * sizeof(*new_pids));
-			nbmem = new_nbmem;
-			pids = new_pids;
+	switch (tracker_type) {
+	case LTTNG_TRACKER_PID:
+		DBG("Kernel untrack PID %d for session id %" PRIu64 ".",
+				value, session->id);
+		ret = kernctl_untrack_pid(session->fd, value);
+		if (!ret) {
+			return LTTNG_OK;
+		}
+		break;
+	case LTTNG_TRACKER_VPID:
+		DBG("Kernel untrack VPID %d for session id %" PRIu64 ".",
+				value, session->id);
+		ret = kernctl_untrack_id(session->fd, LTTNG_TRACKER_VPID, value);
+		if (!ret) {
+			return LTTNG_OK;
+		}
+		break;
+	case LTTNG_TRACKER_UID:
+		DBG("Kernel untrack UID %d for session id %" PRIu64 ".",
+				value, session->id);
+		ret = kernctl_untrack_id(session->fd, LTTNG_TRACKER_UID, value);
+		if (!ret) {
+			return LTTNG_OK;
+		}
+		break;
+	case LTTNG_TRACKER_GID:
+		DBG("Kernel untrack GID %d for session id %" PRIu64 ".",
+				value, session->id);
+		ret = kernctl_untrack_id(session->fd, LTTNG_TRACKER_GID, value);
+		if (!ret) {
+			return LTTNG_OK;
+		}
+		break;
+	case LTTNG_TRACKER_VUID:
+		DBG("Kernel untrack VUID %d for session id %" PRIu64 ".",
+				value, session->id);
+		ret = kernctl_untrack_id(session->fd, LTTNG_TRACKER_VUID, value);
+		if (!ret) {
+			return LTTNG_OK;
+		}
+		break;
+	case LTTNG_TRACKER_VGID:
+		DBG("Kernel untrack VGID %d for session id %" PRIu64 ".",
+				value, session->id);
+		ret = kernctl_untrack_id(session->fd, LTTNG_TRACKER_VGID, value);
+		if (!ret) {
+			return LTTNG_OK;
 		}
-		pids[count++] = pid;
+		break;
+	default:
+		return LTTNG_ERR_INVALID;
 	}
 
-	*_pids = pids;
-	DBG("Kernel list tracker pids done (%zd pids)", count);
-end:
-	ret = fclose(fp);	/* closes both fp and fd */
-	if (ret) {
-		PERROR("fclose");
+	switch (-ret) {
+	case EINVAL:
+		return LTTNG_ERR_INVALID;
+	case ENOMEM:
+		return LTTNG_ERR_NOMEM;
+	case ENOENT:
+		return LTTNG_ERR_ID_NOT_TRACKED;
+	default:
+		return LTTNG_ERR_UNK;
 	}
-	return count;
+}
 
-error_fp:
-	ret = close(fd);
-	if (ret) {
-		PERROR("close");
+/*
+ * Called with session lock held.
+ */
+ssize_t kernel_list_tracker_ids(enum lttng_tracker_type tracker_type,
+		struct ltt_kernel_session *session,
+		struct lttng_tracker_id **_ids)
+{
+	struct lttng_tracker_list *tracker_list;
+
+	tracker_list = get_id_tracker_list(session, tracker_type);
+	if (!tracker_list) {
+		return -LTTNG_ERR_INVALID;
 	}
-error:
-	return -1;
+	return lttng_tracker_id_get_list(tracker_list, _ids);
 }
 
 /*
@@ -579,25 +678,6 @@ void kernel_wait_quiescent(int fd)
 	}
 }
 
-/*
- * Kernel calibrate
- */
-int kernel_calibrate(int fd, struct lttng_kernel_calibrate *calibrate)
-{
-	int ret;
-
-	assert(calibrate);
-
-	ret = kernctl_calibrate(fd, calibrate);
-	if (ret < 0) {
-		PERROR("calibrate ioctl");
-		return -1;
-	}
-
-	return 0;
-}
-
-
 /*
  *  Force flush buffer of metadata.
  */
@@ -666,17 +746,22 @@ error:
  * Open stream of channel, register it to the kernel tracer and add it
  * to the stream list of the channel.
  *
+ * Note: given that the streams may appear in random order wrt CPU
+ * number (e.g. cpu hotplug), the index value of the stream number in
+ * the stream name is not necessarily linked to the CPU number.
+ *
  * Return the number of created stream. Else, a negative value.
  */
 int kernel_open_channel_stream(struct ltt_kernel_channel *channel)
 {
-	int ret, count = 0;
+	int ret;
 	struct ltt_kernel_stream *lks;
 
 	assert(channel);
 
 	while ((ret = kernctl_create_stream(channel->fd)) >= 0) {
-		lks = trace_kernel_create_stream(channel->channel->name, count);
+		lks = trace_kernel_create_stream(channel->channel->name,
+				channel->stream_count);
 		if (lks == NULL) {
 			ret = close(ret);
 			if (ret) {
@@ -695,13 +780,10 @@ int kernel_open_channel_stream(struct ltt_kernel_channel *channel)
 		lks->tracefile_size = channel->channel->attr.tracefile_size;
 		lks->tracefile_count = channel->channel->attr.tracefile_count;
 
-		/* Add stream to channe stream list */
+		/* Add stream to channel stream list */
 		cds_list_add(&lks->list, &channel->stream_list.head);
 		channel->stream_count++;
 
-		/* Increment counter which represent CPU number. */
-		count++;
-
 		DBG("Kernel stream %s created (fd: %d, state: %d)", lks->name, lks->fd,
 				lks->state);
 	}
@@ -836,7 +918,7 @@ int kernel_validate_version(int tracer_fd)
 
 	ret = kernctl_tracer_version(tracer_fd, &version);
 	if (ret < 0) {
-		ERR("Failed at getting the lttng-modules version");
+		ERR("Failed to retrieve the lttng-modules version");
 		goto error;
 	}
 
@@ -848,11 +930,11 @@ int kernel_validate_version(int tracer_fd)
 	}
 	ret = kernctl_tracer_abi_version(tracer_fd, &abi_version);
 	if (ret < 0) {
-		ERR("Failed at getting lttng-modules ABI version");
+		ERR("Failed to retrieve lttng-modules ABI version");
 		goto error;
 	}
 	if (abi_version.major != LTTNG_MODULES_ABI_MAJOR_VERSION) {
-		ERR("Kernel tracer ABI version (%d.%d) is not compatible with expected ABI major version (%d.*)",
+		ERR("Kernel tracer ABI version (%d.%d) does not match the expected ABI major version (%d.*)",
 			abi_version.major, abi_version.minor,
 			LTTNG_MODULES_ABI_MAJOR_VERSION);
 		goto error;
@@ -866,6 +948,7 @@ error_version:
 	ret = -1;
 
 error:
+	ERR("Kernel tracer version check failed; kernel tracing will not be available");
 	return ret;
 }
 
@@ -1042,12 +1125,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,
@@ -1057,11 +1138,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;