unsigned int switch_timer_interval,
unsigned int read_timer_interval,
unsigned int live_timer_interval,
+ bool is_in_live_session,
unsigned int monitor_timer_interval,
int output,
int type,
msg->u.ask_channel.switch_timer_interval = switch_timer_interval;
msg->u.ask_channel.read_timer_interval = read_timer_interval;
msg->u.ask_channel.live_timer_interval = live_timer_interval;
+ msg->u.ask_channel.is_live = is_in_live_session;
msg->u.ask_channel.monitor_timer_interval = monitor_timer_interval;
msg->u.ask_channel.output = output;
msg->u.ask_channel.type = type;
uint64_t tracefile_count,
unsigned int monitor,
unsigned int live_timer_interval,
+ bool is_in_live_session,
unsigned int monitor_timer_interval,
struct lttng_trace_chunk *trace_chunk)
{
msg->u.channel.tracefile_count = tracefile_count;
msg->u.channel.monitor = monitor;
msg->u.channel.live_timer_interval = live_timer_interval;
+ msg->u.channel.is_live = is_in_live_session;
msg->u.channel.monitor_timer_interval = monitor_timer_interval;
strncpy(msg->u.channel.pathname, pathname,
if (type == LTTNG_STREAM_CONTROL) {
char output_path[LTTNG_PATH_MAX] = {};
+ uint64_t relayd_session_id;
ret = relayd_create_session(rsock,
- &msg.u.relayd_sock.relayd_session_id,
+ &relayd_session_id,
session_name, hostname, base_path,
session_live_timer,
consumer->snapshot, session_id,
(void) relayd_close(rsock);
goto error;
}
+ msg.u.relayd_sock.relayd_session_id = relayd_session_id;
DBG("Created session on relay, output path reply: %s",
output_path);
}
}
DBG3("Sending relayd socket file descriptor to consumer");
- ret = consumer_send_fds(consumer_sock, &rsock->sock.fd, 1);
+ ret = consumer_send_fds(consumer_sock, ALIGNED_CONST_PTR(rsock->sock.fd), 1);
if (ret < 0) {
goto error;
}