}
/* Prep channel message structure */
- consumer_init_add_channel_comm_msg(&lkm,
- channel->key,
- ksession->id,
- &pathname[consumer_path_offset],
- consumer->net_seq_index,
- channel->channel->name,
- channel->stream_count,
- channel->channel->attr.output,
- CONSUMER_CHANNEL_TYPE_DATA,
+ consumer_init_add_channel_comm_msg(&lkm, channel->key, ksession->id,
+ &pathname[consumer_path_offset], consumer->net_seq_index,
+ channel->channel->name, channel->stream_count,
+ channel->channel->attr.output, CONSUMER_CHANNEL_TYPE_DATA,
channel->channel->attr.tracefile_size,
- channel->channel->attr.tracefile_count,
- monitor,
- channel->channel->attr.live_timer_interval,
- ksession->is_live_session,
+ channel->channel->attr.tracefile_count, monitor,
+ channel->channel->attr.live_timer_interval, ksession->is_live_session,
channel_attr_extended->monitor_timer_interval,
- ksession->current_trace_chunk);
+ ksession->current_trace_chunk, *ksession->trace_format);
health_code_update();
ASSERT_LOCKED(session->lock);
ASSERT_SESSION_LIST_LOCKED();
- status = notification_thread_command_add_channel(
- the_notification_thread_handle, session->name,
- ksession->uid, ksession->gid, channel->channel->name,
- channel->key, LTTNG_DOMAIN_KERNEL,
- channel->channel->attr.subbuf_size *
- channel->channel->attr.num_subbuf);
+ status = notification_thread_command_add_channel(the_notification_thread_handle,
+ session->id, channel->channel->name, channel->key, LTTNG_DOMAIN_KERNEL,
+ channel->channel->attr.subbuf_size * channel->channel->attr.num_subbuf);
rcu_read_unlock();
if (status != LTTNG_OK) {
ret = -1;
consumer = ksession->consumer;
/* Prep channel message structure */
- consumer_init_add_channel_comm_msg(&lkm,
- ksession->metadata->key,
- ksession->id,
- "",
- consumer->net_seq_index,
- ksession->metadata->conf->name,
- 1,
- ksession->metadata->conf->attr.output,
- CONSUMER_CHANNEL_TYPE_METADATA,
+ consumer_init_add_channel_comm_msg(&lkm, ksession->metadata->key, ksession->id, "",
+ consumer->net_seq_index, ksession->metadata->conf->name, 1,
+ ksession->metadata->conf->attr.output, CONSUMER_CHANNEL_TYPE_METADATA,
ksession->metadata->conf->attr.tracefile_size,
- ksession->metadata->conf->attr.tracefile_count,
- monitor,
+ ksession->metadata->conf->attr.tracefile_count, monitor,
ksession->metadata->conf->attr.live_timer_interval,
- ksession->is_live_session,
- 0,
- ksession->current_trace_chunk);
+ ksession->is_live_session, 0, ksession->current_trace_chunk,
+ *ksession->trace_format);
health_code_update();