X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Fformat.h;h=a19a0a914d9c91ace187b2f1f1c09db5e9b56296;hp=f680dfa7ceb4e76aec8d4ecb380a09e8947b6174;hb=f824ae0446c7a1ef3acd5d8e30c039c4ed7381ce;hpb=34861b9ddd0eb8040ac54e51f9352c4d7ff6fead

diff --git a/include/babeltrace/format.h b/include/babeltrace/format.h
index f680dfa7..a19a0a91 100644
--- a/include/babeltrace/format.h
+++ b/include/babeltrace/format.h
@@ -22,13 +22,20 @@
  */
 
 #include <babeltrace/list.h>
+#include <babeltrace/clock-types.h>
 #include <stdint.h>
 #include <stdio.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef int bt_intern_str;
 
 /* forward declaration */
-struct ctf_stream_pos;
+struct stream_pos;
+struct bt_context;
+struct bt_trace_handle;
 
 /* Parent trace descriptor */
 struct trace_descriptor {
@@ -47,19 +54,33 @@ struct format {
 	bt_intern_str name;
 
 	struct trace_descriptor *(*open_trace)(const char *path, int flags,
-			void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset,
-				int whence), FILE *metadata_fp);
+			void (*packet_seek)(struct stream_pos *pos,
+				size_t index, int whence),
+			FILE *metadata_fp);
 	struct trace_descriptor *(*open_mmap_trace)(
 			struct mmap_stream_list *mmap_list,
-			void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset,
-				int whence), FILE *metadata_fp);
-	void (*close_trace)(struct trace_descriptor *descriptor);
+			void (*packet_seek)(struct stream_pos *pos,
+				size_t index, int whence),
+			FILE *metadata_fp);
+	int (*close_trace)(struct trace_descriptor *descriptor);
+	void (*set_context)(struct trace_descriptor *descriptor,
+			struct bt_context *ctx);
+	void (*set_handle)(struct trace_descriptor *descriptor,
+			struct bt_trace_handle *handle);
+	uint64_t (*timestamp_begin)(struct trace_descriptor *descriptor,
+			struct bt_trace_handle *handle, enum bt_clock_type type);
+	uint64_t (*timestamp_end)(struct trace_descriptor *descriptor,
+			struct bt_trace_handle *handle, enum bt_clock_type type);
+	int (*convert_index_timestamp)(struct trace_descriptor *descriptor);
 };
 
 extern struct format *bt_lookup_format(bt_intern_str qname);
 extern void bt_fprintf_format_list(FILE *fp);
 extern int bt_register_format(struct format *format);
+extern void bt_unregister_format(struct format *format);
 
-/* TBD: format unregistration */
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* _BABELTRACE_FORMAT_H */