*/
#define _GNU_SOURCE
+#define _LGPL_SOURCE
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
}
} else {
/* Empty path. */
- pathname = "";
+ pathname = strdup("");
}
/* Prep channel message structure */
health_code_update();
error:
+ free(pathname);
return ret;
}
}
} else {
/* Empty path. */
- pathname = "";
+ pathname = strdup("");
}
/* Prep channel message structure */
health_code_update();
error:
+ free(pathname);
return ret;
}
{
int ret;
struct ltt_kernel_stream *stream;
- uint64_t channel_key = -1ULL;
/* Safety net */
assert(channel);
if (ret < 0) {
goto error;
}
- if (channel_key == -1ULL) {
- channel_key = channel->fd;
- }
}
- if (!monitor || channel_key == -1ULL) {
- goto end;
- }
-
- /* Add stream on the kernel consumer side. */
- ret = kernel_consumer_streams_sent(sock, session, channel_key);
- if (ret < 0) {
- goto error;
- }
-
-end:
error:
return ret;
}
DBG("Sending session stream to kernel consumer");
- if (session->metadata_stream_fd >= 0) {
+ if (session->metadata_stream_fd >= 0 && session->metadata) {
ret = kernel_consumer_add_metadata(sock, session, monitor);
if (ret < 0) {
goto error;
}
-
- /* Flag that at least the metadata has been sent to the consumer. */
- session->consumer_fds_sent = 1;
}
/* Send channel and streams of it */
if (ret < 0) {
goto error;
}
+ if (monitor) {
+ /*
+ * Inform the relay that all the streams for the
+ * channel were sent.
+ */
+ ret = kernel_consumer_streams_sent(sock, session, chan->fd);
+ if (ret < 0) {
+ goto error;
+ }
+ }
}
DBG("Kernel consumer FDs of metadata and channel streams sent");
+ session->consumer_fds_sent = 1;
return 0;
error:
DBG("Sending kernel consumer destroy channel key %d", channel->fd);
+ memset(&msg, 0, sizeof(msg));
msg.cmd_type = LTTNG_CONSUMER_DESTROY_CHANNEL;
msg.u.destroy_channel.key = channel->fd;
DBG("Sending kernel consumer destroy channel key %d", metadata->fd);
+ memset(&msg, 0, sizeof(msg));
msg.cmd_type = LTTNG_CONSUMER_DESTROY_CHANNEL;
msg.u.destroy_channel.key = metadata->fd;