* SPDX-License-Identifier: LGPL-2.1-only
*/
-#include <lttng/session-descriptor-internal.h>
-#include <common/macros.h>
-#include <common/uri.h>
-#include <common/defaults.h>
-#include <common/error.h>
+#include <lttng/session-descriptor-internal.hpp>
+#include <common/macros.hpp>
+#include <common/uri.hpp>
+#include <common/defaults.hpp>
+#include <common/error.hpp>
#include <time.h>
#include <stdio.h>
+namespace {
struct lttng_session_descriptor_network_location {
struct lttng_uri *control;
struct lttng_uri *data;
};
+} /* namespace */
struct lttng_session_descriptor {
enum lttng_session_descriptor_type type;
} output;
};
+namespace {
struct lttng_session_descriptor_snapshot {
struct lttng_session_descriptor base;
/*
/* Live-specific parameters. */
uint64_t live_timer_us;
} LTTNG_PACKED;
+} /* namespace */
static
struct lttng_uri *uri_copy(const struct lttng_uri *uri)
goto end;
}
- new_uri = (lttng_uri *) zmalloc(sizeof(*new_uri));
+ new_uri = zmalloc<lttng_uri>();
if (!new_uri) {
goto end;
}
* session descriptors expect individually allocated lttng_uris.
*/
if (uri_count == 2) {
- control_uri = (lttng_uri *) zmalloc(sizeof(*control_uri));
- data_uri = (lttng_uri *) zmalloc(sizeof(*data_uri));
+ control_uri = zmalloc<lttng_uri>();
+ data_uri = zmalloc<lttng_uri>();
if (!control_uri || !data_uri) {
ret = -1;
goto end;
{
struct lttng_session_descriptor *descriptor;
- descriptor = (lttng_session_descriptor *) zmalloc(sizeof(*descriptor));
+ descriptor = zmalloc<lttng_session_descriptor>();
if (!descriptor) {
goto error;
}
{
struct lttng_session_descriptor_snapshot *descriptor;
- descriptor = (lttng_session_descriptor_snapshot *) zmalloc(sizeof(*descriptor));
+ descriptor = zmalloc<lttng_session_descriptor_snapshot>();
if (!descriptor) {
goto error;
}
if (live_timer_interval_us == 0) {
goto error;
}
- descriptor = (lttng_session_descriptor_live *) zmalloc(sizeof(*descriptor));
+ descriptor = zmalloc<lttng_session_descriptor_live>();
if (!descriptor) {
goto error;
}
}
uri = (typeof(uri)) current_view.data;
- uris[i] = (lttng_uri *) zmalloc(sizeof(*uri));
+ uris[i] = zmalloc<lttng_uri>();
if (!uris[i]) {
ret = -1;
goto end;
header.base.uri_count = uri_count;
if (descriptor->type == LTTNG_SESSION_DESCRIPTOR_TYPE_LIVE) {
- const struct lttng_session_descriptor_live *live =
- container_of(descriptor, typeof(*live),
- base);
+ const struct lttng_session_descriptor_live *live = lttng::utils::container_of(
+ descriptor, <tng_session_descriptor_live::base);
header.live_timer_us = live->live_timer_us;
header_ptr = &header;
{
struct lttng_session_descriptor_live *live;
- live = container_of(descriptor, typeof(*live), base);
+ live = lttng::utils::container_of(descriptor, <tng_session_descriptor_live::base);
return live->live_timer_us;
}