* Allocate the string ourself to make sure we never exceed
* LTTNG_PATH_MAX.
*/
- pathname = (char *) zmalloc(LTTNG_PATH_MAX);
+ pathname = calloc<char>(LTTNG_PATH_MAX);
if (!pathname) {
goto error;
}
LTTNG_ASSERT(fd);
- socket = (consumer_socket *) zmalloc(sizeof(struct consumer_socket));
+ socket = zmalloc<consumer_socket>();
if (socket == NULL) {
PERROR("zmalloc consumer socket");
goto error;
{
struct consumer_output *output = NULL;
- output = (consumer_output *) zmalloc(sizeof(struct consumer_output));
+ output = zmalloc<consumer_output>();
if (output == NULL) {
PERROR("zmalloc consumer_output");
goto error;
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);