* Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#define _GNU_SOURCE
+#define _LGPL_SOURCE
#include <stdio.h>
#include <stdlib.h>
-#include <string.h>
#include <sys/stat.h>
#include <unistd.h>
#include <common/common.h>
#include <common/defaults.h>
+#include <common/compat/string.h>
#include "consumer.h"
#include "health-sessiond.h"
#include "kernel-consumer.h"
+#include "notification-thread-commands.h"
+#include "session.h"
+#include "lttng-sessiond.h"
static char *create_channel_path(struct consumer_output *consumer,
uid_t uid, gid_t gid)
PERROR("snprintf kernel channel path");
goto error;
}
- pathname = strndup(tmp_path, sizeof(tmp_path));
+ pathname = lttng_strndup(tmp_path, sizeof(tmp_path));
+ if (!pathname) {
+ PERROR("lttng_strndup");
+ goto error;
+ }
/* Create directory */
ret = run_as_mkdir_recursive(pathname, S_IRWXU | S_IRWXG, uid, gid);
if (ret < 0) {
- if (ret != -EEXIST) {
+ if (errno != EEXIST) {
ERR("Trace directory creation error");
goto error;
}
PERROR("snprintf kernel metadata path");
goto error;
}
- pathname = strndup(tmp_path, sizeof(tmp_path));
+ pathname = lttng_strndup(tmp_path, sizeof(tmp_path));
+ if (!pathname) {
+ PERROR("lttng_strndup");
+ goto error;
+ }
DBG3("Kernel network consumer subdir path: %s", pathname);
}
* Sending a single channel to the consumer with command ADD_CHANNEL.
*/
int kernel_consumer_add_channel(struct consumer_socket *sock,
- struct ltt_kernel_channel *channel, struct ltt_kernel_session *session,
+ struct ltt_kernel_channel *channel,
+ struct ltt_kernel_session *ksession,
unsigned int monitor)
{
int ret;
char *pathname;
struct lttcomm_consumer_msg lkm;
struct consumer_output *consumer;
+ enum lttng_error_code status;
+ struct ltt_session *session;
+ struct lttng_channel_extended *channel_attr_extended;
/* Safety net */
assert(channel);
- assert(session);
- assert(session->consumer);
+ assert(ksession);
+ assert(ksession->consumer);
- consumer = session->consumer;
+ consumer = ksession->consumer;
+ channel_attr_extended = (struct lttng_channel_extended *)
+ channel->channel->attr.extended.ptr;
DBG("Kernel consumer adding channel %s to kernel consumer",
channel->channel->name);
if (monitor) {
- pathname = create_channel_path(consumer, session->uid, session->gid);
- if (!pathname) {
- ret = -1;
- goto error;
- }
+ pathname = create_channel_path(consumer, ksession->uid,
+ ksession->gid);
} else {
/* Empty path. */
pathname = strdup("");
}
+ if (!pathname) {
+ ret = -1;
+ goto error;
+ }
/* Prep channel message structure */
consumer_init_channel_comm_msg(&lkm,
LTTNG_CONSUMER_ADD_CHANNEL,
channel->fd,
- session->id,
+ ksession->id,
pathname,
- session->uid,
- session->gid,
+ ksession->uid,
+ ksession->gid,
consumer->net_seq_index,
channel->channel->name,
channel->stream_count,
channel->channel->attr.tracefile_size,
channel->channel->attr.tracefile_count,
monitor,
- channel->channel->attr.live_timer_interval);
+ channel->channel->attr.live_timer_interval,
+ channel_attr_extended->monitor_timer_interval);
health_code_update();
}
health_code_update();
+ rcu_read_lock();
+ session = session_find_by_id(ksession->id);
+ assert(session);
+
+ status = notification_thread_command_add_channel(
+ notification_thread_handle, session->name,
+ ksession->uid, ksession->gid,
+ channel->channel->name, channel->fd,
+ LTTNG_DOMAIN_KERNEL,
+ channel->channel->attr.subbuf_size * channel->channel->attr.num_subbuf);
+ rcu_read_unlock();
+ if (status != LTTNG_OK) {
+ ret = -1;
+ goto error;
+ }
+
+ channel->published_to_notification_thread = true;
error:
free(pathname);
if (monitor) {
pathname = create_channel_path(consumer, session->uid, session->gid);
- if (!pathname) {
- ret = -1;
- goto error;
- }
} else {
/* Empty path. */
pathname = strdup("");
}
+ if (!pathname) {
+ ret = -1;
+ goto error;
+ }
/* Prep channel message structure */
consumer_init_channel_comm_msg(&lkm,
DEFAULT_KERNEL_CHANNEL_OUTPUT,
CONSUMER_CHANNEL_TYPE_METADATA,
0, 0,
- monitor, 0);
+ monitor, 0, 0);
health_code_update();
struct ltt_kernel_channel *channel, struct ltt_kernel_session *session,
unsigned int monitor)
{
- int ret;
+ int ret = LTTNG_OK;
struct ltt_kernel_stream *stream;
/* Safety net */
DBG("Sending streams of channel %s to kernel consumer",
channel->channel->name);
- ret = kernel_consumer_add_channel(sock, channel, session, monitor);
- if (ret < 0) {
- goto error;
+ if (!channel->sent_to_consumer) {
+ ret = kernel_consumer_add_channel(sock, channel, session, monitor);
+ if (ret < 0) {
+ goto error;
+ }
+ channel->sent_to_consumer = true;
}
/* Send streams */
cds_list_for_each_entry(stream, &channel->stream_list.head, list) {
- if (!stream->fd) {
+ if (!stream->fd || stream->sent_to_consumer) {
continue;
}
if (ret < 0) {
goto error;
}
+ stream->sent_to_consumer = true;
}
error:
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;