projects / babeltrace.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
tap-driver.sh: flush stdout after each test result
[babeltrace.git] / lib / trace-ir / event-class.c
diff --git a/lib/trace-ir/event-class.c b/lib/trace-ir/event-class.c
index cf4cbf88fe285e2259d60e8895fb848e346c03b3..db3911a083b6dd06adfc3af5bd50f1ce8e6ffb59 100644 (file)
--- a/lib/trace-ir/event-class.c
+++ b/lib/trace-ir/event-class.c
@@ -1,8 +1,7 @@
 /*
+ * Copyright 2017-2018 Philippe Proulx <pproulx@efficios.com>
  * Copyright 2013, 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
@@ -23,29 +22,28 @@
  */
 
 #define BT_LOG_TAG "EVENT-CLASS"
-#include <babeltrace/lib-logging-internal.h>
-
-#include <babeltrace/assert-pre-internal.h>
-#include <babeltrace/trace-ir/clock-value-internal.h>
-#include <babeltrace/trace-ir/field-internal.h>
-#include <babeltrace/trace-ir/field-class.h>
-#include <babeltrace/trace-ir/field-class-internal.h>
-#include <babeltrace/trace-ir/event-class.h>
-#include <babeltrace/trace-ir/event-class-const.h>
-#include <babeltrace/trace-ir/event-class-internal.h>
-#include <babeltrace/trace-ir/event-internal.h>
-#include <babeltrace/trace-ir/stream-class.h>
-#include <babeltrace/trace-ir/stream-class-internal.h>
-#include <babeltrace/trace-ir/trace-internal.h>
-#include <babeltrace/trace-ir/utils-internal.h>
-#include <babeltrace/trace-ir/resolve-field-path-internal.h>
-#include <babeltrace/object.h>
-#include <babeltrace/trace-ir/attributes-internal.h>
-#include <babeltrace/compiler-internal.h>
-#include <babeltrace/endian-internal.h>
-#include <babeltrace/types.h>
-#include <babeltrace/value-internal.h>
-#include <babeltrace/assert-internal.h>
+#include <babeltrace2/lib-logging-internal.h>
+
+#include <babeltrace2/assert-pre-internal.h>
+#include <babeltrace2/trace-ir/clock-snapshot-internal.h>
+#include <babeltrace2/trace-ir/field-internal.h>
+#include <babeltrace2/trace-ir/field-class.h>
+#include <babeltrace2/trace-ir/field-class-internal.h>
+#include <babeltrace2/trace-ir/event-class.h>
+#include <babeltrace2/trace-ir/event-class-const.h>
+#include <babeltrace2/trace-ir/event-class-internal.h>
+#include <babeltrace2/trace-ir/event-internal.h>
+#include <babeltrace2/trace-ir/stream-class.h>
+#include <babeltrace2/trace-ir/stream-class-internal.h>
+#include <babeltrace2/trace-ir/trace-internal.h>
+#include <babeltrace2/trace-ir/utils-internal.h>
+#include <babeltrace2/trace-ir/resolve-field-path-internal.h>
+#include <babeltrace2/trace-ir/attributes-internal.h>
+#include <babeltrace2/compiler-internal.h>
+#include <babeltrace2/endian-internal.h>
+#include <babeltrace2/types.h>
+#include <babeltrace2/value-internal.h>
+#include <babeltrace2/assert-internal.h>
 #include <inttypes.h>
 #include <stdlib.h>
 
@@ -194,8 +192,8 @@ const char *bt_event_class_get_name(const struct bt_event_class *event_class)
        return event_class->name.value;
 }
 
-int bt_event_class_set_name(struct bt_event_class *event_class,
-               const char *name)
+enum bt_event_class_status bt_event_class_set_name(
+               struct bt_event_class *event_class, const char *name)
 {
        BT_ASSERT_PRE_NON_NULL(event_class, "Event class");
        BT_ASSERT_PRE_NON_NULL(name, "Name");
@@ -203,7 +201,7 @@ int bt_event_class_set_name(struct bt_event_class *event_class,
        g_string_assign(event_class->name.str, name);
        event_class->name.value = event_class->name.str->str;
        BT_LIB_LOGV("Set event class's name: %!+E", event_class);
-       return 0;
+       return BT_EVENT_CLASS_STATUS_OK;
 }
 
 uint64_t bt_event_class_get_id(const struct bt_event_class *event_class)
@@ -240,7 +238,7 @@ const char *bt_event_class_get_emf_uri(const struct bt_event_class *event_class)
        return event_class->emf_uri.value;
 }
 
