*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation; only version 2
+ * of the License.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
#include <urcu/list.h>
#include "lttngerr.h"
-#include "ltt-sessiond.h"
#include "trace.h"
+/*
+ * get_kernel_channel_by_name
+ *
+ * Find the channel name for the given kernel session.
+ */
+struct ltt_kernel_channel *get_kernel_channel_by_name(
+ char *name, struct ltt_kernel_session *session)
+{
+ struct ltt_kernel_channel *chan;
+
+ 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_kernel_event_by_name
+ *
+ * Find the event name for the given channel.
+ */
+struct ltt_kernel_event *get_kernel_event_by_name(
+ char *name, struct ltt_kernel_channel *channel)
+{
+ 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;
+}
+
/*
* trace_create_kernel_session
*
lks->channel_count = 0;
lks->stream_count_global = 0;
lks->metadata = NULL;
+ lks->consumer_fd = 0;
CDS_INIT_LIST_HEAD(&lks->channel_list.head);
return lks;
*
* Return pointer to structure or NULL.
*/
-struct ltt_kernel_channel *trace_create_kernel_channel(struct lttng_channel *chan)
+struct ltt_kernel_channel *trace_create_kernel_channel(struct lttng_channel *chan, char *path)
{
int ret;
struct ltt_kernel_channel *lkc;
lkc->fd = 0;
lkc->stream_count = 0;
+ lkc->event_count = 0;
+ lkc->enabled = 1;
+ lkc->ctx = NULL;
/* 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", DEFAULT_TRACE_OUTPUT);
+ ret = asprintf(&lkc->pathname, "%s", path);
if (ret < 0) {
perror("asprintf kernel create channel");
goto error;
}
switch (ev->type) {
- case LTTNG_EVENT_KPROBES:
- attr->instrumentation = LTTNG_KERNEL_KPROBES;
- attr->u.kprobe.addr = ev->attr.kprobe.addr;
- attr->u.kprobe.offset = ev->attr.kprobe.offset;
+ case LTTNG_EVENT_PROBE:
+ attr->instrumentation = LTTNG_KERNEL_KPROBE;
+ attr->u.kprobe.addr = ev->attr.probe.addr;
+ attr->u.kprobe.offset = ev->attr.probe.offset;
strncpy(attr->u.kprobe.symbol_name,
- ev->attr.kprobe.symbol_name, LTTNG_SYM_NAME_LEN);
+ ev->attr.probe.symbol_name, LTTNG_SYM_NAME_LEN);
+ attr->u.kprobe.symbol_name[LTTNG_SYM_NAME_LEN - 1] = '\0';
break;
case LTTNG_EVENT_FUNCTION:
+ attr->instrumentation = LTTNG_KERNEL_KRETPROBE;
+ attr->u.kretprobe.addr = ev->attr.probe.addr;
+ attr->u.kretprobe.offset = ev->attr.probe.offset;
+ attr->u.kretprobe.offset = ev->attr.probe.offset;
+ strncpy(attr->u.kretprobe.symbol_name,
+ ev->attr.probe.symbol_name, LTTNG_SYM_NAME_LEN);
+ attr->u.kretprobe.symbol_name[LTTNG_SYM_NAME_LEN - 1] = '\0';
+ break;
+ case LTTNG_EVENT_FUNCTION_ENTRY:
attr->instrumentation = LTTNG_KERNEL_FUNCTION;
strncpy(attr->u.ftrace.symbol_name,
ev->attr.ftrace.symbol_name, LTTNG_SYM_NAME_LEN);
+ attr->u.ftrace.symbol_name[LTTNG_SYM_NAME_LEN - 1] = '\0';
break;
- case LTTNG_EVENT_TRACEPOINTS:
- attr->instrumentation = LTTNG_KERNEL_TRACEPOINTS;
+ case LTTNG_EVENT_TRACEPOINT:
+ attr->instrumentation = LTTNG_KERNEL_TRACEPOINT;
break;
default:
ERR("Unknown kernel instrumentation type (%d)", ev->type);
/* Copy event name */
strncpy(attr->name, ev->name, LTTNG_SYM_NAME_LEN);
+ attr->name[LTTNG_SYM_NAME_LEN - 1] = '\0';
/* Setting up a kernel event */
lke->fd = 0;
lke->event = attr;
+ lke->enabled = 1;
+ lke->ctx = NULL;
return lke;
*
* Return pointer to structure or NULL.
*/
-struct ltt_kernel_metadata *trace_create_kernel_metadata(void)
+struct ltt_kernel_metadata *trace_create_kernel_metadata(char *path)
{
int ret;
struct ltt_kernel_metadata *lkm;
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", DEFAULT_TRACE_OUTPUT);
+ ret = asprintf(&lkm->pathname, "%s/metadata", path);
if (ret < 0) {
perror("asprintf kernel metadata");
goto error;
void trace_destroy_kernel_channel(struct ltt_kernel_channel *channel)
{
- struct ltt_kernel_stream *stream;
- struct ltt_kernel_event *event;
+ struct ltt_kernel_stream *stream, *stmp;
+ struct ltt_kernel_event *event, *etmp;
DBG("[trace] Closing channel fd %d", channel->fd);
/* Close kernel fd */
free(channel->channel);
/* For each stream in the channel list */
- cds_list_for_each_entry(stream, &channel->stream_list.head, list) {
+ cds_list_for_each_entry_safe(stream, stmp, &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) {
+ cds_list_for_each_entry_safe(event, etmp, &channel->events_list.head, list) {
trace_destroy_kernel_event(event);
}
void trace_destroy_kernel_session(struct ltt_kernel_session *session)
{
- struct ltt_kernel_channel *channel;
+ struct ltt_kernel_channel *channel, *ctmp;
DBG("[trace] Closing session fd %d", session->fd);
/* Close kernel fds */
close(session->metadata_stream_fd);
}
- trace_destroy_kernel_metadata(session->metadata);
+ if (session->metadata != NULL) {
+ trace_destroy_kernel_metadata(session->metadata);
+ }
- cds_list_for_each_entry(channel, &session->channel_list.head, list) {
+ cds_list_for_each_entry_safe(channel, ctmp, &session->channel_list.head, list) {
trace_destroy_kernel_channel(channel);
}
projects / lttng-tools.git / blobdiff