/*
- * Copyright 2019 Philippe Proulx <pproulx@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
+ * SPDX-License-Identifier: MIT
*
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * Copyright 2019 Philippe Proulx <pproulx@efficios.com>
*/
#define BT_LOG_TAG "LIB/INT-RANGE-SET"
#include <babeltrace2/babeltrace.h>
-#include "lib/assert-pre.h"
+#include "lib/assert-cond.h"
#include "common/assert.h"
#include "func-status.h"
#include "integer-range-set.h"
{
const struct bt_integer_range *range = (const void *) u_range;
- BT_ASSERT_PRE_DEV_NON_NULL(range, "Integer range");
+ BT_ASSERT_PRE_DEV_INT_RANGE_NON_NULL(range);
return range->lower.u;
}
{
const struct bt_integer_range *range = (const void *) u_range;
- BT_ASSERT_PRE_DEV_NON_NULL(range, "Integer range");
+ BT_ASSERT_PRE_DEV_INT_RANGE_NON_NULL(range);
return range->upper.u;
}
{
const struct bt_integer_range *range = (const void *) i_range;
- BT_ASSERT_PRE_DEV_NON_NULL(range, "Integer range");
+ BT_ASSERT_PRE_DEV_INT_RANGE_NON_NULL(range);
return range->lower.i;
}
{
const struct bt_integer_range *range = (const void *) i_range;
- BT_ASSERT_PRE_DEV_NON_NULL(range, "Integer range");
+ BT_ASSERT_PRE_DEV_INT_RANGE_NON_NULL(range);
return range->upper.i;
}
const struct bt_integer_range_unsigned *range_a,
const struct bt_integer_range_unsigned *range_b)
{
- BT_ASSERT_PRE_DEV_NON_NULL(range_a, "Integer range A");
- BT_ASSERT_PRE_DEV_NON_NULL(range_b, "Integer range B");
+ BT_ASSERT_PRE_DEV_NON_NULL("integer-range-a", range_a,
+ "Integer range A");
+ BT_ASSERT_PRE_DEV_NON_NULL("integer-range-b", range_b,
+ "Integer range B");
return (bt_bool) compare_ranges((const void *) range_a,
(const void *) range_b);
}
const struct bt_integer_range_signed *range_a,
const struct bt_integer_range_signed *range_b)
{
- BT_ASSERT_PRE_DEV_NON_NULL(range_a, "Integer range A");
- BT_ASSERT_PRE_DEV_NON_NULL(range_b, "Integer range B");
+ BT_ASSERT_PRE_DEV_NON_NULL("integer-range-a", range_a,
+ "Integer range A");
+ BT_ASSERT_PRE_DEV_NON_NULL("integer-range-b", range_b,
+ "Integer range B");
return (bt_bool) compare_ranges((const void *) range_a,
(const void *) range_b);
}
uint64_t bt_integer_range_set_get_range_count(
const bt_integer_range_set *range_set)
{
- BT_ASSERT_PRE_DEV_NON_NULL(range_set, "Integer range set");
+ BT_ASSERT_PRE_DEV_INT_RANGE_SET_NON_NULL(range_set);
return (uint64_t) range_set->ranges->len;
}
const struct bt_integer_range_set *range_set =
(const void *) u_range_set;
- BT_ASSERT_PRE_DEV_NON_NULL(range_set, "Integer range set");
+ BT_ASSERT_PRE_DEV_INT_RANGE_SET_NON_NULL(range_set);
BT_ASSERT_PRE_DEV_VALID_INDEX(index, range_set->ranges->len);
return (const void *) BT_INTEGER_RANGE_SET_RANGE_AT_INDEX(range_set,
index);
const struct bt_integer_range_set *range_set =
(const void *) i_range_set;
- BT_ASSERT_PRE_DEV_NON_NULL(range_set, "Integer range set");
+ BT_ASSERT_PRE_DEV_INT_RANGE_SET_NON_NULL(range_set);
BT_ASSERT_PRE_DEV_VALID_INDEX(index, range_set->ranges->len);
return (const void *) BT_INTEGER_RANGE_SET_RANGE_AT_INDEX(range_set,
index);
struct bt_integer_range_set_unsigned *bt_integer_range_set_unsigned_create(void)
{
+ BT_ASSERT_PRE_NO_ERROR();
+
return (void *) create_range_set();
}
struct bt_integer_range_set_signed *bt_integer_range_set_signed_create(void)
{
+ BT_ASSERT_PRE_NO_ERROR();
+
return (void *) create_range_set();
}
.upper.u = u_upper,
};
- BT_ASSERT_PRE_NON_NULL(range_set, "Integer range set");
- BT_ASSERT_PRE_DEV_HOT(range_set, "Integer range set", ": %!+R",
- range_set);
+ BT_ASSERT_PRE_INT_RANGE_SET_NON_NULL(range_set);
+ BT_ASSERT_PRE_DEV_HOT("integer-range-set", range_set,
+ "Integer range set", ": %!+R", range_set);
g_array_append_val(range_set->ranges, range);
BT_LIB_LOGD("Added integer range to integer range set: "
"%![range-set-]+R, lower-unsigned=%" PRIu64 ", "
struct bt_integer_range_set_unsigned *range_set,
uint64_t lower, uint64_t upper)
{
- BT_ASSERT_PRE(lower <= upper,
+ BT_ASSERT_PRE_NO_ERROR();
+ BT_ASSERT_PRE("lower-lteq-upper", lower <= upper,
"Range's upper bound is less than lower bound: "
"upper=%" PRIu64 ", lower=%" PRIu64, lower, upper);
add_range_to_range_set((void *) range_set, lower, upper);
struct bt_integer_range_set_signed *range_set,
int64_t lower, int64_t upper)
{
- BT_ASSERT_PRE(lower <= upper,
+ BT_ASSERT_PRE_NO_ERROR();
+ BT_ASSERT_PRE("lower-lteq-upper", lower <= upper,
"Range's upper bound is less than lower bound: "
"upper=%" PRId64 ", lower=%" PRId64, lower, upper);
add_range_to_range_set((void *) range_set,
const struct bt_integer_range_set_unsigned *range_set_a,
const struct bt_integer_range_set_unsigned *range_set_b)
{
- BT_ASSERT_PRE_DEV_NON_NULL(range_set_a, "Range set A");
- BT_ASSERT_PRE_DEV_NON_NULL(range_set_b, "Range set B");
+ BT_ASSERT_PRE_DEV_NON_NULL("integer-range-set-a", range_set_a,
+ "Range set A");
+ BT_ASSERT_PRE_DEV_NON_NULL("integer-range-set-b", range_set_b,
+ "Range set B");
return (bt_bool) compare_range_sets((const void *) range_set_a,
(const void *) range_set_b);
}
const struct bt_integer_range_set_signed *range_set_a,
const struct bt_integer_range_set_signed *range_set_b)
{
- BT_ASSERT_PRE_DEV_NON_NULL(range_set_a, "Range set A");
- BT_ASSERT_PRE_DEV_NON_NULL(range_set_b, "Range set B");
+ BT_ASSERT_PRE_DEV_NON_NULL("integer-range-set-a", range_set_a,
+ "Range set A");
+ BT_ASSERT_PRE_DEV_NON_NULL("integer-range-set-b", range_set_b,
+ "Range set B");
return (bt_bool) compare_range_sets((const void *) range_set_a,
(const void *) range_set_b);
}