#include <common/common.h>
#include <common/defaults.h>
+#include "consumer.h"
#include "trace-kernel.h"
/*
struct ltt_kernel_session *trace_kernel_create_session(char *path)
{
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;
+
+ if (path && strlen(path) > 0) {
+ /* 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:
+ 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, char *path)
{
- int ret;
struct ltt_kernel_channel *lkc;
lkc = zmalloc(sizeof(struct ltt_kernel_channel));
/* 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;
- }
return lkc;
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;
/* 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;
lks = zmalloc(sizeof(struct ltt_kernel_stream));
goto error;
}
+ /* Set name */
+ ret = snprintf(lks->name, sizeof(lks->name), "%s_%d", 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;
return lks;
/* Remove from stream list */
cds_list_del(&stream->list);
- free(stream->pathname);
free(stream);
}
cds_list_del(&event->list);
free(event->event);
- free(event->ctx);
free(event);
}
/* Remove from channel list */
cds_list_del(&channel->list);
- free(channel->pathname);
free(channel->channel);
free(channel->ctx);
free(channel);
}
free(metadata->conf);
- free(metadata->pathname);
free(metadata);
}
trace_kernel_destroy_channel(channel);
}
+ /* Wipe consumer output object */
+ consumer_destroy_output(session->consumer);
+ consumer_destroy_output(session->tmp_consumer);
+
free(session->trace_path);
free(session);
}