X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Ftrace-ir%2Fclock-class.c;h=d2c7ab54be3cf944efef9265362101edafbb9ca4;hb=d5b13b9b6a434797f856547be1ca6a59f70ba530;hp=8d1002474ed00c232dcf63521e0cd500d1b380ae;hpb=0a83319b57c7f5d1f37a8c1af9a39daf6d503122;p=babeltrace.git

diff --git a/src/lib/trace-ir/clock-class.c b/src/lib/trace-ir/clock-class.c
index 8d100247..d2c7ab54 100644
--- a/src/lib/trace-ir/clock-class.c
+++ b/src/lib/trace-ir/clock-class.c
@@ -24,7 +24,7 @@
 #include "lib/func-status.h"
 #include "lib/value.h"
 
-#define BT_ASSERT_PRE_DEV_CLOCK_CLASS_HOT(_cc) \
+#define BT_ASSERT_PRE_DEV_CLOCK_CLASS_HOT(_cc)				\
 	BT_ASSERT_PRE_DEV_HOT((_cc), "Clock class", ": %!+K", (_cc))
 
 static
@@ -72,7 +72,7 @@ struct bt_clock_class *bt_clock_class_create(bt_self_component *self_comp)
 	struct bt_clock_class *clock_class = NULL;
 
 	BT_ASSERT_PRE_NO_ERROR();
-	BT_ASSERT_PRE_NON_NULL(self_comp, "Self component");
+	BT_ASSERT_PRE_COMP_NON_NULL(self_comp);
 	BT_LOGD_STR("Creating default clock class object");
 
 	clock_class = g_new0(struct bt_clock_class, 1);
@@ -129,7 +129,7 @@ end:
 
 const char *bt_clock_class_get_name(const struct bt_clock_class *clock_class)
 {
-	BT_ASSERT_PRE_DEV_NON_NULL(clock_class, "Clock class");
+	BT_ASSERT_PRE_DEV_CLK_CLS_NON_NULL(clock_class);
 	return clock_class->name.value;
 }
 
