#include <common/common.h>
#include <common/defaults.h>
#include <common/uri.h>
-#include <common/utils.h>
#include "consumer.h"
#include "health.h"
assert(sock);
- ret = lttcomm_recv_unix_sock(sock->fd, &reply, sizeof(reply));
+ ret = lttcomm_recv_unix_sock(*sock->fd, &reply, sizeof(reply));
if (ret <= 0) {
if (ret == 0) {
/* Orderly shutdown. Don't return 0 which means success. */
ret = -1;
}
/* The above call will print a PERROR on error. */
- DBG("Fail to receive status reply on sock %d", sock->fd);
+ DBG("Fail to receive status reply on sock %d", *sock->fd);
goto end;
}
assert(stream_count);
assert(key);
- ret = lttcomm_recv_unix_sock(sock->fd, &reply, sizeof(reply));
+ ret = lttcomm_recv_unix_sock(*sock->fd, &reply, sizeof(reply));
if (ret <= 0) {
if (ret == 0) {
/* Orderly shutdown. Don't return 0 which means success. */
ret = -1;
}
/* The above call will print a PERROR on error. */
- DBG("Fail to receive status reply on sock %d", sock->fd);
+ DBG("Fail to receive status reply on sock %d", *sock->fd);
goto end;
}
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);
/* Bail out if consumer is disabled */
if (!consumer->enabled) {
msg.u.destroy_relayd.net_seq_idx = consumer->net_seq_index;
pthread_mutex_lock(sock->lock);
- ret = lttcomm_send_unix_sock(sock->fd, &msg, sizeof(msg));
+ ret = lttcomm_send_unix_sock(*sock->fd, &msg, sizeof(msg));
if (ret < 0) {
/* Indicate that the consumer is probably closing at this point. */
DBG("send consumer destroy relayd command");
socket = consumer_find_socket(data->cmd_sock, output);
rcu_read_unlock();
if (socket == NULL) {
- socket = consumer_allocate_socket(data->cmd_sock);
+ socket = consumer_allocate_socket(&data->cmd_sock);
if (socket == NULL) {
ret = -1;
goto error;
/*
* Allocate a new consumer_socket and return the pointer.
*/
-struct consumer_socket *consumer_allocate_socket(int fd)
+struct consumer_socket *consumer_allocate_socket(int *fd)
{
struct consumer_socket *socket = NULL;
+ assert(fd);
+
socket = zmalloc(sizeof(struct consumer_socket));
if (socket == NULL) {
PERROR("zmalloc consumer socket");
}
socket->fd = fd;
- lttng_ht_node_init_ulong(&socket->node, fd);
+ lttng_ht_node_init_ulong(&socket->node, *fd);
error:
return socket;
* 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);
+ lttcomm_close_unix_sock(*sock->fd);
}
call_rcu(&sock->node.head, destroy_socket_rcu);
return output;
}
+/*
+ * Iterate over the consumer output socket hash table and destroy them. The
+ * socket file descriptor are only closed if the consumer output was
+ * registered meaning it's an external consumer.
+ */
+void consumer_destroy_output_sockets(struct consumer_output *obj)
+{
+ struct lttng_ht_iter iter;
+ struct consumer_socket *socket;
+
+ if (!obj->socks) {
+ return;
+ }
+
+ rcu_read_lock();
+ cds_lfht_for_each_entry(obj->socks->ht, &iter.iter, socket, node.node) {
+ consumer_del_socket(socket, obj);
+ consumer_destroy_socket(socket);
+ }
+ rcu_read_unlock();
+}
+
/*
* Delete the consumer_output object from the list and free the ptr.
*
return;
}
- if (obj->socks) {
- struct lttng_ht_iter iter;
- struct consumer_socket *socket;
-
- rcu_read_lock();
- cds_lfht_for_each_entry(obj->socks->ht, &iter.iter, socket, node.node) {
- consumer_del_socket(socket, obj);
- consumer_destroy_socket(socket);
- }
- rcu_read_unlock();
+ consumer_destroy_output_sockets(obj);
+ if (obj->socks) {
/* Finally destroy HT */
ht_cleanup_push(obj->socks);
}
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, dst);
if (copy_sock) {
continue;
}
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, 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);
goto error;
}
assert(msg);
assert(sock);
- assert(sock->fd >= 0);
+ assert(sock->fd);
- ret = lttcomm_send_unix_sock(sock->fd, msg,
+ ret = lttcomm_send_unix_sock(*sock->fd, msg,
sizeof(struct lttcomm_consumer_msg));
if (ret < 0) {
/* The above call will print a PERROR on error. */
- DBG("Error when sending consumer channel on sock %d", sock->fd);
+ DBG("Error when sending consumer channel on sock %d", *sock->fd);
goto error;
}
assert(msg);
assert(sock);
- assert(sock->fd >= 0);
+ assert(sock->fd);
- ret = lttcomm_send_unix_sock(sock->fd, msg,
+ ret = lttcomm_send_unix_sock(*sock->fd, msg,
sizeof(struct lttcomm_consumer_msg));
if (ret < 0) {
/* The above call will print a PERROR on error. */
- DBG("Error when sending consumer channel on sock %d", sock->fd);
+ DBG("Error when sending consumer channel on sock %d", *sock->fd);
goto error;
}
uint64_t tracefile_size,
uint64_t tracefile_count,
uint64_t session_id_per_pid,
- unsigned int monitor)
+ unsigned int monitor,
+ uint32_t ust_app_uid)
{
assert(msg);
msg->u.ask_channel.tracefile_size = tracefile_size;
msg->u.ask_channel.tracefile_count = tracefile_count;
msg->u.ask_channel.monitor = monitor;
+ msg->u.ask_channel.ust_app_uid = ust_app_uid;
memcpy(msg->u.ask_channel.uuid, uuid, sizeof(msg->u.ask_channel.uuid));
- strncpy(msg->u.ask_channel.pathname, pathname,
- sizeof(msg->u.ask_channel.pathname));
- msg->u.ask_channel.pathname[sizeof(msg->u.ask_channel.pathname)-1] = '\0';
+ if (pathname) {
+ strncpy(msg->u.ask_channel.pathname, pathname,
+ sizeof(msg->u.ask_channel.pathname));
+ msg->u.ask_channel.pathname[sizeof(msg->u.ask_channel.pathname)-1] = '\0';
+ }
strncpy(msg->u.ask_channel.name, name, sizeof(msg->u.ask_channel.name));
msg->u.ask_channel.name[sizeof(msg->u.ask_channel.name) - 1] = '\0';
assert(msg);
assert(dst);
assert(sock);
+ assert(sock->fd);
assert(fds);
/* Send on socket */
- ret = lttcomm_send_unix_sock(sock->fd, msg,
+ ret = lttcomm_send_unix_sock(*sock->fd, msg,
sizeof(struct lttcomm_consumer_msg));
if (ret < 0) {
/* The above call will print a PERROR on error. */
- DBG("Error when sending consumer stream on sock %d", sock->fd);
+ DBG("Error when sending consumer stream on sock %d", *sock->fd);
goto error;
}
assert(rsock);
assert(consumer);
assert(consumer_sock);
+ assert(consumer_sock->fd);
/* Bail out if consumer is disabled */
if (!consumer->enabled) {
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);
- ret = lttcomm_send_unix_sock(consumer_sock->fd, &msg, sizeof(msg));
+ DBG3("Sending relayd sock info to consumer on %d", *consumer_sock->fd);
+ ret = lttcomm_send_unix_sock(*consumer_sock->fd, &msg, sizeof(msg));
if (ret < 0) {
/* The above call will print a PERROR on error. */
DBG("Error when sending relayd sockets on sock %d", rsock->sock.fd);
cds_lfht_for_each_entry(consumer->socks->ht, &iter.iter, socket,
node.node) {
/* Code flow error */
- assert(socket->fd >= 0);
+ assert(socket->fd);
pthread_mutex_lock(socket->lock);
- ret = lttcomm_send_unix_sock(socket->fd, &msg, sizeof(msg));
+ ret = lttcomm_send_unix_sock(*socket->fd, &msg, sizeof(msg));
if (ret < 0) {
/* The above call will print a PERROR on error. */
- DBG("Error on consumer is data pending on sock %d", socket->fd);
+ DBG("Error on consumer is data pending on sock %d", *socket->fd);
pthread_mutex_unlock(socket->lock);
goto error_unlock;
}
* the reply status message.
*/
- ret = lttcomm_recv_unix_sock(socket->fd, &ret_code, sizeof(ret_code));
+ ret = lttcomm_recv_unix_sock(*socket->fd, &ret_code, sizeof(ret_code));
if (ret <= 0) {
if (ret == 0) {
/* Orderly shutdown. Don't return 0 which means success. */
ret = -1;
}
/* The above call will print a PERROR on error. */
- DBG("Error on recv consumer is data pending on sock %d", socket->fd);
+ DBG("Error on recv consumer is data pending on sock %d", *socket->fd);
pthread_mutex_unlock(socket->lock);
goto error_unlock;
}
struct lttcomm_consumer_msg msg;
assert(socket);
- assert(socket->fd >= 0);
+ assert(socket->fd);
DBG2("Consumer flush channel key %" PRIu64, key);
struct lttcomm_consumer_msg msg;
assert(socket);
- assert(socket->fd >= 0);
+ assert(socket->fd);
DBG2("Consumer close metadata channel key %" PRIu64, metadata_key);
struct lttcomm_consumer_msg msg;
assert(socket);
- assert(socket->fd >= 0);
+ assert(socket->fd);
DBG2("Consumer setup metadata channel key %" PRIu64, metadata_key);
struct lttcomm_consumer_msg msg;
assert(socket);
- assert(socket->fd >= 0);
+ assert(socket->fd);
- DBG2("Consumer push metadata to consumer socket %d", socket->fd);
+ DBG2("Consumer push metadata to consumer socket %d", *socket->fd);
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, len);
- ret = lttcomm_send_unix_sock(socket->fd, metadata_str, len);
+ ret = lttcomm_send_unix_sock(*socket->fd, metadata_str, len);
if (ret < 0) {
goto end;
}
*/
int consumer_snapshot_channel(struct consumer_socket *socket, uint64_t key,
struct snapshot_output *output, int metadata, uid_t uid, gid_t gid,
- const char *session_path, int wait)
+ const char *session_path, int wait, int max_stream_size)
{
int ret;
- char datetime[16];
struct lttcomm_consumer_msg msg;
assert(socket);
- assert(socket->fd >= 0);
+ assert(socket->fd);
assert(output);
assert(output->consumer);
DBG("Consumer snapshot channel key %" PRIu64, key);
- ret = utils_get_current_time_str("%Y%m%d-%H%M%S", datetime,
- sizeof(datetime));
- if (!ret) {
- ret = -EINVAL;
- goto error;
- }
-
memset(&msg, 0, sizeof(msg));
msg.cmd_type = LTTNG_CONSUMER_SNAPSHOT_CHANNEL;
msg.u.snapshot_channel.key = key;
- msg.u.snapshot_channel.max_size = output->max_size;
+ msg.u.snapshot_channel.max_stream_size = max_stream_size;
msg.u.snapshot_channel.metadata = metadata;
if (output->consumer->type == CONSUMER_DST_NET) {
msg.u.snapshot_channel.relayd_id = output->consumer->net_seq_index;
msg.u.snapshot_channel.use_relayd = 1;
ret = snprintf(msg.u.snapshot_channel.pathname,
- sizeof(msg.u.snapshot_channel.pathname), "%s/%s-%s%s",
- output->consumer->subdir, output->name, datetime,
+ sizeof(msg.u.snapshot_channel.pathname),
+ "%s/%s-%s-%" PRIu64 "%s", output->consumer->subdir,
+ output->name, output->datetime, output->nb_snapshot,
session_path);
if (ret < 0) {
ret = -LTTNG_ERR_NOMEM;
}
} else {
ret = snprintf(msg.u.snapshot_channel.pathname,
- sizeof(msg.u.snapshot_channel.pathname), "%s/%s-%s%s",
- output->consumer->dst.trace_path, output->name, datetime,
+ sizeof(msg.u.snapshot_channel.pathname),
+ "%s/%s-%s-%" PRIu64 "%s", output->consumer->dst.trace_path,
+ output->name, output->datetime, output->nb_snapshot,
session_path);
if (ret < 0) {
ret = -LTTNG_ERR_NOMEM;
projects / lttng-tools.git / blobdiff