-int bt_event_class_set_emf_uri(
+enum bt_event_class_status bt_event_class_set_emf_uri(
                struct bt_event_class *event_class,
                const char *emf_uri)
 {
@@ -250,7 +248,7 @@ int bt_event_class_set_emf_uri(
        g_string_assign(event_class->emf_uri.str, emf_uri);
        event_class->emf_uri.value = event_class->emf_uri.str->str;
        BT_LIB_LOGV("Set event class's EMF URI: %!+E", event_class);
-       return 0;
+       return BT_EVENT_CLASS_STATUS_OK;
 }
 
 struct bt_stream_class *bt_event_class_borrow_stream_class(
@@ -275,17 +273,22 @@ bt_event_class_borrow_specific_context_field_class_const(
        return event_class->specific_context_fc;
 }
 
-int bt_event_class_set_specific_context_field_class(
+struct bt_field_class *
+bt_event_class_borrow_specific_context_field_class(
+               struct bt_event_class *event_class)
+{
+       BT_ASSERT_PRE_NON_NULL(event_class, "Event class");
+       return event_class->specific_context_fc;
+}
+
+enum bt_event_class_status bt_event_class_set_specific_context_field_class(
                struct bt_event_class *event_class,
                struct bt_field_class *field_class)
 {
        int ret;
        struct bt_stream_class *stream_class;
-       struct bt_trace_class *trace_class;
        struct bt_resolve_field_path_context resolve_ctx = {
-               .packet_header = NULL,
                .packet_context = NULL,
-               .event_header = NULL,
                .event_common_context = NULL,
                .event_specific_context = field_class,
                .event_payload = NULL,
@@ -300,15 +303,18 @@ int bt_event_class_set_specific_context_field_class(
                "%!+F", field_class);
        stream_class = bt_event_class_borrow_stream_class_inline(
                event_class);
-       trace_class = bt_stream_class_borrow_trace_class_inline(stream_class);
-       resolve_ctx.packet_header = trace_class->packet_header_fc;
        resolve_ctx.packet_context = stream_class->packet_context_fc;
-       resolve_ctx.event_header = stream_class->event_header_fc;
        resolve_ctx.event_common_context =
                stream_class->event_common_context_fc;
 
        ret = bt_resolve_field_paths(field_class, &resolve_ctx);
        if (ret) {
+               /*
+                * This is the only reason for which
+                * bt_resolve_field_paths() can fail: anything else
+                * would be because a precondition is not satisfied.
+                */
+               ret = BT_EVENT_CLASS_STATUS_NOMEM;
                goto end;
        }
 
@@ -331,17 +337,21 @@ const struct bt_field_class *bt_event_class_borrow_payload_field_class_const(
        return event_class->payload_fc;
 }
 
-int bt_event_class_set_payload_field_class(
+struct bt_field_class *bt_event_class_borrow_payload_field_class(
+               struct bt_event_class *event_class)
+{
+       BT_ASSERT_PRE_NON_NULL(event_class, "Event class");
+       return event_class->payload_fc;
+}
+
+enum bt_event_class_status bt_event_class_set_payload_field_class(
                struct bt_event_class *event_class,
                struct bt_field_class *field_class)
 {
        int ret;
        struct bt_stream_class *stream_class;
-       struct bt_trace_class *trace_class;
        struct bt_resolve_field_path_context resolve_ctx = {
-               .packet_header = NULL,
                .packet_context = NULL,
-               .event_header = NULL,
                .event_common_context = NULL,
                .event_specific_context = NULL,
                .event_payload = field_class,
@@ -356,16 +366,19 @@ int bt_event_class_set_payload_field_class(
                field_class);
        stream_class = bt_event_class_borrow_stream_class_inline(
                event_class);
-       trace_class = bt_stream_class_borrow_trace_class_inline(stream_class);
-       resolve_ctx.packet_header = trace_class->packet_header_fc;
        resolve_ctx.packet_context = stream_class->packet_context_fc;
-       resolve_ctx.event_header = stream_class->event_header_fc;
        resolve_ctx.event_common_context =
                stream_class->event_common_context_fc;
        resolve_ctx.event_specific_context = event_class->specific_context_fc;
 
        ret = bt_resolve_field_paths(field_class, &resolve_ctx);
        if (ret) {
+               /*
+                * This is the only reason for which
+                * bt_resolve_field_paths() can fail: anything else
+                * would be because a precondition is not satisfied.
+                */
+               ret = BT_EVENT_CLASS_STATUS_NOMEM;
                goto end;
        }
 
@@ -388,3 +401,13 @@ void _bt_event_class_freeze(const struct bt_event_class *event_class)
        BT_LIB_LOGD("Freezing event class: %!+E", event_class);
        ((struct bt_event_class *) event_class)->frozen = true;
 }
+
+void bt_event_class_get_ref(const struct bt_event_class *event_class)
+{
+       bt_object_get_ref(event_class);
+}
+
+void bt_event_class_put_ref(const struct bt_event_class *event_class)
+{
+       bt_object_put_ref(event_class);
+}
BabelTrace - Trace Format Babel Tower
This page took 0.02596 seconds and 4 git commands to generate.