#include <urcu.h>
#include <lttng/lttng.h>
-#include <bin/lttng-sessiond/lttng-ust-abi.h>
-#include <common/defaults.h>
-#include <common/compat/errno.h>
-#include <bin/lttng-sessiond/trace-ust.h>
-#include <bin/lttng-sessiond/ust-app.h>
-#include <bin/lttng-sessiond/notification-thread.h>
+#include <bin/lttng-sessiond/lttng-ust-abi.hpp>
+#include <common/defaults.hpp>
+#include <common/compat/errno.hpp>
+#include <bin/lttng-sessiond/trace-ust.hpp>
+#include <bin/lttng-sessiond/ust-app.hpp>
+#include <bin/lttng-sessiond/notification-thread.hpp>
#include <lttng/ust-sigbus.h>
"Validate UST session");
trace_ust_destroy_session(usess);
+ trace_ust_free_session(usess);
}
static void test_create_ust_channel(void)
static void test_create_ust_event_exclusion(void)
{
+ int copy_ret;
enum lttng_error_code ret;
struct ltt_ust_event *event;
struct lttng_event ev;
ev.loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
/* set up an exclusion set */
- exclusion = (lttng_event_exclusion *) zmalloc(sizeof(*exclusion) +
+ exclusion = zmalloc<lttng_event_exclusion>(sizeof(*exclusion) +
LTTNG_SYMBOL_NAME_LEN * exclusion_count);
ok(exclusion != NULL, "Create UST exclusion");
if (!exclusion) {
ok(ret != LTTNG_OK, "Create UST event with identical exclusion names fails");
- exclusion = (lttng_event_exclusion *) zmalloc(sizeof(*exclusion) +
+ exclusion = zmalloc<lttng_event_exclusion>(sizeof(*exclusion) +
LTTNG_SYMBOL_NAME_LEN * exclusion_count);
ok(exclusion != NULL, "Create UST exclusion");
if (!exclusion) {
goto end;
}
- exclusion_copy = (lttng_event_exclusion *) zmalloc(sizeof(*exclusion) +
+ exclusion_copy = zmalloc<lttng_event_exclusion>(sizeof(*exclusion) +
LTTNG_SYMBOL_NAME_LEN * exclusion_count);
if (!exclusion_copy) {
skip(2, "zmalloc failed");
*/
exclusion->count = exclusion_count;
- strncpy(LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion, 0),
- get_random_string(), LTTNG_SYMBOL_NAME_LEN - 1);
- strncpy(LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion, 1),
- get_random_string(), LTTNG_SYMBOL_NAME_LEN - 1);
+ copy_ret = lttng_strncpy(LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion, 0),
+ get_random_string(),
+ sizeof(LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion, 0)));
+ LTTNG_ASSERT(copy_ret == 0);
+ copy_ret = lttng_strncpy(LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion, 1),
+ get_random_string(),
+ sizeof(LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion, 1)));
+ LTTNG_ASSERT(copy_ret == 0);
exclusion_copy->count = exclusion_count;
- strncpy(LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion_copy, 0),
- LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion, 0), LTTNG_SYMBOL_NAME_LEN);
- strncpy(LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion_copy, 1),
- LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion, 1), LTTNG_SYMBOL_NAME_LEN);
+ copy_ret = lttng_strncpy(LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion_copy, 0),
+ LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion, 0),
+ sizeof(LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion_copy, 0)));
+ LTTNG_ASSERT(copy_ret == 0);
+ copy_ret = lttng_strncpy(LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion_copy, 1),
+ LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion, 1),
+ sizeof(LTTNG_EVENT_EXCLUSION_NAME_AT(exclusion_copy, 1)));
+ LTTNG_ASSERT(copy_ret == 0);
ret = trace_ust_create_event(&ev, NULL, NULL, exclusion, false, &event);
exclusion = NULL;
free(uctx);
}
-int main(int argc, char **argv)
+int main(void)
{
plan_tests(NUM_TESTS);