#include <common/common.h>
#include <common/defaults.h>
#include <common/sessiond-comm/relayd.h>
-#include <common/index/lttng-index.h>
+#include <common/index/ctf-index.h>
#include "relayd.h"
*/
static int relayd_create_session_2_4(struct lttcomm_relayd_sock *rsock,
uint64_t *session_id, char *session_name, char *hostname,
- int session_live_timer)
+ int session_live_timer, unsigned int snapshot)
{
int ret;
struct lttcomm_relayd_create_session_2_4 msg;
strncpy(msg.session_name, session_name, sizeof(msg.session_name));
strncpy(msg.hostname, hostname, sizeof(msg.hostname));
msg.live_timer = htobe32(session_live_timer);
+ msg.snapshot = htobe32(snapshot);
/* Send command */
ret = send_command(rsock, RELAYD_CREATE_SESSION, &msg, sizeof(msg), 0);
* a lttng error code from the relayd.
*/
int relayd_create_session(struct lttcomm_relayd_sock *rsock, uint64_t *session_id,
- char *session_name, char *hostname, int session_live_timer)
+ char *session_name, char *hostname, int session_live_timer,
+ unsigned int snapshot)
{
int ret;
struct lttcomm_relayd_status_session reply;
case 2:
case 3:
ret = relayd_create_session_2_1(rsock, session_id);
+ break;
case 4:
default:
- ret = relayd_create_session_2_4(rsock, session_id,
- session_name, hostname,
- session_live_timer);
+ ret = relayd_create_session_2_4(rsock, session_id, session_name,
+ hostname, session_live_timer, snapshot);
+ break;
}
if (ret < 0) {
int relayd_end_data_pending(struct lttcomm_relayd_sock *rsock, uint64_t id,
unsigned int *is_data_inflight)
{
- int ret;
+ int ret, recv_ret;
struct lttcomm_relayd_end_data_pending msg;
struct lttcomm_relayd_generic_reply reply;
goto error;
}
- reply.ret_code = be32toh(reply.ret_code);
- if (reply.ret_code < 0) {
- ret = reply.ret_code;
+ recv_ret = be32toh(reply.ret_code);
+ if (recv_ret < 0) {
+ ret = recv_ret;
goto error;
}
- *is_data_inflight = reply.ret_code;
+ *is_data_inflight = recv_ret;
- DBG("Relayd end data pending is data inflight: %d", reply.ret_code);
+ DBG("Relayd end data pending is data inflight: %d", recv_ret);
return 0;
* Send index to the relayd.
*/
int relayd_send_index(struct lttcomm_relayd_sock *rsock,
- struct lttng_packet_index *index, uint64_t relay_stream_id,
+ struct ctf_packet_index *index, uint64_t relay_stream_id,
uint64_t net_seq_num)
{
int ret;