&iter);
node = lttng_ht_iter_get_node_ulong(&iter);
if (node != NULL) {
- socket = caa_container_of(node, struct consumer_socket, node);
+ socket = lttng::utils::container_of(node, &consumer_socket::node);
}
return socket;
static void destroy_socket_rcu(struct rcu_head *head)
{
struct lttng_ht_node_ulong *node =
- caa_container_of(head, struct lttng_ht_node_ulong, head);
+ lttng::utils::container_of(head, <tng_ht_node_ulong::head);
struct consumer_socket *socket =
- caa_container_of(node, struct consumer_socket, node);
+ lttng::utils::container_of(node, &consumer_socket::node);
free(socket);
}
static void consumer_release_output(struct urcu_ref *ref)
{
struct consumer_output *obj =
- caa_container_of(ref, struct consumer_output, ref);
+ lttng::utils::container_of(ref, &consumer_output::ref);
consumer_destroy_output_sockets(obj);
const char *name,
uint64_t relayd_id,
uint64_t key,
- unsigned char *uuid,
+ const lttng_uuid& uuid,
uint32_t chan_id,
uint64_t tracefile_size,
uint64_t tracefile_count,
msg->u.ask_channel.ust_app_uid = ust_app_uid;
msg->u.ask_channel.blocking_timeout = blocking_timeout;
- memcpy(msg->u.ask_channel.uuid, uuid, sizeof(msg->u.ask_channel.uuid));
+ std::copy(uuid.begin(), uuid.end(), msg->u.ask_channel.uuid);
if (pathname) {
strncpy(msg->u.ask_channel.pathname, pathname,
}
int consumer_init(struct consumer_socket *socket,
- const lttng_uuid sessiond_uuid)
+ const lttng_uuid& sessiond_uuid)
{
int ret;
struct lttcomm_consumer_msg msg = {
LTTNG_ASSERT(socket);
DBG("Sending consumer initialization command");
- lttng_uuid_copy(msg.u.init.sessiond_uuid, sessiond_uuid);
+ std::copy(sessiond_uuid.begin(), sessiond_uuid.end(), msg.u.init.sessiond_uuid);
health_code_update();
ret = consumer_send_msg(socket, &msg);