#include "lib/logging.h"
#include "lib/assert-pre.h"
+#include "lib/assert-post.h"
#include <babeltrace2/trace-ir/trace.h>
#include <babeltrace2/trace-ir/trace-const.h>
#include <babeltrace2/trace-ir/event-class.h>
#include "trace-class.h"
#include "trace.h"
#include "utils.h"
+#include "lib/value.h"
#include "lib/func-status.h"
struct bt_trace_destruction_listener_elem {
void *data;
};
-#define BT_ASSERT_PRE_TRACE_HOT(_trace) \
- BT_ASSERT_PRE_HOT((_trace), "Trace", ": %!+t", (_trace))
+#define BT_ASSERT_PRE_DEV_TRACE_HOT(_trace) \
+ BT_ASSERT_PRE_DEV_HOT((_trace), "Trace", ": %!+t", (_trace))
static
void destroy_trace(struct bt_object *obj)
struct bt_trace *trace = (void *) obj;
BT_LIB_LOGD("Destroying trace object: %!+t", trace);
+ BT_OBJECT_PUT_REF_AND_RESET(trace->user_attributes);
/*
* Call destruction listener functions so that everything else
* The destruction listener should not have kept a
* reference to the trace.
*/
- BT_ASSERT_PRE(trace->base.ref_count == 1, "Destruction listener kept a reference to the trace being destroyed: %![trace-]+t", trace);
+ BT_ASSERT_POST(trace->base.ref_count == 1, "Destruction listener kept a reference to the trace being destroyed: %![trace-]+t", trace);
}
g_array_free(trace->destruction_listeners, TRUE);
trace->destruction_listeners = NULL;
}
bt_object_init_shared(&trace->base, destroy_trace);
+ trace->user_attributes = bt_value_map_create();
+ if (!trace->user_attributes) {
+ BT_LIB_LOGE_APPEND_CAUSE(
+ "Failed to create a map value object.");
+ goto error;
+ }
+
trace->streams = g_ptr_array_new_with_free_func(
(GDestroyNotify) bt_object_try_spec_release);
if (!trace->streams) {
}
trace->class = tc;
- bt_object_get_no_null_check(trace->class);
+ bt_object_get_ref_no_null_check(trace->class);
BT_LIB_LOGD("Created trace object: %!+t", trace);
goto end;
const char *bt_trace_get_name(const struct bt_trace *trace)
{
- BT_ASSERT_PRE_NON_NULL(trace, "Trace");
+ BT_ASSERT_PRE_DEV_NON_NULL(trace, "Trace");
return trace->name.value;
}
{
BT_ASSERT_PRE_NON_NULL(trace, "Trace");
BT_ASSERT_PRE_NON_NULL(name, "Name");
- BT_ASSERT_PRE_TRACE_HOT(trace);
+ BT_ASSERT_PRE_DEV_TRACE_HOT(trace);
g_string_assign(trace->name.str, name);
trace->name.value = trace->name.str->str;
BT_LIB_LOGD("Set trace's name: %!+t", trace);
bt_uuid bt_trace_get_uuid(const struct bt_trace *trace)
{
- BT_ASSERT_PRE_NON_NULL(trace, "Trace");
+ BT_ASSERT_PRE_DEV_NON_NULL(trace, "Trace");
return trace->uuid.value;
}
{
BT_ASSERT_PRE_NON_NULL(trace, "Trace");
BT_ASSERT_PRE_NON_NULL(uuid, "UUID");
- BT_ASSERT_PRE_TRACE_HOT(trace);
- memcpy(trace->uuid.uuid, uuid, BABELTRACE_UUID_LEN);
+ BT_ASSERT_PRE_DEV_TRACE_HOT(trace);
+ bt_uuid_copy(trace->uuid.uuid, uuid);
trace->uuid.value = trace->uuid.uuid;
BT_LIB_LOGD("Set trace's UUID: %!+t", trace);
}
BT_ASSERT(trace);
return bt_attributes_borrow_field_value_by_name(
- trace->environment, name) != NULL;
+ trace->environment, name);
}
static
struct bt_value *value_obj;
BT_ASSERT_PRE_NON_NULL(trace, "Trace");
BT_ASSERT_PRE_NON_NULL(name, "Name");
- value_obj = bt_value_signed_integer_create_init(value);
+ value_obj = bt_value_integer_signed_create_init(value);
if (!value_obj) {
BT_LIB_LOGE_APPEND_CAUSE(
"Cannot create an integer value object.");
{
int64_t ret;
- BT_ASSERT_PRE_NON_NULL(trace, "Trace");
+ BT_ASSERT_PRE_DEV_NON_NULL(trace, "Trace");
ret = bt_attributes_get_count(trace->environment);
BT_ASSERT(ret >= 0);
return (uint64_t) ret;
const struct bt_trace *trace, uint64_t index,
const char **name, const struct bt_value **value)
{
- BT_ASSERT_PRE_NON_NULL(trace, "Trace");
- BT_ASSERT_PRE_NON_NULL(name, "Name");
- BT_ASSERT_PRE_NON_NULL(value, "Value");
- BT_ASSERT_PRE_VALID_INDEX(index,
+ BT_ASSERT_PRE_DEV_NON_NULL(trace, "Trace");
+ BT_ASSERT_PRE_DEV_NON_NULL(name, "Name");
+ BT_ASSERT_PRE_DEV_NON_NULL(value, "Value");
+ BT_ASSERT_PRE_DEV_VALID_INDEX(index,
bt_attributes_get_count(trace->environment));
*value = bt_attributes_borrow_field_value(trace->environment, index);
BT_ASSERT(*value);
const struct bt_value *bt_trace_borrow_environment_entry_value_by_name_const(
const struct bt_trace *trace, const char *name)
{
- BT_ASSERT_PRE_NON_NULL(trace, "Trace");
- BT_ASSERT_PRE_NON_NULL(name, "Name");
+ BT_ASSERT_PRE_DEV_NON_NULL(trace, "Trace");
+ BT_ASSERT_PRE_DEV_NON_NULL(name, "Name");
return bt_attributes_borrow_field_value_by_name(trace->environment,
name);
}
uint64_t bt_trace_get_stream_count(const struct bt_trace *trace)
{
- BT_ASSERT_PRE_NON_NULL(trace, "Trace");
+ BT_ASSERT_PRE_DEV_NON_NULL(trace, "Trace");
return (uint64_t) trace->streams->len;
}
struct bt_stream *bt_trace_borrow_stream_by_index(
struct bt_trace *trace, uint64_t index)
{
- BT_ASSERT_PRE_NON_NULL(trace, "Trace");
- BT_ASSERT_PRE_VALID_INDEX(index, trace->streams->len);
+ BT_ASSERT_PRE_DEV_NON_NULL(trace, "Trace");
+ BT_ASSERT_PRE_DEV_VALID_INDEX(index, trace->streams->len);
return g_ptr_array_index(trace->streams, index);
}
struct bt_stream *stream = NULL;
uint64_t i;
- BT_ASSERT_PRE_NON_NULL(trace, "Trace");
+ BT_ASSERT_PRE_DEV_NON_NULL(trace, "Trace");
for (i = 0; i < trace->streams->len; i++) {
struct bt_stream *stream_candidate =
enum bt_trace_add_listener_status bt_trace_add_destruction_listener(
const struct bt_trace *c_trace,
bt_trace_destruction_listener_func listener,
- void *data, uint64_t *listener_id)
+ void *data, bt_listener_id *listener_id)
{
struct bt_trace *trace = (void *) c_trace;
uint64_t i;
return BT_FUNC_STATUS_OK;
}
-BT_ASSERT_PRE_FUNC
static
bool has_listener_id(const struct bt_trace *trace, uint64_t listener_id)
{
BT_ASSERT(listener_id < trace->destruction_listeners->len);
return (&g_array_index(trace->destruction_listeners,
struct bt_trace_destruction_listener_elem,
- listener_id))->func != NULL;
+ listener_id))->func;
}
enum bt_trace_remove_listener_status bt_trace_remove_destruction_listener(
- const struct bt_trace *c_trace, uint64_t listener_id)
+ const struct bt_trace *c_trace, bt_listener_id listener_id)
{
struct bt_trace *trace = (void *) c_trace;
struct bt_trace_destruction_listener_elem *elem;
BT_ASSERT(trace);
BT_LIB_LOGD("Freezing trace's class: %!+T", trace->class);
bt_trace_class_freeze(trace->class);
+ BT_LIB_LOGD("Freezing trace's user attributes: %!+v",
+ trace->user_attributes);
+ bt_value_freeze(trace->user_attributes);
BT_LIB_LOGD("Freezing trace: %!+t", trace);
((struct bt_trace *) trace)->frozen = true;
}
struct bt_trace_class *bt_trace_borrow_class(struct bt_trace *trace)
{
- BT_ASSERT_PRE_NON_NULL(trace, "Trace");
+ BT_ASSERT_PRE_DEV_NON_NULL(trace, "Trace");
return trace->class;
}
return bt_trace_borrow_class((void *) trace);
}
+const struct bt_value *bt_trace_borrow_user_attributes_const(
+ const struct bt_trace *trace)
+{
+ BT_ASSERT_PRE_DEV_NON_NULL(trace, "Trace");
+ return trace->user_attributes;
+}
+
+struct bt_value *bt_trace_borrow_user_attributes(struct bt_trace *trace)
+{
+ return (void *) bt_trace_borrow_user_attributes_const((void *) trace);
+}
+
+void bt_trace_set_user_attributes(
+ struct bt_trace *trace,
+ const struct bt_value *user_attributes)
+{
+ BT_ASSERT_PRE_NON_NULL(trace, "Trace");
+ 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_TRACE_HOT(trace);
+ bt_object_put_ref_no_null_check(trace->user_attributes);
+ trace->user_attributes = (void *) user_attributes;
+ bt_object_get_ref_no_null_check(trace->user_attributes);
+}
+
void bt_trace_get_ref(const struct bt_trace *trace)
{
bt_object_get_ref(trace);