X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Fformat.h;h=8eae42c0e2aa7f3405969f785987216986d485d5;hp=526ab614a2fcaa9cf83c68bbe747dc263be951a0;hb=c54983704d35cb1cd6da38cb087df2e3b5cfd5d0;hpb=5b80ddfb8dfa4db544efddcd8acaed1228f87daa

diff --git a/include/babeltrace/format.h b/include/babeltrace/format.h
index 526ab614..8eae42c0 100644
--- a/include/babeltrace/format.h
+++ b/include/babeltrace/format.h
@@ -21,13 +21,14 @@
  * all copies or substantial portions of the Software.
  */
 
-#include <babeltrace/types.h>
+#include <babeltrace/list.h>
 #include <stdint.h>
 #include <stdio.h>
-#include <glib.h>
+
+typedef int bt_intern_str;
 
 /* forward declaration */
-struct ctf_stream_pos;
+struct stream_pos;
 
 /* Parent trace descriptor */
 struct trace_descriptor {
@@ -35,27 +36,29 @@ struct trace_descriptor {
 
 struct mmap_stream {
 	int fd;
-	struct cds_list_head list;
+	struct bt_list_head list;
 };
 
 struct mmap_stream_list {
-	struct cds_list_head head;
+	struct bt_list_head head;
 };
 
 struct format {
-	GQuark name;
+	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 (*packet_seek)(struct stream_pos *pos,
+				size_t index, int whence),
+			FILE *metadata_fp);
 	void (*close_trace)(struct trace_descriptor *descriptor);
 };
 
-extern struct format *bt_lookup_format(GQuark qname);
+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);