lib: split trace API into trace class and trace APIs

[babeltrace.git] / plugins / ctf / common / metadata / decoder.h

diff --git a/plugins/ctf/common/metadata/decoder.h b/plugins/ctf/common/metadata/decoder.h
index 6ab0f30b4208aa4fe7f6a0b499130fd063f7195d..56b262dd0db56a9deb85fce3fe1a21e8cfa0e3e0 100644 (file)
--- a/plugins/ctf/common/metadata/decoder.h
+++ b/plugins/ctf/common/metadata/decoder.h
@@ -18,7 +18,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-struct bt_ctf_trace;
+struct bt_trace;
 
 /* A CTF metadata decoder object */
 struct ctf_metadata_decoder;
@@ -39,15 +39,13 @@ struct ctf_metadata_decoder_config {
 };
 
 /*
- * Creates a CTF metadata decoder. `name` is this decoder's trace's
- * name.
+ * Creates a CTF metadata decoder.
  *
  * Returns `NULL` on error.
  */
 BT_HIDDEN
 struct ctf_metadata_decoder *ctf_metadata_decoder_create(
-               const struct ctf_metadata_decoder_config *config,
-               const char *name);
+               const struct ctf_metadata_decoder_config *config);
 
 /*
  * Destroys a CTF metadata decoder that you created with
@@ -64,7 +62,7 @@ void ctf_metadata_decoder_destroy(
  * until the end of this file stream. If it finds new information (new
  * event class, new stream class, or new clock class), it appends this
  * information to the decoder's trace object (as returned by
- * ctf_metadata_get_trace()), or it creates this trace.
+ * ctf_metadata_decoder_get_ir_trace_class()), or it creates this trace.
  *
  * The metadata can be packetized or not.
  *
@@ -88,16 +86,13 @@ BT_HIDDEN
 enum ctf_metadata_decoder_status ctf_metadata_decoder_decode(
                struct ctf_metadata_decoder *metadata_decoder, FILE *fp);
 
-/*
- * Returns a new reference to the current CTF IR trace object which is
- * the result of the metadata decoding process.
- *
- * The trace object, once created, remains the same until you call
- * ctf_metadata_decoder_destroy().
- */
 BT_HIDDEN
-struct bt_ctf_trace *ctf_metadata_decoder_get_trace(
-               struct ctf_metadata_decoder *metadata_decoder);
+struct bt_trace_class *ctf_metadata_decoder_get_ir_trace_class(
+               struct ctf_metadata_decoder *mdec);
+
+BT_HIDDEN
+struct ctf_trace_class *ctf_metadata_decoder_borrow_ctf_trace_class(
+               struct ctf_metadata_decoder *mdec);
 
 /*
  * Checks whether or not a given metadata file stream is packetized, and