@@ -137,8 +137,8 @@ enum bt_clock_class_set_name_status bt_clock_class_set_name(
 		struct bt_clock_class *clock_class, const char *name)
 {
 	BT_ASSERT_PRE_NO_ERROR();
-	BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class");
-	BT_ASSERT_PRE_NON_NULL(name, "Name");
+	BT_ASSERT_PRE_CLK_CLS_NON_NULL(clock_class);
+	BT_ASSERT_PRE_NAME_NON_NULL(name);
 	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;
@@ -149,7 +149,7 @@ enum bt_clock_class_set_name_status bt_clock_class_set_name(
 const char *bt_clock_class_get_description(
 		const struct bt_clock_class *clock_class)
 {
-	BT_ASSERT_PRE_DEV_NON_NULL(clock_class, "Clock class");
+	BT_ASSERT_PRE_DEV_CLK_CLS_NON_NULL(clock_class);
 	return clock_class->description.value;
 }
 
@@ -157,8 +157,8 @@ enum bt_clock_class_set_description_status bt_clock_class_set_description(
 		struct bt_clock_class *clock_class, const char *descr)
 {
 	BT_ASSERT_PRE_NO_ERROR();
-	BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class");
-	BT_ASSERT_PRE_NON_NULL(descr, "Description");
+	BT_ASSERT_PRE_CLK_CLS_NON_NULL(clock_class);
+	BT_ASSERT_PRE_DESCR_NON_NULL(descr);
 	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;
@@ -169,14 +169,14 @@ enum bt_clock_class_set_description_status bt_clock_class_set_description(
 
 uint64_t bt_clock_class_get_frequency(const struct bt_clock_class *clock_class)
 {
-	BT_ASSERT_PRE_DEV_NON_NULL(clock_class, "Clock class");
+	BT_ASSERT_PRE_DEV_CLK_CLS_NON_NULL(clock_class);
 	return clock_class->frequency;
 }
 
 void bt_clock_class_set_frequency(struct bt_clock_class *clock_class,
 		uint64_t frequency)
 {
-	BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class");
+	BT_ASSERT_PRE_CLK_CLS_NON_NULL(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,
@@ -191,14 +191,14 @@ void bt_clock_class_set_frequency(struct bt_clock_class *clock_class,
 
 uint64_t bt_clock_class_get_precision(const struct bt_clock_class *clock_class)
 {
-	BT_ASSERT_PRE_DEV_NON_NULL(clock_class, "Clock class");
+	BT_ASSERT_PRE_DEV_CLK_CLS_NON_NULL(clock_class);
 	return clock_class->precision;
 }
 
 void bt_clock_class_set_precision(struct bt_clock_class *clock_class,
 		uint64_t precision)
 {
-	BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class");
+	BT_ASSERT_PRE_CLK_CLS_NON_NULL(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,
@@ -210,7 +210,7 @@ void bt_clock_class_set_precision(struct bt_clock_class *clock_class,
 void bt_clock_class_get_offset(const struct bt_clock_class *clock_class,
 		int64_t *seconds, uint64_t *cycles)
 {
-	BT_ASSERT_PRE_DEV_NON_NULL(clock_class, "Clock class");
+	BT_ASSERT_PRE_DEV_CLK_CLS_NON_NULL(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;
@@ -220,7 +220,7 @@ void bt_clock_class_get_offset(const struct bt_clock_class *clock_class,
 void bt_clock_class_set_offset(struct bt_clock_class *clock_class,
 		int64_t seconds, uint64_t cycles)
 {
-	BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class");
+	BT_ASSERT_PRE_CLK_CLS_NON_NULL(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: "
@@ -233,14 +233,14 @@ void bt_clock_class_set_offset(struct bt_clock_class *clock_class,
 
 bt_bool bt_clock_class_origin_is_unix_epoch(const struct bt_clock_class *clock_class)
 {
-	BT_ASSERT_PRE_DEV_NON_NULL(clock_class, "Clock class");
+	BT_ASSERT_PRE_DEV_CLK_CLS_NON_NULL(clock_class);
 	return (bool) clock_class->origin_is_unix_epoch;
 }
 
 void bt_clock_class_set_origin_is_unix_epoch(struct bt_clock_class *clock_class,
 		bt_bool origin_is_unix_epoch)
 {
-	BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class");
+	BT_ASSERT_PRE_CLK_CLS_NON_NULL(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",
@@ -249,15 +249,15 @@ void bt_clock_class_set_origin_is_unix_epoch(struct bt_clock_class *clock_class,
 
 bt_uuid bt_clock_class_get_uuid(const struct bt_clock_class *clock_class)
 {
-	BT_ASSERT_PRE_DEV_NON_NULL(clock_class, "Clock class");
+	BT_ASSERT_PRE_DEV_CLK_CLS_NON_NULL(clock_class);
 	return clock_class->uuid.value;
 }
 
 void bt_clock_class_set_uuid(struct bt_clock_class *clock_class,
 		bt_uuid uuid)
 {
-	BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class");
-	BT_ASSERT_PRE_NON_NULL(uuid, "UUID");
+	BT_ASSERT_PRE_CLK_CLS_NON_NULL(clock_class);
+	BT_ASSERT_PRE_UUID_NON_NULL(uuid);
 	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;
@@ -288,7 +288,7 @@ bt_clock_class_cycles_to_ns_from_origin(
 	int ret;
 
 	BT_ASSERT_PRE_DEV_NO_ERROR();
-	BT_ASSERT_PRE_DEV_NON_NULL(clock_class, "Clock class");
+	BT_ASSERT_PRE_DEV_CLK_CLS_NON_NULL(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) {
@@ -306,7 +306,7 @@ bt_clock_class_cycles_to_ns_from_origin(
 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");
+	BT_ASSERT_PRE_DEV_CLK_CLS_NON_NULL(clock_class);
 	return clock_class->user_attributes;
 }
 
@@ -321,10 +321,9 @@ 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_CLK_CLS_NON_NULL(clock_class);
+	BT_ASSERT_PRE_USER_ATTRS_NON_NULL(user_attributes);
+	BT_ASSERT_PRE_USER_ATTRS_IS_MAP(user_attributes);
 	BT_ASSERT_PRE_DEV_CLOCK_CLASS_HOT(clock_class);
 	bt_object_put_ref_no_null_check(clock_class->user_attributes);
 	clock_class->user_attributes = (void *) user_attributes;