X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=ltt-sessiond%2Ftrace.c;h=e0aeac685e28a312b71fc773fa4ab05ca3eccb89;hp=9a3c95956439e08a462b8e1e21f25ed050359a08;hb=e6ddca715d6dedb6ee25fe4392a6e1f9626b2544;hpb=5461b305aef403f7f2e48c977c188b5526746c6e

diff --git a/ltt-sessiond/trace.c b/ltt-sessiond/trace.c
index 9a3c95956..e0aeac685 100644
--- a/ltt-sessiond/trace.c
+++ b/ltt-sessiond/trace.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C)  2011 - David Goulet <david.goulet@polymtl.ca>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -17,203 +17,353 @@
  */
 
 #define _GNU_SOURCE
-#include <errno.h>
-#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 #include <urcu/list.h>
-#include <ust/ustctl.h>
 
-#include "liblttsessiondcomm.h"
 #include "lttngerr.h"
 #include "trace.h"
-#include "session.h"
-#include "ltt-sessiond.h"
-
-static struct ltt_ust_trace *find_session_ust_trace_by_pid(
-		struct ltt_session *session, pid_t pid);
 
 /*
- *  find_session_ust_trace_by_pid
+ *  get_kernel_channel_by_name
  *
- *  Iterate over the session ust_traces and
- *  return a pointer or NULL if not found.
+ *  Find the channel name for the given kernel session.
  */
