#include <unistd.h>
#include <inttypes.h>
-#include <common/common.h>
-#include <common/defaults.h>
-#include <common/compat/string.h>
+#include <common/common.hpp>
+#include <common/defaults.hpp>
+#include <common/compat/string.hpp>
-#include "consumer.h"
-#include "health-sessiond.h"
-#include "kernel-consumer.h"
-#include "notification-thread-commands.h"
-#include "session.h"
-#include "lttng-sessiond.h"
+#include "consumer.hpp"
+#include "health-sessiond.hpp"
+#include "kernel-consumer.hpp"
+#include "notification-thread-commands.hpp"
+#include "session.hpp"
+#include "lttng-sessiond.hpp"
static char *create_channel_path(struct consumer_output *consumer,
size_t *consumer_path_offset)
channel->key,
ksession->id,
&pathname[consumer_path_offset],
- ksession->uid,
- ksession->gid,
consumer->net_seq_index,
channel->channel->name,
channel->stream_count,
rcu_read_lock();
session = session_find_by_id(ksession->id);
LTTNG_ASSERT(session);
- LTTNG_ASSERT(pthread_mutex_trylock(&session->lock));
- LTTNG_ASSERT(session_trylock_list());
+ ASSERT_LOCKED(session->lock);
+ ASSERT_SESSION_LIST_LOCKED();
status = notification_thread_command_add_channel(
the_notification_thread_handle, session->name,
ksession->metadata->key,
ksession->id,
"",
- ksession->uid,
- ksession->gid,
consumer->net_seq_index,
ksession->metadata->conf->name,
1,
int kernel_consumer_add_stream(struct consumer_socket *sock,
struct ltt_kernel_channel *channel,
struct ltt_kernel_stream *stream,
- struct ltt_kernel_session *session, unsigned int monitor)
+ struct ltt_kernel_session *session)
{
int ret;
struct lttcomm_consumer_msg lkm;
/* Add stream on the kernel consumer side. */
ret = kernel_consumer_add_stream(sock, channel, stream,
- ksession, monitor);
+ ksession);
if (ret < 0) {
goto error;
}