/*
- * trace.c
- *
- * Babeltrace trace IR - Trace
- *
* Copyright 2014 Jérémie Galarneau <jeremie.galarneau@efficios.com>
*
* Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
#include <babeltrace/lib-logging-internal.h>
#include <babeltrace/assert-pre-internal.h>
+#include <babeltrace/trace-ir/private-trace.h>
#include <babeltrace/trace-ir/trace-internal.h>
#include <babeltrace/trace-ir/clock-class-internal.h>
#include <babeltrace/trace-ir/stream-internal.h>
#include <babeltrace/ctf-writer/functor-internal.h>
#include <babeltrace/ctf-writer/clock-internal.h>
#include <babeltrace/trace-ir/field-wrapper-internal.h>
-#include <babeltrace/trace-ir/field-types-internal.h>
+#include <babeltrace/trace-ir/field-classes-internal.h>
#include <babeltrace/trace-ir/attributes-internal.h>
#include <babeltrace/trace-ir/utils-internal.h>
#include <babeltrace/trace-ir/resolve-field-path-internal.h>
#include <babeltrace/compiler-internal.h>
#include <babeltrace/values.h>
+#include <babeltrace/private-values.h>
#include <babeltrace/values-internal.h>
-#include <babeltrace/ref.h>
+#include <babeltrace/object.h>
#include <babeltrace/types.h>
#include <babeltrace/endian-internal.h>
#include <babeltrace/assert-internal.h>
#include <stdlib.h>
struct bt_trace_is_static_listener_elem {
- bt_trace_is_static_listener func;
- bt_trace_listener_removed removed;
+ bt_private_trace_is_static_listener func;
+ bt_private_trace_listener_removed removed;
void *data;
};
struct bt_trace_is_static_listener_elem, i);
if (elem.removed) {
- elem.removed(trace, elem.data);
+ elem.removed((void *) trace, elem.data);
}
}
g_array_free(trace->is_static_listeners, TRUE);
+ trace->is_static_listeners = NULL;
}
bt_object_pool_finalize(&trace->packet_header_field_pool);
if (trace->environment) {
BT_LOGD_STR("Destroying environment attributes.");
bt_attributes_destroy(trace->environment);
+ trace->environment = NULL;
}
if (trace->name.str) {
g_string_free(trace->name.str, TRUE);
+ trace->name.str = NULL;
+ trace->name.value = NULL;
}
if (trace->streams) {
BT_LOGD_STR("Destroying streams.");
g_ptr_array_free(trace->streams, TRUE);
+ trace->streams = NULL;
}
if (trace->stream_classes) {
BT_LOGD_STR("Destroying stream classes.");
g_ptr_array_free(trace->stream_classes, TRUE);
+ trace->stream_classes = NULL;
}
if (trace->stream_classes_stream_count) {
g_hash_table_destroy(trace->stream_classes_stream_count);
+ trace->stream_classes_stream_count = NULL;
}
- BT_LOGD_STR("Putting packet header field type.");
- bt_put(trace->packet_header_ft);
+ BT_LOGD_STR("Putting packet header field classe.");
+ bt_object_put_ref(trace->packet_header_fc);
+ trace->packet_header_fc = NULL;
g_free(trace);
}
bt_field_wrapper_destroy(field_wrapper);
}
-struct bt_trace *bt_trace_create(void)
+struct bt_private_trace *bt_private_trace_create(void)
{
struct bt_trace *trace = NULL;
int ret;
goto end;
error:
- BT_PUT(trace);
+ BT_OBJECT_PUT_REF_AND_RESET(trace);
end:
- return trace;
+ return (void *) trace;
}
const char *bt_trace_get_name(struct bt_trace *trace)
return trace->name.value;
}
-int bt_trace_set_name(struct bt_trace *trace, const char *name)
+int bt_private_trace_set_name(struct bt_private_trace *priv_trace,
+ const char *name)
{
+ struct bt_trace *trace = (void *) priv_trace;
+
BT_ASSERT_PRE_NON_NULL(trace, "Trace");
BT_ASSERT_PRE_NON_NULL(name, "Name");
BT_ASSERT_PRE_TRACE_HOT(trace);
return trace->uuid.value;
}
-int bt_trace_set_uuid(struct bt_trace *trace, bt_uuid uuid)
+void bt_private_trace_set_uuid(struct bt_private_trace *priv_trace,
+ bt_uuid uuid)
{
+ struct bt_trace *trace = (void *) priv_trace;
+
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);
trace->uuid.value = trace->uuid.uuid;
BT_LIB_LOGV("Set trace's UUID: %!+t", trace);
- return 0;
}
BT_ASSERT_FUNC
static
bool trace_has_environment_entry(struct bt_trace *trace, const char *name)
{
- struct bt_value *attribute;
-
BT_ASSERT(trace);
- attribute = bt_attributes_borrow_field_value_by_name(
- trace->environment, name);
- return attribute != NULL;
+ return bt_attributes_borrow_field_value_by_name(
+ trace->environment, name) != NULL;
}
static
int set_environment_entry(struct bt_trace *trace, const char *name,
- struct bt_value *value)
+ struct bt_private_value *value)
{
int ret;
"%![trace-]+t, entry-name=\"%s\"", trace, name);
ret = bt_attributes_set_field_value(trace->environment, name,
value);
- bt_value_freeze(value);
+ bt_value_freeze(bt_private_value_borrow_value(value));
if (ret) {
BT_LIB_LOGE("Cannot set trace's environment entry: "
"%![trace-]+t, entry-name=\"%s\"", trace, name);
return ret;
}
-int bt_trace_set_environment_entry_string(struct bt_trace *trace,
+int bt_private_trace_set_environment_entry_string(
+ struct bt_private_trace *priv_trace,
const char *name, const char *value)
{
int ret;
- struct bt_value *value_obj;
+ struct bt_private_value *value_obj;
+ struct bt_trace *trace = (void *) priv_trace;
BT_ASSERT_PRE_NON_NULL(trace, "Trace");
BT_ASSERT_PRE_NON_NULL(name, "Name");
BT_ASSERT_PRE_NON_NULL(value, "Value");
- value_obj = bt_value_string_create_init(value);
+ value_obj = bt_private_value_string_create_init(value);
if (!value_obj) {
BT_LOGE_STR("Cannot create a string value object.");
ret = -1;
ret = set_environment_entry(trace, name, value_obj);
end:
- bt_put(value_obj);
+ bt_object_put_ref(value_obj);
return ret;
}
-int bt_trace_set_environment_entry_integer(
- struct bt_trace *trace, const char *name, int64_t value)
+int bt_private_trace_set_environment_entry_integer(
+ struct bt_private_trace *priv_trace,
+ const char *name, int64_t value)
{
int ret;
- struct bt_value *value_obj;
+ struct bt_private_value *value_obj;
+ struct bt_trace *trace = (void *) priv_trace;
BT_ASSERT_PRE_NON_NULL(trace, "Trace");
BT_ASSERT_PRE_NON_NULL(name, "Name");
- value_obj = bt_value_integer_create_init(value);
+ value_obj = bt_private_value_integer_create_init(value);
if (!value_obj) {
BT_LOGE_STR("Cannot create an integer value object.");
ret = -1;
ret = set_environment_entry(trace, name, value_obj);
end:
- bt_put(value_obj);
+ bt_object_put_ref(value_obj);
return ret;
}
BT_ASSERT_PRE_NON_NULL(value, "Value");
BT_ASSERT_PRE_VALID_INDEX(index,
bt_attributes_get_count(trace->environment));
- *value = bt_attributes_borrow_field_value(trace->environment, index);
+ *value = bt_private_value_borrow_value(
+ bt_attributes_borrow_field_value(trace->environment, index));
BT_ASSERT(*value);
*name = bt_attributes_get_field_name(trace->environment, index);
BT_ASSERT(*name);
}
+void bt_private_trace_borrow_environment_entry_by_index(
+ struct bt_private_trace *trace, uint64_t index,
+ const char **name, struct bt_private_value **value)
+{
+ bt_trace_borrow_environment_entry_by_index((void *) trace,
+ index, name, (void *) value);
+}
+
struct bt_value *bt_trace_borrow_environment_entry_value_by_name(
struct bt_trace *trace, const char *name)
{
BT_ASSERT_PRE_NON_NULL(trace, "Trace");
BT_ASSERT_PRE_NON_NULL(name, "Name");
- return bt_attributes_borrow_field_value_by_name(trace->environment,
- name);
+ return bt_private_value_borrow_value(
+ bt_attributes_borrow_field_value_by_name(trace->environment,
+ name));
+}
+
+struct bt_private_value *
+bt_private_trace_borrow_environment_entry_value_by_name(
+ struct bt_private_trace *trace, const char *name)
+{
+ return (void *) bt_trace_borrow_environment_entry_value_by_name(
+ (void *) trace, name);
}
uint64_t bt_trace_get_stream_count(struct bt_trace *trace)
return g_ptr_array_index(trace->streams, index);
}
+struct bt_private_stream *bt_private_trace_borrow_stream_by_index(
+ struct bt_private_trace *trace, uint64_t index)
+{
+ return (void *) bt_trace_borrow_stream_by_index((void *) trace, index);
+}
+
struct bt_stream *bt_trace_borrow_stream_by_id(
struct bt_trace *trace, uint64_t id)
{
return stream;
}
+struct bt_private_stream *bt_private_trace_borrow_private_stream_by_id(
+ struct bt_private_trace *trace, uint64_t id)
+{
+ return (void *) bt_trace_borrow_stream_by_id((void *) trace, id);
+}
+
uint64_t bt_trace_get_stream_class_count(struct bt_trace *trace)
{
BT_ASSERT_PRE_NON_NULL(trace, "Trace");
return g_ptr_array_index(trace->stream_classes, index);
}
+struct bt_private_stream_class *
+bt_private_trace_borrow_stream_class_by_index(
+ struct bt_private_trace *trace, uint64_t index)
+{
+ return (void *) bt_trace_borrow_stream_class_by_index(
+ (void *) trace, index);
+}
+
struct bt_stream_class *bt_trace_borrow_stream_class_by_id(
struct bt_trace *trace, uint64_t id)
{
return stream_class;
}
-struct bt_field_type *bt_trace_borrow_packet_header_field_type(
+struct bt_private_stream_class *
+bt_private_trace_borrow_stream_class_by_id(
+ struct bt_private_trace *trace, uint64_t id)
+{
+ return (void *) bt_trace_borrow_stream_class_by_id((void *) trace, id);
+}
+
+struct bt_field_class *bt_trace_borrow_packet_header_field_class(
struct bt_trace *trace)
{
BT_ASSERT_PRE_NON_NULL(trace, "Trace");
- return trace->packet_header_ft;
+ return trace->packet_header_fc;
}
-int bt_trace_set_packet_header_field_type(struct bt_trace *trace,
- struct bt_field_type *field_type)
+int bt_private_trace_set_packet_header_field_class(
+ struct bt_private_trace *priv_trace,
+ struct bt_private_field_class *priv_field_class)
{
int ret;
+ struct bt_trace *trace = (void *) priv_trace;
+ struct bt_field_class *field_class = (void *) priv_field_class;
struct bt_resolve_field_path_context resolve_ctx = {
- .packet_header = field_type,
+ .packet_header = field_class,
.packet_context = NULL,
.event_header = NULL,
.event_common_context = NULL,
};
BT_ASSERT_PRE_NON_NULL(trace, "Trace");
- BT_ASSERT_PRE_NON_NULL(field_type, "Field type");
+ BT_ASSERT_PRE_NON_NULL(field_class, "Field class");
BT_ASSERT_PRE_TRACE_HOT(trace);
- BT_ASSERT_PRE(bt_field_type_get_type_id(field_type) ==
- BT_FIELD_TYPE_ID_STRUCTURE,
- "Packet header field type is not a structure field type: %!+F",
- field_type);
- ret = bt_resolve_field_paths(field_type, &resolve_ctx);
+ BT_ASSERT_PRE(bt_field_class_get_type(field_class) ==
+ BT_FIELD_CLASS_TYPE_STRUCTURE,
+ "Packet header field classe is not a structure field classe: %!+F",
+ field_class);
+ ret = bt_resolve_field_paths(field_class, &resolve_ctx);
if (ret) {
goto end;
}
- bt_field_type_make_part_of_trace(field_type);
- bt_put(trace->packet_header_ft);
- trace->packet_header_ft = bt_get(field_type);
- bt_field_type_freeze(field_type);
- BT_LIB_LOGV("Set trace's packet header field type: %!+t", trace);
+ bt_field_class_make_part_of_trace(field_class);
+ bt_object_put_ref(trace->packet_header_fc);
+ trace->packet_header_fc = bt_object_get_ref(field_class);
+ bt_field_class_freeze(field_class);
+ BT_LIB_LOGV("Set trace's packet header field classe: %!+t", trace);
end:
return ret;
return (bt_bool) trace->is_static;
}
-int bt_trace_make_static(struct bt_trace *trace)
+int bt_private_trace_make_static(struct bt_private_trace *priv_trace)
{
+ struct bt_trace *trace = (void *) priv_trace;
uint64_t i;
BT_ASSERT_PRE_NON_NULL(trace, "Trace");
struct bt_trace_is_static_listener_elem, i);
if (elem.func) {
- elem.func(trace, elem.data);
+ elem.func((void *) trace, elem.data);
}
}
return 0;
}
-int bt_trace_add_is_static_listener(struct bt_trace *trace,
- bt_trace_is_static_listener listener,
- bt_trace_listener_removed listener_removed, void *data,
+int bt_private_trace_add_is_static_listener(
+ struct bt_private_trace *priv_trace,
+ bt_private_trace_is_static_listener listener,
+ bt_private_trace_listener_removed listener_removed, void *data,
uint64_t *listener_id)
{
+ struct bt_trace *trace = (void *) priv_trace;
uint64_t i;
struct bt_trace_is_static_listener_elem new_elem = {
.func = listener,
listener_id))->func != NULL;
}
-int bt_trace_remove_is_static_listener(
- struct bt_trace *trace, uint64_t listener_id)
+int bt_private_trace_remove_is_static_listener(
+ struct bt_private_trace *priv_trace, uint64_t listener_id)
{
+ struct bt_trace *trace = (void *) priv_trace;
struct bt_trace_is_static_listener_elem *elem;
BT_ASSERT_PRE_NON_NULL(trace, "Trace");
"%![trace-]+t, listener-id=%" PRIu64,
trace, listener_id);
trace->in_remove_listener = true;
- elem->removed(trace, elem->data);
+ elem->removed((void *) trace, elem->data);
trace->in_remove_listener = false;
}
BT_HIDDEN
void _bt_trace_freeze(struct bt_trace *trace)
{
- /* The packet header field type is already frozen */
+ /* The packet header field classe is already frozen */
BT_ASSERT(trace);
BT_LIB_LOGD("Freezing trace: %!+t", trace);
trace->frozen = true;
return (bt_bool) trace->assigns_automatic_stream_class_id;
}
-int bt_trace_set_assigns_automatic_stream_class_id(
- struct bt_trace *trace, bt_bool value)
+void bt_private_trace_set_assigns_automatic_stream_class_id(
+ struct bt_private_trace *priv_trace, bt_bool value)
{
+ struct bt_trace *trace = (void *) priv_trace;
+
BT_ASSERT_PRE_NON_NULL(trace, "Trace");
BT_ASSERT_PRE_TRACE_HOT(trace);
trace->assigns_automatic_stream_class_id = (bool) value;
BT_LIB_LOGV("Set trace's automatic stream class ID "
"assignment property: %!+t", trace);
- return 0;
}
BT_HIDDEN