#include <babeltrace/babeltrace-internal.h>
#include <babeltrace/compiler-internal.h>
#include <babeltrace/ref.h>
+#include <babeltrace/assert-internal.h>
+#include <babeltrace/assert-pre-internal.h>
#include <stdint.h>
#include <inttypes.h>
#include <glib.h>
{
struct bt_clock_class_priority_map *cc_prio_map = (void *) obj;
- if (!cc_prio_map) {
- return;
- }
-
BT_LOGD("Destroying component class priority map object: addr=%p",
cc_prio_map);
goto error;
}
- bt_object_init(cc_prio_map, bt_clock_class_priority_map_destroy);
+ bt_object_init_shared(&cc_prio_map->base,
+ bt_clock_class_priority_map_destroy);
cc_prio_map->entries = g_ptr_array_new_with_free_func(
(GDestroyNotify) bt_put);
if (!cc_prio_map->entries) {
int64_t bt_clock_class_priority_map_get_clock_class_count(
struct bt_clock_class_priority_map *cc_prio_map)
{
- int64_t ret = (int64_t) -1;
-
- if (!cc_prio_map) {
- BT_LOGW_STR("Invalid parameter: clock class priority map is NULL.");
- goto end;
- }
-
- ret = (int64_t) cc_prio_map->entries->len;
-
-end:
- return ret;
+ BT_ASSERT_PRE_NON_NULL(cc_prio_map, "Clock class priority map");
+ return (int64_t) cc_prio_map->entries->len;
}
-struct bt_ctf_clock_class *bt_clock_class_priority_map_get_clock_class_by_index(
+struct bt_clock_class *bt_clock_class_priority_map_borrow_clock_class_by_index(
struct bt_clock_class_priority_map *cc_prio_map,
uint64_t index)
{
- struct bt_ctf_clock_class *clock_class = NULL;
-
- if (!cc_prio_map) {
- BT_LOGW_STR("Invalid parameter: clock class priority map is NULL.");
- goto end;
- }
-
- if (index >= cc_prio_map->entries->len) {
- BT_LOGW("Invalid parameter: index is out of bounds: "
- "addr=%p, index=%" PRIu64 ", count=%u",
- cc_prio_map, index, cc_prio_map->entries->len);
- goto end;
- }
-
- clock_class = g_ptr_array_index(cc_prio_map->entries, index);
- bt_get(clock_class);
-
-end:
- return clock_class;
+ BT_ASSERT_PRE_NON_NULL(cc_prio_map, "Clock class priority map");
+ BT_ASSERT_PRE(index < cc_prio_map->entries->len,
+ "Index is out of bounds: index=%" PRIu64 ", count=%" PRIu64,
+ index, cc_prio_map->entries->len);
+ return g_ptr_array_index(cc_prio_map->entries, index);
}
-struct bt_ctf_clock_class *bt_clock_class_priority_map_get_clock_class_by_name(
+struct bt_clock_class *bt_clock_class_priority_map_borrow_clock_class_by_name(
struct bt_clock_class_priority_map *cc_prio_map,
const char *name)
{
size_t i;
- struct bt_ctf_clock_class *clock_class = NULL;
-
- if (!cc_prio_map) {
- BT_LOGW_STR("Invalid parameter: clock class priority map is NULL.");
- goto end;
- }
+ struct bt_clock_class *clock_class = NULL;
- if (!name) {
- BT_LOGW_STR("Invalid parameter: name is NULL.");
- goto end;
- }
+ BT_ASSERT_PRE_NON_NULL(cc_prio_map, "Clock class priority map");
+ BT_ASSERT_PRE_NON_NULL(name, "Name");
for (i = 0; i < cc_prio_map->entries->len; i++) {
- struct bt_ctf_clock_class *cur_cc =
+ struct bt_clock_class *cur_cc =
g_ptr_array_index(cc_prio_map->entries, i);
const char *cur_cc_name =
- bt_ctf_clock_class_get_name(cur_cc);
+ bt_clock_class_get_name(cur_cc);
- assert(cur_cc_name);
+ BT_ASSERT(cur_cc_name);
if (strcmp(cur_cc_name, name) == 0) {
- clock_class = bt_get(cur_cc);
+ clock_class = cur_cc;
goto end;
}
}
struct clock_class_prio {
uint64_t prio;
- struct bt_ctf_clock_class *clock_class;
+ struct bt_clock_class *clock_class;
};
static
}
static
-struct clock_class_prio bt_ctf_clock_class_priority_map_current_highest_prio(
+struct clock_class_prio bt_clock_class_priority_map_current_highest_prio(
struct bt_clock_class_priority_map *cc_prio_map)
{
struct clock_class_prio func_data = {
return func_data;
}
-struct bt_ctf_clock_class *
-bt_clock_class_priority_map_get_highest_priority_clock_class(
+struct bt_clock_class *
+bt_clock_class_priority_map_borrow_highest_priority_clock_class(
struct bt_clock_class_priority_map *cc_prio_map)
{
- struct bt_ctf_clock_class *clock_class = NULL;
-
- if (!cc_prio_map) {
- BT_LOGW_STR("Invalid parameter: clock class priority map is NULL.");
- goto end;
- }
-
- clock_class = bt_get(cc_prio_map->highest_prio_cc);
-
-end:
- return clock_class;
+ BT_ASSERT_PRE_NON_NULL(cc_prio_map, "Clock class priority map");
+ return cc_prio_map->highest_prio_cc;
}
int bt_clock_class_priority_map_get_clock_class_priority(
struct bt_clock_class_priority_map *cc_prio_map,
- struct bt_ctf_clock_class *clock_class, uint64_t *priority)
+ struct bt_clock_class *clock_class, uint64_t *priority)
{
int ret = 0;
uint64_t *prio;
- if (!cc_prio_map) {
- BT_LOGW_STR("Invalid parameter: clock class priority map is NULL.");
- ret = -1;
- goto end;
- }
-
- if (!clock_class) {
- BT_LOGW_STR("Invalid parameter: clock class is NULL.");
- ret = -1;
- goto end;
- }
-
- if (!priority) {
- BT_LOGW_STR("Invalid parameter: priority is NULL.");
- ret = -1;
- goto end;
- }
-
+ BT_ASSERT_PRE_NON_NULL(cc_prio_map, "Clock class priority map");
+ BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class");
+ BT_ASSERT_PRE_NON_NULL(priority, "Priority");
prio = g_hash_table_lookup(cc_prio_map->prios, clock_class);
if (!prio) {
BT_LOGV("Clock class does not exist in clock class priority map: "
"cc-prio-map-addr=%p, clock-class-addr=%p, "
"clock-class-name=\"%s\"",
cc_prio_map, clock_class,
- bt_ctf_clock_class_get_name(clock_class));
+ bt_clock_class_get_name(clock_class));
ret = -1;
goto end;
}
int bt_clock_class_priority_map_add_clock_class(
struct bt_clock_class_priority_map *cc_prio_map,
- struct bt_ctf_clock_class *clock_class, uint64_t priority)
+ struct bt_clock_class *clock_class, uint64_t priority)
{
int ret = 0;
uint64_t *prio_ptr = NULL;
struct clock_class_prio cc_prio;
// FIXME when available: check
- // bt_ctf_clock_class_is_valid(clock_class)
- if (!cc_prio_map) {
- BT_LOGW_STR("Invalid parameter: clock class priority map is NULL.");
- ret = -1;
- goto end;
- }
-
- if (!clock_class) {
- BT_LOGW_STR("Invalid parameter: clock class is NULL.");
- ret = -1;
- goto end;
- }
-
- if (cc_prio_map->frozen) {
- BT_LOGW("Invalid parameter: clock class priority map is frozen: "
- "addr=%p", cc_prio_map);
- ret = -1;
- goto end;
- }
+ // bt_clock_class_is_valid(clock_class)
+ BT_ASSERT_PRE_NON_NULL(cc_prio_map, "Clock class priority map");
+ BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class");
+ BT_ASSERT_PRE_HOT(cc_prio_map, "Clock class priority map", "");
/* Check for existing clock class */
prio_ptr = g_hash_table_lookup(cc_prio_map->prios, clock_class);
prio_ptr = NULL;
set_highest_prio:
- cc_prio = bt_ctf_clock_class_priority_map_current_highest_prio(
+ cc_prio = bt_clock_class_priority_map_current_highest_prio(
cc_prio_map);
- assert(cc_prio.clock_class);
+ BT_ASSERT(cc_prio.clock_class);
cc_prio_map->highest_prio_cc = cc_prio.clock_class;
BT_LOGV("Added clock class to clock class priority map: "
"cc-prio-map-addr=%p, added-clock-class-addr=%p, "
"highest-prio-clock-class-addr=%p, "
"highest-prio-clock-class-name=\"%s\"",
cc_prio_map, clock_class,
- bt_ctf_clock_class_get_name(clock_class),
+ bt_clock_class_get_name(clock_class),
cc_prio.clock_class,
- bt_ctf_clock_class_get_name(cc_prio.clock_class));
+ bt_clock_class_get_name(cc_prio.clock_class));
end:
- if (prio_ptr) {
- g_free(prio_ptr);
- }
+ g_free(prio_ptr);
return ret;
}
cc_prio_map = bt_clock_class_priority_map_create();
if (!cc_prio_map) {
- BT_LOGW_STR("Invalid parameter: clock class priority map is NULL.");
+ BT_LOGE_STR("Cannot create empty clock class priority map.");
goto error;
}
for (i = 0; i < orig_cc_prio_map->entries->len; i++) {
- struct bt_ctf_clock_class *clock_class =
+ struct bt_clock_class *clock_class =
g_ptr_array_index(orig_cc_prio_map->entries, i);
uint64_t *prio = g_hash_table_lookup(orig_cc_prio_map->prios,
clock_class);
"cc-prio-map-copy-addr=%p, clock-class-addr=%p, "
"clock-class-name=\"%s\"",
cc_prio_map, clock_class,
- bt_ctf_clock_class_get_name(clock_class));
+ bt_clock_class_get_name(clock_class));
goto error;
}
}
projects / babeltrace.git / blobdiff