* SOFTWARE.
*/
-#define BT_LOG_TAG "CLOCK-CLASS"
-#include "lib/lib-logging.h"
+#define BT_LOG_TAG "LIB/CLOCK-CLASS"
+#include "lib/logging.h"
#include "lib/assert-pre.h"
-#include "compat/uuid.h"
+#include "common/uuid.h"
#include <babeltrace2/trace-ir/clock-class-const.h>
#include <babeltrace2/trace-ir/clock-class.h>
#include "clock-class.h"
#include <inttypes.h>
#include "lib/object.h"
#include "common/assert.h"
+#include "lib/func-status.h"
+#include "lib/value.h"
-#define BT_ASSERT_PRE_CLOCK_CLASS_HOT(_cc) \
- BT_ASSERT_PRE_HOT((_cc), "Clock class", ": %!+K", (_cc))
+#define BT_ASSERT_PRE_DEV_CLOCK_CLASS_HOT(_cc) \
+ BT_ASSERT_PRE_DEV_HOT((_cc), "Clock class", ": %!+K", (_cc))
static
void destroy_clock_class(struct bt_object *obj)
struct bt_clock_class *clock_class = (void *) obj;
BT_LIB_LOGD("Destroying clock class: %!+K", clock_class);
+ BT_OBJECT_PUT_REF_AND_RESET(clock_class->user_attributes);
if (clock_class->name.str) {
g_string_free(clock_class->name.str, TRUE);
clock_class = g_new0(struct bt_clock_class, 1);
if (!clock_class) {
- BT_LOGE_STR("Failed to allocate one clock class.");
+ BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate one clock class.");
goto error;
}
bt_object_init_shared(&clock_class->base, destroy_clock_class);
+
+ clock_class->user_attributes = bt_value_map_create();
+ if (!clock_class->user_attributes) {
+ BT_LIB_LOGE_APPEND_CAUSE(
+ "Failed to create a map value object.");
+ goto error;
+ }
+
clock_class->name.str = g_string_new(NULL);
if (!clock_class->name.str) {
- BT_LOGE_STR("Failed to allocate a GString.");
+ BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate a GString.");
goto error;
}
clock_class->description.str = g_string_new(NULL);
if (!clock_class->description.str) {
- BT_LOGE_STR("Failed to allocate a GString.");
+ BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate a GString.");
goto error;
}
free_clock_snapshot,
clock_class);
if (ret) {
- BT_LOGE("Failed to initialize clock snapshot pool: ret=%d",
+ BT_LIB_LOGE_APPEND_CAUSE(
+ "Failed to initialize clock snapshot pool: ret=%d",
ret);
goto error;
}
const char *bt_clock_class_get_name(const struct bt_clock_class *clock_class)
{
- BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class");
+ BT_ASSERT_PRE_DEV_NON_NULL(clock_class, "Clock class");
return clock_class->name.value;
}
-enum bt_clock_class_status bt_clock_class_set_name(
+enum bt_clock_class_set_name_status bt_clock_class_set_name(
struct bt_clock_class *clock_class, const char *name)
{
BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class");
BT_ASSERT_PRE_NON_NULL(name, "Name");
- BT_ASSERT_PRE_CLOCK_CLASS_HOT(clock_class);
+ BT_ASSERT_PRE_DEV_CLOCK_CLASS_HOT(clock_class);
g_string_assign(clock_class->name.str, name);
clock_class->name.value = clock_class->name.str->str;
BT_LIB_LOGD("Set clock class's name: %!+K", clock_class);
- return BT_CLOCK_CLASS_STATUS_OK;
+ return BT_FUNC_STATUS_OK;
}
const char *bt_clock_class_get_description(
const struct bt_clock_class *clock_class)
{
- BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class");
+ BT_ASSERT_PRE_DEV_NON_NULL(clock_class, "Clock class");
return clock_class->description.value;
}
-enum bt_clock_class_status bt_clock_class_set_description(
+enum bt_clock_class_set_description_status bt_clock_class_set_description(
struct bt_clock_class *clock_class, const char *descr)
{
BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class");
BT_ASSERT_PRE_NON_NULL(descr, "Description");
- BT_ASSERT_PRE_CLOCK_CLASS_HOT(clock_class);
+ BT_ASSERT_PRE_DEV_CLOCK_CLASS_HOT(clock_class);
g_string_assign(clock_class->description.str, descr);
clock_class->description.value = clock_class->description.str->str;
BT_LIB_LOGD("Set clock class's description: %!+K",
clock_class);
- return BT_CLOCK_CLASS_STATUS_OK;
+ return BT_FUNC_STATUS_OK;
}
uint64_t bt_clock_class_get_frequency(const struct bt_clock_class *clock_class)
{
- BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class");
+ BT_ASSERT_PRE_DEV_NON_NULL(clock_class, "Clock class");
return clock_class->frequency;
}
uint64_t frequency)
{
BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class");
- BT_ASSERT_PRE_CLOCK_CLASS_HOT(clock_class);
+ BT_ASSERT_PRE_DEV_CLOCK_CLASS_HOT(clock_class);
BT_ASSERT_PRE(frequency != UINT64_C(-1) && frequency != 0,
"Invalid frequency: %![cc-]+K, new-freq=%" PRIu64,
clock_class, frequency);
uint64_t bt_clock_class_get_precision(const struct bt_clock_class *clock_class)
{
- BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class");
+ BT_ASSERT_PRE_DEV_NON_NULL(clock_class, "Clock class");
return clock_class->precision;
}
uint64_t precision)
{
BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class");
- BT_ASSERT_PRE_CLOCK_CLASS_HOT(clock_class);
+ BT_ASSERT_PRE_DEV_CLOCK_CLASS_HOT(clock_class);
BT_ASSERT_PRE(precision != UINT64_C(-1),
"Invalid precision: %![cc-]+K, new-precision=%" PRIu64,
clock_class, precision);
void bt_clock_class_get_offset(const struct bt_clock_class *clock_class,
int64_t *seconds, uint64_t *cycles)
{
- BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class");
- BT_ASSERT_PRE_NON_NULL(seconds, "Seconds (output)");
- BT_ASSERT_PRE_NON_NULL(cycles, "Cycles (output)");
+ BT_ASSERT_PRE_DEV_NON_NULL(clock_class, "Clock class");
+ BT_ASSERT_PRE_DEV_NON_NULL(seconds, "Seconds (output)");
+ BT_ASSERT_PRE_DEV_NON_NULL(cycles, "Cycles (output)");
*seconds = clock_class->offset_seconds;
*cycles = clock_class->offset_cycles;
}
int64_t seconds, uint64_t cycles)
{
BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class");
- BT_ASSERT_PRE_CLOCK_CLASS_HOT(clock_class);
+ BT_ASSERT_PRE_DEV_CLOCK_CLASS_HOT(clock_class);
BT_ASSERT_PRE(cycles < clock_class->frequency,
"Offset (cycles) is greater than clock class's frequency: "
"%![cc-]+K, new-offset-cycles=%" PRIu64, clock_class, cycles);
bt_bool bt_clock_class_origin_is_unix_epoch(const struct bt_clock_class *clock_class)
{
- BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class");
+ BT_ASSERT_PRE_DEV_NON_NULL(clock_class, "Clock class");
return (bool) clock_class->origin_is_unix_epoch;
}
bt_bool origin_is_unix_epoch)
{
BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class");
- BT_ASSERT_PRE_CLOCK_CLASS_HOT(clock_class);
+ BT_ASSERT_PRE_DEV_CLOCK_CLASS_HOT(clock_class);
clock_class->origin_is_unix_epoch = (bool) origin_is_unix_epoch;
BT_LIB_LOGD("Set clock class's origin is Unix epoch property: %!+K",
clock_class);
bt_uuid bt_clock_class_get_uuid(const struct bt_clock_class *clock_class)
{
- BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class");
+ BT_ASSERT_PRE_DEV_NON_NULL(clock_class, "Clock class");
return clock_class->uuid.value;
}
{
BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class");
BT_ASSERT_PRE_NON_NULL(uuid, "UUID");
- BT_ASSERT_PRE_CLOCK_CLASS_HOT(clock_class);
- memcpy(clock_class->uuid.uuid, uuid, BABELTRACE_UUID_LEN);
+ BT_ASSERT_PRE_DEV_CLOCK_CLASS_HOT(clock_class);
+ bt_uuid_copy(clock_class->uuid.uuid, uuid);
clock_class->uuid.value = clock_class->uuid.uuid;
BT_LIB_LOGD("Set clock class's UUID: %!+K", clock_class);
}
return;
}
+ BT_LIB_LOGD("Freezing clock class's user attributes: %!+v",
+ clock_class->user_attributes);
+ bt_value_freeze(clock_class->user_attributes);
BT_LIB_LOGD("Freezing clock class: %!+K", clock_class);
((struct bt_clock_class *) clock_class)->frozen = 1;
}
-enum bt_clock_class_status bt_clock_class_cycles_to_ns_from_origin(
+enum bt_clock_class_cycles_to_ns_from_origin_status
+bt_clock_class_cycles_to_ns_from_origin(
const struct bt_clock_class *clock_class,
uint64_t cycles, int64_t *ns)
{
int ret;
- BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class");
- BT_ASSERT_PRE_NON_NULL(ns, "Nanoseconds (output)");
+ BT_ASSERT_PRE_DEV_NON_NULL(clock_class, "Clock class");
+ BT_ASSERT_PRE_DEV_NON_NULL(ns, "Nanoseconds (output)");
ret = bt_util_ns_from_origin_clock_class(clock_class, cycles, ns);
if (ret) {
- ret = BT_CLOCK_CLASS_STATUS_OVERFLOW;
- BT_LIB_LOGD("Cannot convert cycles to nanoseconds "
+ BT_LIB_LOGE_APPEND_CAUSE("Cannot convert cycles to nanoseconds "
"from origin for given clock class: "
"value overflows the signed 64-bit integer range: "
"%![cc-]+K, cycles=%" PRIu64,
clock_class, cycles);
+ ret = BT_FUNC_STATUS_OVERFLOW_ERROR;
}
return ret;
}
+const struct bt_value *bt_clock_class_borrow_user_attributes_const(
+ const struct bt_clock_class *clock_class)
+{
+ BT_ASSERT_PRE_DEV_NON_NULL(clock_class, "Clock class");
+ return clock_class->user_attributes;
+}
+
+struct bt_value *bt_clock_class_borrow_user_attributes(
+ struct bt_clock_class *clock_class)
+{
+ return (void *) bt_clock_class_borrow_user_attributes_const(
+ (void *) clock_class);
+}
+
+void bt_clock_class_set_user_attributes(
+ struct bt_clock_class *clock_class,
+ const struct bt_value *user_attributes)
+{
+ BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class");
+ BT_ASSERT_PRE_NON_NULL(user_attributes, "User attributes");
+ BT_ASSERT_PRE(user_attributes->type == BT_VALUE_TYPE_MAP,
+ "User attributes object is not a map value object.");
+ BT_ASSERT_PRE_DEV_CLOCK_CLASS_HOT(clock_class);
+ bt_object_put_no_null_check(clock_class->user_attributes);
+ clock_class->user_attributes = (void *) user_attributes;
+ bt_object_get_no_null_check(clock_class->user_attributes);
+}
+
void bt_clock_class_get_ref(const struct bt_clock_class *clock_class)
{
bt_object_get_ref(clock_class);