#include <common/common.h>
#include <common/defaults.h>
#include <common/uri.h>
+#include <common/relayd/relayd.h>
#include "consumer.h"
-#include "health.h"
+#include "health-sessiond.h"
#include "ust-app.h"
#include "utils.h"
ssize_t size;
assert(socket);
- assert(socket->fd);
+ assert(socket->fd_ptr);
assert(msg);
/* Consumer socket is invalid. Stopping. */
- fd = *socket->fd;
+ fd = *socket->fd_ptr;
if (fd < 0) {
goto error;
}
/* The above call will print a PERROR on error. */
DBG("Error when sending data to consumer on sock %d", fd);
/*
- * At this point, the socket is not usable anymore thus flagging it
- * invalid and closing it.
+ * At this point, the socket is not usable anymore thus closing it and
+ * setting the file descriptor to -1 so it is not reused.
*/
/* This call will PERROR on error. */
(void) lttcomm_close_unix_sock(fd);
- *socket->fd = -1;
+ *socket->fd_ptr = -1;
goto error;
}
ssize_t size;
assert(socket);
- assert(socket->fd);
+ assert(socket->fd_ptr);
assert(msg);
/* Consumer socket is invalid. Stopping. */
- fd = *socket->fd;
+ fd = *socket->fd_ptr;
if (fd < 0) {
goto error;
}
/* The above call will print a PERROR on error. */
DBG("Error when receiving data from the consumer socket %d", fd);
/*
- * At this point, the socket is not usable anymore thus flagging it
- * invalid and closing it.
+ * At this point, the socket is not usable anymore thus closing it and
+ * setting the file descriptor to -1 so it is not reused.
*/
/* This call will PERROR on error. */
(void) lttcomm_close_unix_sock(fd);
- *socket->fd = -1;
+ *socket->fd_ptr = -1;
goto error;
}
goto end;
}
- if (reply.ret_code == LTTNG_OK) {
+ if (reply.ret_code == LTTCOMM_CONSUMERD_SUCCESS) {
/* All good. */
ret = 0;
} else {
}
/* An error is possible so don't touch the key and stream_count. */
- if (reply.ret_code != LTTNG_OK) {
+ if (reply.ret_code != LTTCOMM_CONSUMERD_SUCCESS) {
ret = -1;
goto end;
}
*key = reply.key;
*stream_count = reply.stream_count;
+ ret = 0;
end:
return ret;
assert(consumer);
assert(sock);
- DBG2("Sending destroy relayd command to consumer sock %d", *sock->fd);
+ DBG2("Sending destroy relayd command to consumer sock %d", *sock->fd_ptr);
msg.cmd_type = LTTNG_CONSUMER_DESTROY_RELAYD;
msg.u.destroy_relayd.net_seq_idx = consumer->net_seq_index;
goto error;
}
- socket->fd = fd;
+ socket->fd_ptr = fd;
lttng_ht_node_init_ulong(&socket->node, *fd);
error:
* consumer was registered,
*/
if (sock->registered) {
- DBG3("Consumer socket was registered. Closing fd %d", *sock->fd);
- lttcomm_close_unix_sock(*sock->fd);
+ DBG3("Consumer socket was registered. Closing fd %d", *sock->fd_ptr);
+ lttcomm_close_unix_sock(*sock->fd_ptr);
}
call_rcu(&sock->node.head, destroy_socket_rcu);
rcu_read_lock();
cds_lfht_for_each_entry(src->socks->ht, &iter.iter, socket, node.node) {
/* Ignore socket that are already there. */
- copy_sock = consumer_find_socket(*socket->fd, dst);
+ copy_sock = consumer_find_socket(*socket->fd_ptr, dst);
if (copy_sock) {
continue;
}
/* Create new socket object. */
- copy_sock = consumer_allocate_socket(socket->fd);
+ copy_sock = consumer_allocate_socket(socket->fd_ptr);
if (copy_sock == NULL) {
rcu_read_unlock();
ret = -ENOMEM;
assert(fds);
assert(sock);
- assert(sock->fd);
assert(nb_fd > 0);
- ret = lttcomm_send_fds_unix_sock(*sock->fd, fds, nb_fd);
+ ret = lttcomm_send_fds_unix_sock(*sock->fd_ptr, fds, nb_fd);
if (ret < 0) {
/* The above call will print a PERROR on error. */
- DBG("Error when sending consumer fds on sock %d", *sock->fd);
+ DBG("Error when sending consumer fds on sock %d", *sock->fd_ptr);
goto error;
}
assert(msg);
assert(sock);
- assert(sock->fd);
ret = consumer_socket_send(sock, msg, sizeof(struct lttcomm_consumer_msg));
if (ret < 0) {
assert(msg);
assert(sock);
- assert(sock->fd);
ret = consumer_send_msg(sock, msg);
if (ret < 0) {
int overwrite,
unsigned int switch_timer_interval,
unsigned int read_timer_interval,
+ unsigned int live_timer_interval,
int output,
int type,
uint64_t session_id,
msg->u.ask_channel.overwrite = overwrite;
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.output = output;
msg->u.ask_channel.type = type;
msg->u.ask_channel.session_id = session_id;
int type,
uint64_t tracefile_size,
uint64_t tracefile_count,
- unsigned int monitor)
+ unsigned int monitor,
+ unsigned int live_timer_interval)
{
assert(msg);
msg->u.channel.tracefile_size = tracefile_size;
msg->u.channel.tracefile_count = tracefile_count;
msg->u.channel.monitor = monitor;
+ msg->u.channel.live_timer_interval = live_timer_interval;
strncpy(msg->u.channel.pathname, pathname,
sizeof(msg->u.channel.pathname));
msg->u.stream.cpu = cpu;
}
+void consumer_init_streams_sent_comm_msg(struct lttcomm_consumer_msg *msg,
+ enum lttng_consumer_command cmd,
+ uint64_t channel_key, uint64_t net_seq_idx)
+{
+ assert(msg);
+
+ memset(msg, 0, sizeof(struct lttcomm_consumer_msg));
+
+ msg->cmd_type = cmd;
+ msg->u.sent_streams.channel_key = channel_key;
+ msg->u.sent_streams.net_seq_idx = net_seq_idx;
+}
+
/*
* Send stream communication structure to the consumer.
*/
assert(msg);
assert(dst);
assert(sock);
- assert(sock->fd);
assert(fds);
ret = consumer_send_msg(sock, msg);
*/
int consumer_send_relayd_socket(struct consumer_socket *consumer_sock,
struct lttcomm_relayd_sock *rsock, struct consumer_output *consumer,
- enum lttng_stream_type type, uint64_t session_id)
+ enum lttng_stream_type type, uint64_t session_id,
+ char *session_name, char *hostname, int session_live_timer)
{
int ret;
struct lttcomm_consumer_msg msg;
assert(rsock);
assert(consumer);
assert(consumer_sock);
- assert(consumer_sock->fd);
/* Bail out if consumer is disabled */
if (!consumer->enabled) {
goto error;
}
+ if (type == LTTNG_STREAM_CONTROL) {
+ ret = relayd_create_session(rsock,
+ &msg.u.relayd_sock.relayd_session_id,
+ session_name, hostname, session_live_timer,
+ consumer->snapshot);
+ if (ret < 0) {
+ /* Close the control socket. */
+ (void) relayd_close(rsock);
+ goto error;
+ }
+ }
+
msg.cmd_type = LTTNG_CONSUMER_ADD_RELAYD_SOCKET;
/*
* Assign network consumer output index using the temporary consumer since
msg.u.relayd_sock.session_id = session_id;
memcpy(&msg.u.relayd_sock.sock, rsock, sizeof(msg.u.relayd_sock.sock));
- DBG3("Sending relayd sock info to consumer on %d", *consumer_sock->fd);
+ DBG3("Sending relayd sock info to consumer on %d", *consumer_sock->fd_ptr);
ret = consumer_send_msg(consumer_sock, &msg);
if (ret < 0) {
goto error;
rcu_read_lock();
cds_lfht_for_each_entry(consumer->socks->ht, &iter.iter, socket,
node.node) {
- /* Code flow error */
- assert(socket->fd);
-
pthread_mutex_lock(socket->lock);
ret = consumer_socket_send(socket, &msg, sizeof(msg));
if (ret < 0) {
struct lttcomm_consumer_msg msg;
assert(socket);
- assert(socket->fd);
DBG2("Consumer flush channel key %" PRIu64, key);
struct lttcomm_consumer_msg msg;
assert(socket);
- assert(socket->fd);
DBG2("Consumer close metadata channel key %" PRIu64, metadata_key);
struct lttcomm_consumer_msg msg;
assert(socket);
- assert(socket->fd);
DBG2("Consumer setup metadata channel key %" PRIu64, metadata_key);
struct lttcomm_consumer_msg msg;
assert(socket);
- assert(socket->fd);
- DBG2("Consumer push metadata to consumer socket %d", *socket->fd);
+ DBG2("Consumer push metadata to consumer socket %d", *socket->fd_ptr);
msg.cmd_type = LTTNG_CONSUMER_PUSH_METADATA;
msg.u.push_metadata.key = metadata_key;
goto end;
}
- DBG3("Consumer pushing metadata on sock %d of len %zu", *socket->fd, len);
+ DBG3("Consumer pushing metadata on sock %d of len %zu", *socket->fd_ptr,
+ len);
ret = consumer_socket_send(socket, metadata_str, len);
if (ret < 0) {
struct lttcomm_consumer_msg msg;
assert(socket);
- assert(socket->fd);
assert(output);
assert(output->consumer);
projects / lttng-tools.git / blobdiff