Always evaluate BT_ASSERT(); add BT_ASSERT_DBG() for debug mode only

[babeltrace.git] / src / lib / trace-ir / clock-snapshot-set.h

diff --git a/src/lib/trace-ir/clock-snapshot-set.h b/src/lib/trace-ir/clock-snapshot-set.h
index 855744b2fae9ea76b2452894643d2b8ee3ee1b43..7c3e7eb2421c0bcb93d37ec1e20839d1d27aeb85 100644 (file)
--- a/src/lib/trace-ir/clock-snapshot-set.h
+++ b/src/lib/trace-ir/clock-snapshot-set.h
@@ -23,6 +23,11 @@
  * SOFTWARE.
  */
 
+/* Protection: this file uses BT_LIB_LOG*() macros directly */
+#ifndef BT_LIB_LOG_SUPPORTED
+# error Please include "lib/logging.h" before including this file.
+#endif
+
 #include <stdint.h>
 #include <glib.h>
 #include "common/assert.h"
@@ -50,7 +55,7 @@ int bt_clock_snapshot_set_initialize(struct bt_clock_snapshot_set *cs_set)
 
        cs_set->clock_snapshots = g_ptr_array_sized_new(1);
        if (!cs_set->clock_snapshots) {
-               BT_LOGE_STR("Failed to allocate one GPtrArray.");
+               BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate one GPtrArray.");
                ret = -1;
                goto end;
        }
@@ -66,13 +71,13 @@ void bt_clock_snapshot_set_reset(struct bt_clock_snapshot_set *cs_set)
 {
        uint64_t i;
 
-       BT_ASSERT(cs_set);
-       BT_ASSERT(cs_set->clock_snapshots);
+       BT_ASSERT_DBG(cs_set);
+       BT_ASSERT_DBG(cs_set->clock_snapshots);
 
        for (i = 0; i < cs_set->clock_snapshots->len; i++) {
                struct bt_clock_snapshot *cs = cs_set->clock_snapshots->pdata[i];
 
-               BT_ASSERT(cs);
+               BT_ASSERT_DBG(cs);
                bt_clock_snapshot_reset(cs);
        }
 
@@ -109,8 +114,8 @@ int bt_clock_snapshot_set_set_clock_snapshot(struct bt_clock_snapshot_set *cs_se
        struct bt_clock_snapshot *clock_snapshot = NULL;
        uint64_t i;
 
-       BT_ASSERT(cs_set);
-       BT_ASSERT(cc);
+       BT_ASSERT_DBG(cs_set);
+       BT_ASSERT_DBG(cc);
 
        /*
         * Check if we already have a value for this clock class.
@@ -121,7 +126,7 @@ int bt_clock_snapshot_set_set_clock_snapshot(struct bt_clock_snapshot_set *cs_se
        for (i = 0; i < cs_set->clock_snapshots->len; i++) {
                struct bt_clock_snapshot *cs = cs_set->clock_snapshots->pdata[i];
 
-               BT_ASSERT(cs);
+               BT_ASSERT_DBG(cs);
 
                if (cs->clock_class == cc) {
                        clock_snapshot = cs;
@@ -132,7 +137,8 @@ int bt_clock_snapshot_set_set_clock_snapshot(struct bt_clock_snapshot_set *cs_se
        if (!clock_snapshot) {
                clock_snapshot = bt_clock_snapshot_create(cc);
                if (!clock_snapshot) {
-                       BT_LIB_LOGE("Cannot create a clock snapshot from a clock class: "
+                       BT_LIB_LOGE_APPEND_CAUSE(
+                               "Cannot create a clock snapshot from a clock class: "
                                "%![cc-]+K", cc);
                        ret = -1;
                        goto end;
@@ -151,8 +157,8 @@ static inline
 void  bt_clock_snapshot_set_set_default_clock_snapshot(
                struct bt_clock_snapshot_set *cs_set, uint64_t raw_value)
 {
-       BT_ASSERT(cs_set);
-       BT_ASSERT(cs_set->default_cs);
+       BT_ASSERT_DBG(cs_set);
+       BT_ASSERT_DBG(cs_set->default_cs);
        bt_clock_snapshot_set_raw_value(cs_set->default_cs, raw_value);
 }