/*
+ * Copyright 2017-2018 Philippe Proulx <pproulx@efficios.com>
* Copyright 2014 Jérémie Galarneau <jeremie.galarneau@efficios.com>
*
- * Author: Jérémie Galarneau <jeremie.galarneau@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
#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-classes-internal.h>
+#include <babeltrace/trace-ir/field-class-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/values-const.h>
-#include <babeltrace/values-internal.h>
-#include <babeltrace/object.h>
+#include <babeltrace/value.h>
+#include <babeltrace/value-const.h>
+#include <babeltrace/value-internal.h>
#include <babeltrace/types.h>
#include <babeltrace/endian-internal.h>
#include <babeltrace/assert-internal.h>
struct bt_trace_class *tc = (void *) obj;
BT_LIB_LOGD("Destroying trace class object: %!+T", tc);
- bt_object_pool_finalize(&tc->packet_header_field_pool);
if (tc->environment) {
BT_LOGD_STR("Destroying environment attributes.");
tc->stream_classes = NULL;
}
- BT_LOGD_STR("Putting packet header field classe.");
- bt_object_put_ref(tc->packet_header_fc);
- tc->packet_header_fc = NULL;
g_free(tc);
}
-static
-void free_packet_header_field(struct bt_field_wrapper *field_wrapper,
- struct bt_trace_class *tc)
-{
- bt_field_wrapper_destroy(field_wrapper);
-}
-
-struct bt_trace_class *bt_trace_class_create(void)
+struct bt_trace_class *bt_trace_class_create(bt_self_component *self_comp)
{
struct bt_trace_class *tc = NULL;
- int ret;
+ BT_ASSERT_PRE_NON_NULL(self_comp, "Self component");
BT_LOGD_STR("Creating default trace class object.");
tc = g_new0(struct bt_trace_class, 1);
if (!tc) {
}
tc->assigns_automatic_stream_class_id = true;
- ret = bt_object_pool_initialize(&tc->packet_header_field_pool,
- (bt_object_pool_new_object_func) bt_field_wrapper_new,
- (bt_object_pool_destroy_object_func) free_packet_header_field,
- tc);
- if (ret) {
- BT_LOGE("Failed to initialize packet header field pool: ret=%d",
- ret);
- goto error;
- }
-
BT_LIB_LOGD("Created trace class object: %!+T", tc);
goto end;
return tc->name.value;
}
-int bt_trace_class_set_name(struct bt_trace_class *tc, const char *name)
+enum bt_trace_class_status bt_trace_class_set_name(
+ struct bt_trace_class *tc, const char *name)
{
BT_ASSERT_PRE_NON_NULL(tc, "Trace class");
BT_ASSERT_PRE_NON_NULL(name, "Name");
g_string_assign(tc->name.str, name);
tc->name.value = tc->name.str->str;
BT_LIB_LOGV("Set trace class's name: %!+T", tc);
- return 0;
+ return BT_TRACE_CLASS_STATUS_OK;
}
bt_uuid bt_trace_class_get_uuid(const struct bt_trace_class *tc)
}
static
-int set_environment_entry(struct bt_trace_class *tc, const char *name,
- struct bt_value *value)
+enum bt_trace_class_status set_environment_entry(struct bt_trace_class *tc,
+ const char *name, struct bt_value *value)
{
int ret;
"%![tc-]+T, entry-name=\"%s\"", tc, name);
ret = bt_attributes_set_field_value(tc->environment, name,
value);
- bt_value_freeze(value);
if (ret) {
+ ret = BT_TRACE_CLASS_STATUS_NOMEM;
BT_LIB_LOGE("Cannot set trace class's environment entry: "
"%![tc-]+T, entry-name=\"%s\"", tc, name);
} else {
+ bt_value_freeze(value);
BT_LIB_LOGV("Set trace class's environment entry: "
"%![tc-]+T, entry-name=\"%s\"", tc, name);
}
return ret;
}
-int bt_trace_class_set_environment_entry_string(
+enum bt_trace_class_status bt_trace_class_set_environment_entry_string(
struct bt_trace_class *tc, const char *name, const char *value)
{
int ret;
return ret;
}
-int bt_trace_class_set_environment_entry_integer(struct bt_trace_class *tc,
- const char *name, int64_t value)
+enum bt_trace_class_status bt_trace_class_set_environment_entry_integer(
+ struct bt_trace_class *tc, const char *name, int64_t value)
{
int ret;
struct bt_value *value_obj;
value_obj = bt_value_integer_create_init(value);
if (!value_obj) {
BT_LOGE_STR("Cannot create an integer value object.");
- ret = -1;
+ ret = BT_TRACE_CLASS_STATUS_NOMEM;
goto end;
}
return bt_trace_class_borrow_stream_class_by_id((void *) tc, id);
}
-const struct bt_field_class *bt_trace_class_borrow_packet_header_field_class_const(
- const struct bt_trace_class *tc)
-{
- BT_ASSERT_PRE_NON_NULL(tc, "Trace class");
- return tc->packet_header_fc;
-}
-
-int bt_trace_class_set_packet_header_field_class(
- struct bt_trace_class *tc,
- struct bt_field_class *field_class)
-{
- int ret;
- struct bt_resolve_field_path_context resolve_ctx = {
- .packet_header = field_class,
- .packet_context = NULL,
- .event_header = NULL,
- .event_common_context = NULL,
- .event_specific_context = NULL,
- .event_payload = NULL,
- };
-
- BT_ASSERT_PRE_NON_NULL(tc, "Trace class");
- BT_ASSERT_PRE_NON_NULL(field_class, "Field class");
- BT_ASSERT_PRE_TRACE_CLASS_HOT(tc);
- 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_class_make_part_of_trace_class(field_class);
- bt_object_put_ref(tc->packet_header_fc);
- tc->packet_header_fc = field_class;
- bt_object_get_no_null_check(tc->packet_header_fc);
- bt_field_class_freeze(field_class);
- BT_LIB_LOGV("Set trace class's packet header field classe: %!+T", tc);
-
-end:
- return ret;
-}
-
BT_HIDDEN
void _bt_trace_class_freeze(const struct bt_trace_class *tc)
{
- /* The packet header field classe is already frozen */
BT_ASSERT(tc);
BT_LIB_LOGD("Freezing trace class: %!+T", tc);
((struct bt_trace_class *) tc)->frozen = true;
BT_LIB_LOGV("Set trace class's automatic stream class ID "
"assignment property: %!+T", tc);
}
+
+void bt_trace_class_get_ref(const struct bt_trace_class *trace_class)
+{
+ bt_object_get_ref(trace_class);
+}
+
+void bt_trace_class_put_ref(const struct bt_trace_class *trace_class)
+{
+ bt_object_put_ref(trace_class);
+}
projects / babeltrace.git / blobdiff