lib: rename plural file names to singular

[babeltrace.git] / include / babeltrace / trace-ir / trace-internal.h

diff --git a/include/babeltrace/trace-ir/trace-internal.h b/include/babeltrace/trace-ir/trace-internal.h
index fcf1bd29ebad6d5e83f93bb80dc009b2c7b1cee0..4154be6e56827a3211d93bfa0c9c49be78eab64e 100644 (file)
--- a/include/babeltrace/trace-ir/trace-internal.h
+++ b/include/babeltrace/trace-ir/trace-internal.h
@@ -26,16 +26,17 @@
  */
 
 #include <babeltrace/assert-pre-internal.h>
+#include <babeltrace/trace-ir/trace-class-internal.h>
 #include <babeltrace/trace-ir/trace.h>
 #include <babeltrace/trace-ir/stream-class-internal.h>
-#include <babeltrace/trace-ir/field-classes.h>
-#include <babeltrace/trace-ir/fields.h>
+#include <babeltrace/trace-ir/field-class.h>
+#include <babeltrace/trace-ir/field.h>
 #include <babeltrace/trace-ir/attributes-internal.h>
 #include <babeltrace/trace-ir/clock-class-internal.h>
 #include <babeltrace/object-internal.h>
 #include <babeltrace/object-pool-internal.h>
 #include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/values.h>
+#include <babeltrace/value.h>
 #include <babeltrace/types.h>
 #include <glib.h>
 #include <sys/types.h>
@@ -44,6 +45,9 @@
 struct bt_trace {
        struct bt_object base;
 
+       /* Owned by this */
+       struct bt_trace_class *class;
+
        struct {
                GString *str;
 
@@ -51,37 +55,20 @@ struct bt_trace {
                const char *value;
        } name;
 
-       struct {
-               uint8_t uuid[BABELTRACE_UUID_LEN];
-
-               /* NULL or `uuid` above */
-               bt_uuid value;
-       } uuid;
-
-       struct bt_value *environment;
-
-       /* Array of `struct bt_stream_class *` */
-       GPtrArray *stream_classes;
-
        /* Array of `struct bt_stream *` */
        GPtrArray *streams;
 
        /*
-        * Stream class (weak) to number of instantiated streams, used
-        * to automatically assign stream IDs per stream class.
+        * Stream class (weak, owned by owned trace class) to number of
+        * instantiated streams, used to automatically assign stream IDs
+        * per stream class within this trace.
         */
        GHashTable *stream_classes_stream_count;
 
        struct bt_field_class *packet_header_fc;
-       bool assigns_automatic_stream_class_id;
-
        GArray *is_static_listeners;
        bool is_static;
        bool in_remove_listener;
-
-       /* Pool of `struct bt_field_wrapper *` */
-       struct bt_object_pool packet_header_field_pool;
-
        bool frozen;
 };