#include <urcu/list.h>
#include "lttngerr.h"
-#include "ltt-sessiond.h"
#include "trace.h"
/*
*
* 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->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", DEFAULT_TRACE_OUTPUT);
+ ret = asprintf(&lkc->pathname, "%s", path);
if (ret < 0) {
perror("asprintf kernel create channel");
goto error;
/* Setting up a kernel event */
lke->fd = 0;
lke->event = attr;
+ lke->enabled = 1;
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;
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) {
trace_destroy_kernel_channel(channel);