-static struct ltt_ust_trace *find_session_ust_trace_by_pid(
-		struct ltt_session *session, pid_t pid)
+struct ltt_kernel_channel *get_kernel_channel_by_name(
+		char *name, struct ltt_kernel_session *session)
 {
-	struct ltt_ust_trace *iter;
+	struct ltt_kernel_channel *chan;
 
-	cds_list_for_each_entry(iter, &session->ust_traces, list) {
-		if (iter->pid == pid) {
-			/* Found */
-			return iter;
+	if (session == NULL) {
+		ERR("Undefine session");
+		goto error;
+	}
+
+	cds_list_for_each_entry(chan, &session->channel_list.head, list) {
+		if (strcmp(name, chan->channel->name) == 0) {
+			DBG("Found channel by name %s", name);
+			return chan;
 		}
 	}
 
+error:
 	return NULL;
 }
 
 /*
- *  get_trace_count_per_session
+ *  get_kernel_event_by_name
  *
- *  Return the total count of traces (ust and kernel)
- *  for the specified session.
+ *  Find the event name for the given channel.
  */
-int get_trace_count_per_session(struct ltt_session *session)
+struct ltt_kernel_event *get_kernel_event_by_name(
+		char *name, struct ltt_kernel_channel *channel)
 {
-	return session->ust_trace_count + session->kern_trace_count;
+	struct ltt_kernel_event *ev;
+
+	if (channel == NULL) {
+		ERR("Undefine channel");
+		goto error;
+	}
+
+	cds_list_for_each_entry(ev, &channel->events_list.head, list) {
+		if (strcmp(name, ev->event->name) == 0) {
+			DBG("Found event by name %s for channel %s", name,
+					channel->channel->name);
+			return ev;
+		}
+	}
+
+error:
+	return NULL;
 }
 
 /*
- *  get_traces_per_session
+ *  trace_create_kernel_session
+ *
+ *  Allocate and initialize a kernel session data structure.
  *
- *  Fill the lttng_trace array of all the
- *  available trace of the session.
+ *  Return pointer to structure or NULL.
  */
-void get_traces_per_session(struct ltt_session *session, struct lttng_trace *traces)
+struct ltt_kernel_session *trace_create_kernel_session(void)
 {
-	int i = 0;
-	struct ltt_ust_trace *ust_iter;
-	struct ltt_kernel_trace *kern_iter;
-	struct lttng_trace trace;
-
-	DBG("Getting userspace traces for session %s", session->name);
-
-	/* Getting userspace traces */
-	cds_list_for_each_entry(ust_iter, &session->ust_traces, list) {
-		trace.type = USERSPACE;
-		trace.pid = ust_iter->pid;
-		strncpy(trace.name, ust_iter->name, sizeof(trace.name));
-		trace.name[sizeof(trace.name) - 1] = '\0';
-		memcpy(&traces[i], &trace, sizeof(trace));
-		memset(&trace, 0, sizeof(trace));
-		i++;
-	}
-
-	DBG("Getting kernel traces for session %s", session->name);
-
-	/* Getting kernel traces */
-	cds_list_for_each_entry(kern_iter, &session->kernel_traces, list) {
-		trace.type = KERNEL;
-		strncpy(trace.name, kern_iter->name, sizeof(trace.name));
-		trace.name[sizeof(trace.name) - 1] = '\0';
-		memcpy(&traces[i], &trace, sizeof(trace));
-		memset(&trace, 0, sizeof(trace));
-		i++;
+	struct ltt_kernel_session *lks;
+
+	/* Allocate a new ltt kernel session */
+	lks = malloc(sizeof(struct ltt_kernel_session));
+	if (lks == NULL) {
+		perror("create kernel session malloc");
+		goto error;
 	}
+
+	/* Init data structure */
+	lks->fd = 0;
+	lks->metadata_stream_fd = 0;
+	lks->channel_count = 0;
+	lks->stream_count_global = 0;
+	lks->metadata = NULL;
+	CDS_INIT_LIST_HEAD(&lks->channel_list.head);
+
+	return lks;
+
+error:
+	return NULL;
 }
 
 /*
- *  ust_create_trace
+ *  trace_create_kernel_channel
+ *
+ *  Allocate and initialize a kernel channel data structure.
  *
- *  Create an userspace trace using pid.
- *  This trace is then appended to the current session
- *  ust trace list.
+ *  Return pointer to structure or NULL.
  */
-int ust_create_trace(struct command_ctx *cmd_ctx)
+struct ltt_kernel_channel *trace_create_kernel_channel(struct lttng_channel *chan, char *path)
 {
 	int ret;
-	struct ltt_ust_trace *trace;
+	struct ltt_kernel_channel *lkc;
 
-	DBG("Creating trace for pid %d", cmd_ctx->lsm->pid);
+	lkc = malloc(sizeof(struct ltt_kernel_channel));
+	if (lkc == NULL) {
+		perror("ltt_kernel_channel malloc");
+		goto error;
+	}
 
-	trace = malloc(sizeof(struct ltt_ust_trace));
-	if (trace == NULL) {
-		perror("malloc");
-		ret = -1;
+	lkc->channel = malloc(sizeof(struct lttng_channel));
+	if (lkc->channel == NULL) {
+		perror("lttng_channel malloc");
+		goto error;
+	}
+	memcpy(lkc->channel, chan, sizeof(struct lttng_channel));
+
+	lkc->fd = 0;
+	lkc->stream_count = 0;
+	lkc->enabled = 1;
+	/* Init linked list */
+	CDS_INIT_LIST_HEAD(&lkc->events_list.head);
+	CDS_INIT_LIST_HEAD(&lkc->stream_list.head);
+	/* Set default trace output path */
+	ret = asprintf(&lkc->pathname, "%s", path);
+	if (ret < 0) {
+		perror("asprintf kernel create channel");
 		goto error;
 	}
 
-	/* Init */
-	trace->pid = cmd_ctx->lsm->pid;
-	trace->shmid = 0;
-	/* NOTE: to be removed. Trace name will no longer be
-	 * required for LTTng userspace tracer. For now, we set it
-	 * to 'auto' for API compliance.
-	 */
-	snprintf(trace->name, 5, "auto");
+	return lkc;
 
-	ret = ustctl_create_trace(cmd_ctx->ust_sock, trace->name);
-	if (ret < 0) {
-		ret = LTTCOMM_CREATE_FAIL;
-		goto error_create;
+error:
+	return NULL;
+}
+
+/*
+ *  trace_create_kernel_event
+ *
+ *  Allocate and initialize a kernel event. Set name and event type.
+ *
+ *  Return pointer to structure or NULL.
+ */
+struct ltt_kernel_event *trace_create_kernel_event(struct lttng_event *ev)
+{
+	struct ltt_kernel_event *lke;
+	struct lttng_kernel_event *attr;
+
+	lke = malloc(sizeof(struct ltt_kernel_event));
+	attr = malloc(sizeof(struct lttng_kernel_event));
+	if (lke == NULL || attr == NULL) {
+		perror("kernel event malloc");
+		goto error;
 	}
 
-	/* Check if current session is valid */
-	if (cmd_ctx->session) {
-		cds_list_add(&trace->list, &cmd_ctx->session->ust_traces);
-		cmd_ctx->session->ust_trace_count++;
+	switch (ev->type) {
+	case LTTNG_EVENT_KPROBE:
+		attr->instrumentation = LTTNG_KERNEL_KPROBE;
+		attr->u.kprobe.addr = ev->attr.kprobe.addr;
+		attr->u.kprobe.offset = ev->attr.kprobe.offset;
+		strncpy(attr->u.kprobe.symbol_name,
+				ev->attr.kprobe.symbol_name, LTTNG_SYM_NAME_LEN);
+		break;
+	case LTTNG_EVENT_FUNCTION:
+		attr->instrumentation = LTTNG_KERNEL_FUNCTION;
+		strncpy(attr->u.ftrace.symbol_name,
+				ev->attr.ftrace.symbol_name, LTTNG_SYM_NAME_LEN);
+		break;
+	case LTTNG_EVENT_TRACEPOINT:
+		attr->instrumentation = LTTNG_KERNEL_TRACEPOINT;
+		break;
+	default:
+		ERR("Unknown kernel instrumentation type (%d)", ev->type);
+		goto error;
 	}
 
-	return LTTCOMM_OK;
+	/* Copy event name */
+	strncpy(attr->name, ev->name, LTTNG_SYM_NAME_LEN);
+
+	/* Setting up a kernel event */
+	lke->fd = 0;
+	lke->event = attr;
+	lke->enabled = 1;
+
+	return lke;
 
-error_create:
-	free(trace);
 error:
-	return ret;
+	return NULL;
 }
 
 /*
- *  ust_start_trace
+ *  trace_create_kernel_metadata
+ *
+ *  Allocate and initialize a kernel metadata.
  *
- *  Start a trace. This trace, identified by the pid, must be
- *  in the current session ust_traces list.
+ *  Return pointer to structure or NULL.
  */
-int ust_start_trace(struct command_ctx *cmd_ctx)
+struct ltt_kernel_metadata *trace_create_kernel_metadata(char *path)
 {
 	int ret;
-	struct ltt_ust_trace *trace;
+	struct ltt_kernel_metadata *lkm;
+	struct lttng_channel *chan;
 
-	DBG("Starting trace for pid %d", cmd_ctx->lsm->pid);
-
-	trace = find_session_ust_trace_by_pid(cmd_ctx->session, cmd_ctx->lsm->pid);
-	if (trace == NULL) {
-		ret = LTTCOMM_NO_TRACE;
+	lkm = malloc(sizeof(struct ltt_kernel_metadata));
+	chan = malloc(sizeof(struct lttng_channel));
+	if (lkm == NULL || chan == NULL) {
+		perror("kernel metadata malloc");
 		goto error;
 	}
 
-	ret = ustctl_start_trace(cmd_ctx->ust_sock, "auto");
+	/* Set default attributes */
+	chan->attr.overwrite = DEFAULT_CHANNEL_OVERWRITE;
+	chan->attr.subbuf_size = DEFAULT_CHANNEL_SUBBUF_SIZE;
+	chan->attr.num_subbuf = DEFAULT_CHANNEL_SUBBUF_NUM;
+	chan->attr.switch_timer_interval = DEFAULT_CHANNEL_SWITCH_TIMER;
+	chan->attr.read_timer_interval = DEFAULT_CHANNEL_READ_TIMER;
+	chan->attr.output = DEFAULT_KERNEL_CHANNEL_OUTPUT;
+
+	/* Init metadata */
+	lkm->fd = 0;
+	lkm->conf = chan;
+	/* Set default metadata path */
+	ret = asprintf(&lkm->pathname, "%s/metadata", path);
 	if (ret < 0) {
-		ret = LTTCOMM_START_FAIL;
+		perror("asprintf kernel metadata");
 		goto error;
 	}
 
-	ret = LTTCOMM_OK;
+	return lkm;
 
 error:
-	return ret;
+	return NULL;
 }
 
 /*
- *  ust_stop_trace
+ *  trace_create_kernel_stream
+ *
+ *  Allocate and initialize a kernel stream. The stream is set to ACTIVE_FD by
+ *  default.
  *
- *  Stop a trace. This trace, identified by the pid, must be
- *  in the current session ust_traces list.
+ *  Return pointer to structure or NULL.
  */
-int ust_stop_trace(struct command_ctx *cmd_ctx)
+struct ltt_kernel_stream *trace_create_kernel_stream(void)
 {
-	int ret;
-	struct ltt_ust_trace *trace;
-
-	DBG("Stopping trace for pid %d", cmd_ctx->lsm->pid);
+	struct ltt_kernel_stream *lks;
 
-	trace = find_session_ust_trace_by_pid(cmd_ctx->session, cmd_ctx->lsm->pid);
-	if (trace == NULL) {
-		ret = LTTCOMM_NO_TRACE;
+	lks = malloc(sizeof(struct ltt_kernel_stream));
+	if (lks == NULL) {
+		perror("kernel stream malloc");
 		goto error;
 	}
 
-	ret = ustctl_stop_trace(cmd_ctx->ust_sock, trace->name);
-	if (ret < 0) {
-		ret = LTTCOMM_STOP_FAIL;
-		goto error;
-	}
+	/* Init stream */
+	lks->fd = 0;
+	lks->pathname = NULL;
+	lks->state = 0;
 
-	ret = LTTCOMM_OK;
+	return lks;
 
 error:
-	return ret;
+	return NULL;
+}
+
+void trace_destroy_kernel_stream(struct ltt_kernel_stream *stream)
+{
+	DBG("[trace] Closing stream fd %d", stream->fd);
+	/* Close kernel fd */
+	close(stream->fd);
+	free(stream->pathname);
+
+	/* Remove from stream list */
+	cds_list_del(&stream->list);
+	free(stream);
+}
+
+void trace_destroy_kernel_event(struct ltt_kernel_event *event)
+{
+	DBG("[trace] Closing event fd %d", event->fd);
+	/* Close kernel fd */
+	close(event->fd);
+	/* Free attributes */
+	free(event->event);
+
+	/* Remove from event list */
+	cds_list_del(&event->list);
+	free(event);
 }
 
+void trace_destroy_kernel_channel(struct ltt_kernel_channel *channel)
+{
+	struct ltt_kernel_stream *stream;
+	struct ltt_kernel_event *event;
+
+	DBG("[trace] Closing channel fd %d", channel->fd);
+	/* Close kernel fd */
+	close(channel->fd);
+	free(channel->pathname);
+	/* Free attributes structure */
+	free(channel->channel);
+
+	/* For each stream in the channel list */
+	cds_list_for_each_entry(stream, &channel->stream_list.head, list) {
+		trace_destroy_kernel_stream(stream);
+	}
+
+	/* For each event in the channel list */
+	cds_list_for_each_entry(event, &channel->events_list.head, list) {
+		trace_destroy_kernel_event(event);
+	}
+
+	/* Remove from channel list */
+	cds_list_del(&channel->list);
+	free(channel);
+}
+
+void trace_destroy_kernel_metadata(struct ltt_kernel_metadata *metadata)
+{
+	DBG("[trace] Closing metadata fd %d", metadata->fd);
+	/* Close kernel fd */
+	close(metadata->fd);
+	/* Free attributes */
+	free(metadata->conf);
+
+	free(metadata);
+}
+
+void trace_destroy_kernel_session(struct ltt_kernel_session *session)
+{
+	struct ltt_kernel_channel *channel;
+
+	DBG("[trace] Closing session fd %d", session->fd);
+	/* Close kernel fds */
+	close(session->fd);
+	if (session->metadata_stream_fd != 0) {
+		DBG("[trace] Closing metadata stream fd %d", session->metadata_stream_fd);
+		close(session->metadata_stream_fd);
+	}
+
+	if (session->metadata != NULL) {
+		trace_destroy_kernel_metadata(session->metadata);
+	}
+
+	cds_list_for_each_entry(channel, &session->channel_list.head, list) {
+		trace_destroy_kernel_channel(channel);
+	}
+
+	free(session);
+}