* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#define _GNU_SOURCE
+#define _LGPL_SOURCE
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "consumer.h"
#include "trace-kernel.h"
+#include "lttng-sessiond.h"
+#include "notification-thread-commands.h"
/*
* Find the channel name for the given kernel session.
assert(session);
assert(name);
+ /*
+ * If we receive an empty string for channel name, it means the
+ * default channel name is requested.
+ */
+ if (name[0] == '\0')
+ name = DEFAULT_CHANNEL_NAME;
+
DBG("Trying to find channel %s", name);
cds_list_for_each_entry(chan, &session->channel_list.head, list) {
return NULL;
}
+/*
+ * Find the event for the given channel.
+ */
+struct ltt_kernel_event *trace_kernel_find_event(
+ char *name, struct ltt_kernel_channel *channel,
+ enum lttng_event_type type,
+ struct lttng_filter_bytecode *filter)
+{
+ struct ltt_kernel_event *ev;
+ int found = 0;
+
+ assert(name);
+ assert(channel);
+
+ cds_list_for_each_entry(ev, &channel->events_list.head, list) {
+ if (type != LTTNG_EVENT_ALL && ev->type != type) {
+ continue;
+ }
+ if (strcmp(name, ev->event->name)) {
+ continue;
+ }
+ if ((ev->filter && !filter) || (!ev->filter && filter)) {
+ continue;
+ }
+ if (ev->filter && filter) {
+ if (ev->filter->len != filter->len ||
+ memcmp(ev->filter->data, filter->data,
+ filter->len) != 0) {
+ continue;
+ }
+ }
+ found = 1;
+ break;
+ }
+ if (found) {
+ DBG("Found event %s for channel %s", name,
+ channel->channel->name);
+ return ev;
+ } else {
+ return NULL;
+ }
+}
+
/*
* Find the event name for the given channel.
*/
struct ltt_kernel_event *trace_kernel_get_event_by_name(
- char *name, struct ltt_kernel_channel *channel)
+ char *name, struct ltt_kernel_channel *channel,
+ enum lttng_event_type type)
{
struct ltt_kernel_event *ev;
+ int found = 0;
assert(name);
assert(channel);
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;
+ if (type != LTTNG_EVENT_ALL && ev->type != type) {
+ continue;
+ }
+ if (strcmp(name, ev->event->name)) {
+ continue;
}
+ found = 1;
+ break;
+ }
+ if (found) {
+ DBG("Found event %s for channel %s", name,
+ channel->channel->name);
+ return ev;
+ } else {
+ return NULL;
}
-
- return NULL;
}
/*
*
* Return pointer to structure or NULL.
*/
-struct ltt_kernel_session *trace_kernel_create_session(char *path)
+struct ltt_kernel_session *trace_kernel_create_session(void)
{
struct ltt_kernel_session *lks = NULL;
goto error;
}
- /*
- * The tmp_consumer stays NULL until a set_consumer_uri command is
- * executed. At this point, the consumer should be nullify until an
- * enable_consumer command. This assignment is symbolic since we've zmalloc
- * the struct.
- */
- lks->tmp_consumer = NULL;
-
- if (*path != '\0') {
- int ret;
-
- /* Use the default consumer output which is the tracing session path. */
- ret = snprintf(lks->consumer->dst.trace_path, PATH_MAX,
- "%s" DEFAULT_KERNEL_TRACE_DIR, path);
- if (ret < 0) {
- PERROR("snprintf consumer trace path");
- goto error;
- }
-
- /* Set session path */
- ret = asprintf(&lks->trace_path, "%s" DEFAULT_KERNEL_TRACE_DIR, path);
- if (ret < 0) {
- PERROR("asprintf kernel traces path");
- goto error;
- }
- }
-
return lks;
error:
struct lttng_channel *chan)
{
struct ltt_kernel_channel *lkc;
+ struct lttng_channel_extended *extended;
assert(chan);
PERROR("lttng_channel zmalloc");
goto error;
}
+
+ extended = zmalloc(sizeof(struct lttng_channel_extended));
+ if (!extended) {
+ PERROR("lttng_channel_channel zmalloc");
+ goto error;
+ }
memcpy(lkc->channel, chan, sizeof(struct lttng_channel));
+ memcpy(extended, chan->attr.extended.ptr, sizeof(struct lttng_channel_extended));
+ lkc->channel->attr.extended.ptr = extended;
+ extended = NULL;
+
+ /*
+ * If we receive an empty string for channel name, it means the
+ * default channel name is requested.
+ */
+ if (chan->name[0] == '\0') {
+ strncpy(lkc->channel->name, DEFAULT_CHANNEL_NAME,
+ sizeof(lkc->channel->name));
+ }
+ lkc->channel->name[LTTNG_KERNEL_SYM_NAME_LEN - 1] = '\0';
lkc->fd = -1;
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);
+ CDS_INIT_LIST_HEAD(&lkc->ctx_list);
return lkc;
error:
+ if (lkc) {
+ free(lkc->channel);
+ }
+ free(extended);
+ free(lkc);
return NULL;
}
+/*
+ * Allocate and init a kernel context object.
+ *
+ * Return the allocated object or NULL on error.
+ */
+struct ltt_kernel_context *trace_kernel_create_context(
+ struct lttng_kernel_context *ctx)
+{
+ struct ltt_kernel_context *kctx;
+
+ kctx = zmalloc(sizeof(*kctx));
+ if (!kctx) {
+ PERROR("zmalloc kernel context");
+ goto error;
+ }
+
+ if (ctx) {
+ memcpy(&kctx->ctx, ctx, sizeof(kctx->ctx));
+ }
+
+ CDS_INIT_LIST_HEAD(&kctx->list);
+
+error:
+ return kctx;
+}
+
/*
* Allocate and initialize a kernel event. Set name and event type.
+ * We own filter_expression, and filter.
*
* Return pointer to structure or NULL.
*/
-struct ltt_kernel_event *trace_kernel_create_event(struct lttng_event *ev)
+struct ltt_kernel_event *trace_kernel_create_event(struct lttng_event *ev,
+ char *filter_expression, struct lttng_filter_bytecode *filter)
{
struct ltt_kernel_event *lke;
struct lttng_kernel_event *attr;
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_KERNEL_SYM_NAME_LEN);
attr->u.kretprobe.symbol_name[LTTNG_KERNEL_SYM_NAME_LEN - 1] = '\0';
lke->fd = -1;
lke->event = attr;
lke->enabled = 1;
+ lke->filter_expression = filter_expression;
+ lke->filter = filter;
return lke;
error:
+ free(filter_expression);
+ free(filter);
free(lke);
free(attr);
return NULL;
}
/* Set name */
- ret = snprintf(lks->name, sizeof(lks->name), "%s_%d", name, count);
+ ret = snprintf(lks->name, sizeof(lks->name), "%s_%u", name, count);
if (ret < 0) {
PERROR("snprintf stream name");
goto error;
/* Remove from event list */
cds_list_del(&event->list);
+ free(event->filter_expression);
+ free(event->filter);
+
free(event->event);
free(event);
}
+/*
+ * Cleanup kernel context structure.
+ */
+void trace_kernel_destroy_context(struct ltt_kernel_context *ctx)
+{
+ assert(ctx);
+
+ cds_list_del(&ctx->list);
+ free(ctx);
+}
+
/*
* Cleanup kernel channel structure.
*/
{
struct ltt_kernel_stream *stream, *stmp;
struct ltt_kernel_event *event, *etmp;
+ struct ltt_kernel_context *ctx, *ctmp;
int ret;
+ enum lttng_error_code status;
assert(channel);
trace_kernel_destroy_event(event);
}
+ /* For each context in the channel list */
+ cds_list_for_each_entry_safe(ctx, ctmp, &channel->ctx_list, list) {
+ trace_kernel_destroy_context(ctx);
+ }
+
/* Remove from channel list */
cds_list_del(&channel->list);
+ status = notification_thread_command_remove_channel(
+ notification_thread_handle,
+ channel->fd, LTTNG_DOMAIN_KERNEL);
+ assert(status == LTTNG_OK);
+ free(channel->channel->attr.extended.ptr);
free(channel->channel);
- free(channel->ctx);
free(channel);
}
/*
* Cleanup kernel session structure
+ *
+ * Should *NOT* be called with RCU read-side lock held.
*/
void trace_kernel_destroy_session(struct ltt_kernel_session *session)
{
}
/* Wipe consumer output object */
- consumer_destroy_output(session->consumer);
- consumer_destroy_output(session->tmp_consumer);
+ consumer_output_put(session->consumer);
- free(session->trace_path);
free(session);
}
projects / lttng-tools.git / blobdiff