#include <common/common.h>
#include <common/defaults.h>
+#include "consumer.h"
#include "trace-kernel.h"
/*
{
struct ltt_kernel_channel *chan;
- if (session == NULL) {
- ERR("Undefine session");
- goto error;
- }
+ 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);
}
}
-error:
return NULL;
}
{
struct ltt_kernel_event *ev;
- if (channel == NULL) {
- ERR("Undefine channel");
- goto error;
- }
+ assert(name);
+ assert(channel);
cds_list_for_each_entry(ev, &channel->events_list.head, list) {
if (strcmp(name, ev->event->name) == 0) {
}
}
-error:
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)
{
- int ret;
- struct ltt_kernel_session *lks;
+ struct ltt_kernel_session *lks = NULL;
/* Allocate a new ltt kernel session */
lks = zmalloc(sizeof(struct ltt_kernel_session));
if (lks == NULL) {
PERROR("create kernel session zmalloc");
- goto error;
+ goto alloc_error;
}
/* Init data structure */
lks->channel_count = 0;
lks->stream_count_global = 0;
lks->metadata = NULL;
- lks->consumer_fd = -1;
CDS_INIT_LIST_HEAD(&lks->channel_list.head);
- /* Set session path */
- ret = asprintf(&lks->trace_path, "%s/kernel", path);
- if (ret < 0) {
- PERROR("asprintf kernel traces path");
+ lks->consumer = consumer_create_output(CONSUMER_DST_LOCAL);
+ if (lks->consumer == 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;
+
return lks;
error:
+ free(lks);
+
+alloc_error:
return NULL;
}
*
* Return pointer to structure or NULL.
*/
-struct ltt_kernel_channel *trace_kernel_create_channel(struct lttng_channel *chan, char *path)
+struct ltt_kernel_channel *trace_kernel_create_channel(
+ struct lttng_channel *chan)
{
- int ret;
struct ltt_kernel_channel *lkc;
+ assert(chan);
+
lkc = zmalloc(sizeof(struct ltt_kernel_channel));
if (lkc == NULL) {
PERROR("ltt_kernel_channel zmalloc");
lkc->channel = zmalloc(sizeof(struct lttng_channel));
if (lkc->channel == NULL) {
PERROR("lttng_channel zmalloc");
+ free(lkc);
goto error;
}
memcpy(lkc->channel, chan, sizeof(struct lttng_channel));
+ /*
+ * 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);
- /* Set default trace output path */
- ret = asprintf(&lkc->pathname, "%s", path);
- if (ret < 0) {
- PERROR("asprintf kernel create channel");
- goto error;
- }
+ CDS_INIT_LIST_HEAD(&lkc->ctx_list);
return 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));
+ }
+
+error:
+ return kctx;
+}
+
/*
* Allocate and initialize a kernel event. Set name and event type.
*
struct ltt_kernel_event *lke;
struct lttng_kernel_event *attr;
+ assert(ev);
+
lke = zmalloc(sizeof(struct ltt_kernel_event));
attr = zmalloc(sizeof(struct lttng_kernel_event));
if (lke == NULL || attr == NULL) {
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->ctx = NULL;
return lke;
*
* Return pointer to structure or NULL.
*/
-struct ltt_kernel_metadata *trace_kernel_create_metadata(char *path)
+struct ltt_kernel_metadata *trace_kernel_create_metadata(void)
{
- int ret;
struct ltt_kernel_metadata *lkm;
struct lttng_channel *chan;
/* Set default attributes */
chan->attr.overwrite = DEFAULT_CHANNEL_OVERWRITE;
- chan->attr.subbuf_size = DEFAULT_METADATA_SUBBUF_SIZE;
+ chan->attr.subbuf_size = default_get_metadata_subbuf_size();
chan->attr.num_subbuf = DEFAULT_METADATA_SUBBUF_NUM;
- chan->attr.switch_timer_interval = DEFAULT_CHANNEL_SWITCH_TIMER;
- chan->attr.read_timer_interval = DEFAULT_CHANNEL_READ_TIMER;
+ chan->attr.switch_timer_interval = DEFAULT_KERNEL_CHANNEL_SWITCH_TIMER;
+ chan->attr.read_timer_interval = DEFAULT_KERNEL_CHANNEL_READ_TIMER;
chan->attr.output = DEFAULT_KERNEL_CHANNEL_OUTPUT;
/* Init metadata */
lkm->fd = -1;
lkm->conf = chan;
- /* Set default metadata path */
- ret = asprintf(&lkm->pathname, "%s/metadata", path);
- if (ret < 0) {
- PERROR("asprintf kernel metadata");
- goto error;
- }
return lkm;
*
* Return pointer to structure or NULL.
*/
-struct ltt_kernel_stream *trace_kernel_create_stream(void)
+struct ltt_kernel_stream *trace_kernel_create_stream(const char *name,
+ unsigned int count)
{
+ int ret;
struct ltt_kernel_stream *lks;
+ assert(name);
+
lks = zmalloc(sizeof(struct ltt_kernel_stream));
if (lks == NULL) {
PERROR("kernel stream zmalloc");
goto error;
}
+ /* Set name */
+ ret = snprintf(lks->name, sizeof(lks->name), "%s_%u", name, count);
+ if (ret < 0) {
+ PERROR("snprintf stream name");
+ goto error;
+ }
+ lks->name[sizeof(lks->name) - 1] = '\0';
+
/* Init stream */
lks->fd = -1;
- lks->pathname = NULL;
lks->state = 0;
+ lks->cpu = count;
return lks;
*/
void trace_kernel_destroy_stream(struct ltt_kernel_stream *stream)
{
- int ret;
+ assert(stream);
DBG("[trace] Closing stream fd %d", stream->fd);
/* Close kernel fd */
if (stream->fd >= 0) {
+ int ret;
+
ret = close(stream->fd);
if (ret) {
PERROR("close");
/* Remove from stream list */
cds_list_del(&stream->list);
- free(stream->pathname);
free(stream);
}
*/
void trace_kernel_destroy_event(struct ltt_kernel_event *event)
{
- int ret;
+ assert(event);
if (event->fd >= 0) {
+ int ret;
+
DBG("[trace] Closing event fd %d", event->fd);
/* Close kernel fd */
ret = close(event->fd);
cds_list_del(&event->list);
free(event->event);
- free(event->ctx);
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;
+ assert(channel);
+
DBG("[trace] Closing channel fd %d", channel->fd);
/* Close kernel fd */
if (channel->fd >= 0) {
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);
- free(channel->pathname);
free(channel->channel);
- free(channel->ctx);
free(channel);
}
*/
void trace_kernel_destroy_metadata(struct ltt_kernel_metadata *metadata)
{
- int ret;
+ assert(metadata);
DBG("[trace] Closing metadata fd %d", metadata->fd);
/* Close kernel fd */
if (metadata->fd >= 0) {
+ int ret;
+
ret = close(metadata->fd);
if (ret) {
PERROR("close");
}
free(metadata->conf);
- free(metadata->pathname);
free(metadata);
}
/*
* Cleanup kernel session structure
+ *
+ * Should *NOT* be called with RCU read-side lock held.
*/
void trace_kernel_destroy_session(struct ltt_kernel_session *session)
{
struct ltt_kernel_channel *channel, *ctmp;
int ret;
+ assert(session);
+
DBG("[trace] Closing session fd %d", session->fd);
/* Close kernel fds */
if (session->fd >= 0) {
trace_kernel_destroy_channel(channel);
}
- free(session->trace_path);
+ /* Wipe consumer output object */
+ consumer_destroy_output(session->consumer);
+ consumer_destroy_output(session->tmp_consumer);
+
free(session);
}
projects / lttng-tools.git / blobdiff