X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Flibctfcopytrace%2Fctfcopytrace.h;h=c57f488b06e93186a3999e283d6aae228a9b6449;hb=40f4ba76dd6f9508ca51b6220eaed57632281a07;hp=6820a8a2b6c288df1485c498c8f12e3d1d83a63d;hpb=9ac68eb139149d2768848dae5e263cc5a755d439;p=babeltrace.git

diff --git a/plugins/libctfcopytrace/ctfcopytrace.h b/plugins/libctfcopytrace/ctfcopytrace.h
index 6820a8a2..c57f488b 100644
--- a/plugins/libctfcopytrace/ctfcopytrace.h
+++ b/plugins/libctfcopytrace/ctfcopytrace.h
@@ -29,8 +29,7 @@
 
 #include <stdbool.h>
 #include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/graph/component.h>
-#include <babeltrace/ctf-writer/writer.h>
+#include <babeltrace/babeltrace.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -41,8 +40,8 @@ extern "C" {
  *
  * Returns NULL on error.
  */
-struct bt_ctf_clock_class *ctf_copy_clock_class(FILE *err,
-		struct bt_ctf_clock_class *clock_class);
+const struct bt_clock_class *ctf_copy_clock_class(FILE *err,
+		const struct bt_clock_class *clock_class);
 
 /*
  * Copy all the clock classes from the input trace and add them to the writer
@@ -53,18 +52,19 @@ struct bt_ctf_clock_class *ctf_copy_clock_class(FILE *err,
  */
 BT_HIDDEN
 enum bt_component_status ctf_copy_clock_classes(FILE *err,
-		struct bt_ctf_trace *writer_trace,
-		struct bt_ctf_stream_class *writer_stream_class,
-		struct bt_ctf_trace *trace);
+		const struct bt_trace *writer_trace,
+		const struct bt_stream_class *writer_stream_class,
+		const struct bt_trace *trace);
 
 /*
- * Create a copy of the event class passed in paramater.
+ * Create a copy of the event class passed in parameter.
  *
  * Returns NULL on error.
  */
 BT_HIDDEN
-struct bt_ctf_event_class *ctf_copy_event_class(FILE *err,
-		struct bt_ctf_event_class *event_class);
+const struct bt_event_class *ctf_copy_event_class(FILE *err,
+		const struct bt_trace *trace_copy,
+		const struct bt_event_class *event_class);
 
 /*
  * Copy all the event classes from the input stream class and add them to the
@@ -75,8 +75,8 @@ struct bt_ctf_event_class *ctf_copy_event_class(FILE *err,
  */
 BT_HIDDEN
 enum bt_component_status ctf_copy_event_classes(FILE *err,
-		struct bt_ctf_stream_class *stream_class,
-		struct bt_ctf_stream_class *writer_stream_class);
+		const struct bt_stream_class *stream_class,
+		const struct bt_stream_class *writer_stream_class);
 
 /*
  * Create a copy of the stream class passed in parameter.
@@ -84,9 +84,9 @@ enum bt_component_status ctf_copy_event_classes(FILE *err,
  * Returns NULL or error.
  */
 BT_HIDDEN
