*/
#define _LGPL_SOURCE
-#include <common/common.h>
-#include <common/compat/path.h>
-#include <common/fd-tracker/utils.h>
-#include <common/time.h>
-#include <common/utils.h>
-#include <common/uuid.h>
+#include <common/common.hpp>
+#include <common/compat/path.hpp>
+#include <common/fd-tracker/utils.hpp>
+#include <common/time.hpp>
+#include <common/utils.hpp>
+#include <common/uuid.hpp>
#include <urcu/rculist.h>
#include <sys/stat.h>
-#include "ctf-trace.h"
-#include "lttng-relayd.h"
-#include "session.h"
-#include "sessiond-trace-chunks.h"
-#include "stream.h"
-#include <common/defaults.h>
-#include "utils.h"
+#include "ctf-trace.hpp"
+#include "lttng-relayd.hpp"
+#include "session.hpp"
+#include "sessiond-trace-chunks.hpp"
+#include "stream.hpp"
+#include <common/defaults.hpp>
+#include "utils.hpp"
/* Global session id used in the session creation. */
static uint64_t last_relay_session_id;
const char *hostname, const char *base_path,
uint32_t live_timer,
bool snapshot,
- const lttng_uuid sessiond_uuid,
+ const lttng_uuid& sessiond_uuid,
const uint64_t *id_sessiond,
const uint64_t *current_chunk_id,
const time_t *creation_time,
goto error;
}
- session = (relay_session *) zmalloc(sizeof(*session));
+ session = zmalloc<relay_session>();
if (!session) {
PERROR("Failed to allocate session");
goto error;
session->live_timer = live_timer;
session->snapshot = snapshot;
- lttng_uuid_copy(session->sessiond_uuid, sessiond_uuid);
+ session->sessiond_uuid = sessiond_uuid;
if (id_sessiond) {
LTTNG_OPTIONAL_SET(&session->id_sessiond, *id_sessiond);
DBG("Session find by ID %" PRIu64 " id NOT found", id);
goto end;
}
- session = caa_container_of(node, struct relay_session, session_n);
+ session = lttng::utils::container_of(node, &relay_session::session_n);
DBG("Session find by ID %" PRIu64 " id found", id);
if (!session_get(session)) {
session = NULL;
goto next_session;
}
- if (!lttng_uuid_is_equal(session->sessiond_uuid,
- iterated_session->sessiond_uuid)) {
+ if (session->sessiond_uuid != iterated_session->sessiond_uuid) {
/* Sessions do not originate from the same sessiond. */
goto next_session;
}
static void session_release(struct urcu_ref *ref)
{
struct relay_session *session =
- caa_container_of(ref, struct relay_session, ref);
+ lttng::utils::container_of(ref, &relay_session::ref);
destroy_session(session);
}