}
DBG3("Kernel local consumer tracefile path: %s", pathname);
} else {
- ret = snprintf(tmp_path, sizeof(tmp_path), "%s", consumer->subdir);
+ ret = snprintf(tmp_path, sizeof(tmp_path), "%s%s",
+ consumer->dst.net.base_dir,
+ consumer->subdir);
if (ret < 0) {
PERROR("snprintf kernel metadata path");
goto error;
/* Prep channel message structure */
consumer_init_channel_comm_msg(&lkm,
LTTNG_CONSUMER_ADD_CHANNEL,
- session->metadata->fd,
+ session->metadata->key,
session->id,
pathname,
session->uid,
/* Prep stream message structure */
consumer_init_stream_comm_msg(&lkm,
LTTNG_CONSUMER_ADD_STREAM,
- session->metadata->fd,
+ session->metadata->key,
session->metadata_stream_fd,
0); /* CPU: 0 for metadata. */
assert(metadata);
assert(socket);
- DBG("Sending kernel consumer destroy channel key %d", metadata->fd);
+ DBG("Sending kernel consumer destroy channel key %" PRIu64, metadata->key);
memset(&msg, 0, sizeof(msg));
msg.cmd_type = LTTNG_CONSUMER_DESTROY_CHANNEL;
- msg.u.destroy_channel.key = metadata->fd;
+ msg.u.destroy_channel.key = metadata->key;
pthread_mutex_lock(socket->lock);
health_code_update();