Get rid of clock-raw and use real clock

[babeltrace.git] / include / babeltrace / format.h

diff --git a/include/babeltrace/format.h b/include/babeltrace/format.h
index 93d1e25146495920c40537b942d556b54541391c..4ace0b04563067a56187063299a3bc3679995a93 100644 (file)
--- a/include/babeltrace/format.h
+++ b/include/babeltrace/format.h
@@ -21,13 +21,17 @@
  * all copies or substantial portions of the Software.
  */
 
-#include <babeltrace/types.h>
+#include <babeltrace/list.h>
+#include <babeltrace/clock-types.h>
 #include <stdint.h>
 #include <stdio.h>
-#include <glib.h>
+
+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 {
@@ -35,28 +39,38 @@ 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 *collection_path,
-                       const char *path, int flags,
-                       void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset,
-                               int whence), FILE *metadata_fp);
+       struct trace_descriptor *(*open_trace)(const char *path, int flags,
+                       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);
+       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(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);