assert(session);
/* Allocate data structure */
- lks = trace_kernel_create_session(session->path);
+ lks = trace_kernel_create_session();
if (lks == NULL) {
ret = -1;
goto error;
* kernel session.
*/
int kernel_create_channel(struct ltt_kernel_session *session,
- struct lttng_channel *chan, char *path)
+ struct lttng_channel *chan)
{
int ret;
struct ltt_kernel_channel *lkc;
assert(session);
assert(chan);
- assert(path);
/* Allocate kernel channel */
- lkc = trace_kernel_create_channel(chan, path);
+ lkc = trace_kernel_create_channel(chan);
if (lkc == NULL) {
goto error;
}
- DBG3("Kernel create channel %s in %s with attr: %d, %" PRIu64 ", %" PRIu64 ", %u, %u, %d",
- chan->name, path, lkc->channel->attr.overwrite,
+ DBG3("Kernel create channel %s with attr: %d, %" PRIu64 ", %" PRIu64 ", %u, %u, %d",
+ chan->name, lkc->channel->attr.overwrite,
lkc->channel->attr.subbuf_size, lkc->channel->attr.num_subbuf,
lkc->channel->attr.switch_timer_interval, lkc->channel->attr.read_timer_interval,
lkc->channel->attr.output);
int kernel_open_metadata(struct ltt_kernel_session *session)
{
int ret;
- struct ltt_kernel_metadata *lkm;
+ struct ltt_kernel_metadata *lkm = NULL;
assert(session);
/* Kernel tracer metadata creation */
ret = kernctl_open_metadata(session->fd, &lkm->conf->attr);
if (ret < 0) {
- goto error;
+ goto error_open;
}
lkm->fd = ret;
return 0;
+error_open:
+ trace_kernel_destroy_metadata(lkm);
error:
return -1;
}
PERROR("fcntl session fd");
}
+ lks->tracefile_size = channel->channel->attr.tracefile_size;
+ lks->tracefile_count = channel->channel->attr.tracefile_count;
+
/* Add stream to channe stream list */
cds_list_add(&lks->list, &channel->stream_list.head);
channel->stream_count++;