While the public clock constructor still generates a UUID,
it should not be done when creating a clock during TSDL metadata
parsing.
This makes it possible to use bt_ctf_clock_get_uuid to check
if a UUID has already been set during clock definition parsing.
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
-#include <babeltrace/ctf-writer/clock.h>
#include <babeltrace/ctf-ir/clock-internal.h>
#include <babeltrace/ctf-writer/writer-internal.h>
#include <babeltrace/compiler.h>
#include <babeltrace/ctf-ir/clock-internal.h>
#include <babeltrace/ctf-writer/writer-internal.h>
#include <babeltrace/compiler.h>
clock->precision = 1;
clock->frequency = 1000000000;
clock->precision = 1;
clock->frequency = 1000000000;
- uuid_generate(clock->uuid);
bt_ctf_ref_init(&clock->ref_count);
end:
return clock;
bt_ctf_ref_init(&clock->ref_count);
end:
return clock;
+ ret = babeltrace_uuid_generate(clock->uuid);
+ if (ret) {
+ goto error_destroy;
+ }
+
+ clock->uuid_set = 1;
return clock;
error_destroy:
bt_ctf_clock_destroy(&clock->ref_count);
return clock;
error_destroy:
bt_ctf_clock_destroy(&clock->ref_count);
{
const unsigned char *ret;
{
const unsigned char *ret;
+ if (!clock || !clock->uuid_set) {
+ if (!clock || !uuid || clock->frozen) {
ret = -1;
goto end;
}
memcpy(clock->uuid, uuid, sizeof(uuid_t));
ret = -1;
goto end;
}
memcpy(clock->uuid, uuid, sizeof(uuid_t));
#include <babeltrace/ctf-ir/trace-internal.h>
#include <babeltrace/babeltrace-internal.h>
#include <glib.h>
#include <babeltrace/ctf-ir/trace-internal.h>
#include <babeltrace/babeltrace-internal.h>
#include <glib.h>
+#include <babeltrace/compat/uuid.h>
struct bt_ctf_clock {
struct bt_ctf_ref ref_count;
struct bt_ctf_clock {
struct bt_ctf_ref ref_count;
uint64_t offset; /* Offset in ticks */
uint64_t time; /* Current clock value */
uuid_t uuid;
uint64_t offset; /* Offset in ticks */
uint64_t time; /* Current clock value */
uuid_t uuid;
int absolute;
/*
* A clock's properties can't be modified once it is added to a stream
int absolute;
/*
* A clock's properties can't be modified once it is added to a stream