-struct bt_ctf_stream_class *ctf_copy_stream_class(FILE *err,
-		struct bt_ctf_stream_class *stream_class,
-		struct bt_ctf_trace *writer_trace,
+const struct bt_stream_class *ctf_copy_stream_class(FILE *err,
+		const struct bt_stream_class *stream_class,
+		const struct bt_trace *writer_trace,
 		bool override_ts64);
 
 /*
@@ -98,23 +98,51 @@ struct bt_ctf_stream_class *ctf_copy_stream_class(FILE *err,
  */
 BT_HIDDEN
 enum bt_component_status ctf_copy_packet_context_field(FILE *err,
-		struct bt_ctf_field *field, const char *field_name,
-		struct bt_ctf_field *writer_packet_context,
-		struct bt_ctf_field_type *writer_packet_context_type);
+		const struct bt_field *field, const char *field_name,
+		const struct bt_field *writer_packet_context,
+		struct bt_field_type *writer_packet_context_type);
+
+
+/*
+ * Copy the packet_header from the packet passed in parameter and assign it
+ * to the writer_stream.
+ *
+ * Returns 0 on success or -1 on error.
+ */
+BT_HIDDEN
+int ctf_stream_copy_packet_header(FILE *err, const struct bt_packet *packet,
+		const struct bt_stream *writer_stream);
+
+/*
+ * Copy the packet_header from the packet passed in parameter and assign it
+ * to the writer_packet.
+ *
+ * Returns 0 on success or -1 on error.
+ */
+BT_HIDDEN
+int ctf_packet_copy_header(FILE *err, const struct bt_packet *packet,
+		const struct bt_packet *writer_packet);
 
 /*
  * Copy all the field values of the packet context from the packet passed in
- * parameter and set it to the current packet in the writer stream.
- * The content_size and packet_size fields are not copied since they are
- * already handled by the ctf_writer library.
+ * parameter and set it to the writer_stream.
  *
- * Returns BT_COMPONENT_STATUS_OK on success, and BT_COMPONENT_STATUS_ERROR on
- * error.
+ * Returns 0 on success or -1 on error.
+ */
+BT_HIDDEN
+int ctf_stream_copy_packet_context(FILE *err, const struct bt_packet *packet,
+		const struct bt_stream *writer_stream);
+
+/*
+ * Copy all the field values of the packet context from the packet passed in
+ * parameter and set it to the writer_packet.
+ *
+ * Returns 0 on success or -1 on error.
  */
 BT_HIDDEN
-struct bt_ctf_field *ctf_copy_packet_context(FILE *err,
-		struct bt_ctf_packet *packet,
-		struct bt_ctf_stream *writer_stream);
+int ctf_packet_copy_context(FILE *err, const struct bt_packet *packet,
+		const struct bt_stream *writer_stream,
+		const struct bt_packet *writer_packet);
 
 /*
  * Create and return a copy of the event passed in parameter. The caller has to
@@ -123,8 +151,8 @@ struct bt_ctf_field *ctf_copy_packet_context(FILE *err,
  * Returns NULL on error.
  */
 BT_HIDDEN
-struct bt_ctf_event *ctf_copy_event(FILE *err, struct bt_ctf_event *event,
-		struct bt_ctf_event_class *writer_event_class,
+const struct bt_event *ctf_copy_event(FILE *err, const struct bt_event *event,
+		const struct bt_event_class *writer_event_class,
 		bool override_ts64);
 
 /*
@@ -133,10 +161,10 @@ struct bt_ctf_event *ctf_copy_event(FILE *err, struct bt_ctf_event *event,
  * Returns 0 on success, -1 on error.
  */
 BT_HIDDEN
-int ctf_copy_event_header(FILE *err, struct bt_ctf_event *event,
-		struct bt_ctf_event_class *writer_event_class,
-		struct bt_ctf_event *writer_event,
-		struct bt_ctf_field *event_header);
+int ctf_copy_event_header(FILE *err, const struct bt_event *event,
+		const struct bt_event_class *writer_event_class,
+		const struct bt_event *writer_event,
+		const struct bt_field *event_header);
 
 /*
  * Copy the environment and the packet header from the input trace to the
@@ -146,8 +174,8 @@ int ctf_copy_event_header(FILE *err, struct bt_ctf_event *event,
  * error.
  */
 BT_HIDDEN
-enum bt_component_status ctf_copy_trace(FILE *err, struct bt_ctf_trace *trace,
-		struct bt_ctf_trace *writer_trace);
+enum bt_component_status ctf_copy_trace(FILE *err, const struct bt_trace *trace,
+		const struct bt_trace *writer_trace);
 
 #ifdef __cplusplus
 }