Handle negative time and offset from Epoch

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

diff --git a/include/babeltrace/format.h b/include/babeltrace/format.h
index fa0e3251ad839973685816ede43a0183b6664289..c9b84a6f59abf1c4462778a955b37a8b41c5bb2e 100644 (file)
--- a/include/babeltrace/format.h
+++ b/include/babeltrace/format.h
@@ -44,48 +44,48 @@ typedef int bt_intern_str;
 struct bt_stream_pos;
 struct bt_context;
 struct bt_trace_handle;
+struct bt_trace_descriptor;
 
-/* Parent trace descriptor */
-struct trace_descriptor {
-};
-
-struct mmap_stream {
+struct bt_mmap_stream {
        int fd;
        struct bt_list_head list;
+       void *priv;
 };
 
-struct mmap_stream_list {
+struct bt_mmap_stream_list {
        struct bt_list_head head;
 };
 
-struct format {
+struct bt_format {
        bt_intern_str name;
 
-       struct trace_descriptor *(*open_trace)(const char *path, int flags,
+       struct bt_trace_descriptor *(*open_trace)(const char *path, int flags,
                        void (*packet_seek)(struct bt_stream_pos *pos,
                                size_t index, int whence),
                        FILE *metadata_fp);
-       struct trace_descriptor *(*open_mmap_trace)(
-                       struct mmap_stream_list *mmap_list,
+       struct bt_trace_descriptor *(*open_mmap_trace)(
+                       struct bt_mmap_stream_list *mmap_list,
                        void (*packet_seek)(struct bt_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,
+       int (*close_trace)(struct bt_trace_descriptor *descriptor);
+       void (*set_context)(struct bt_trace_descriptor *descriptor,
                        struct bt_context *ctx);
-       void (*set_handle)(struct trace_descriptor *descriptor,
+       void (*set_handle)(struct bt_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);
+       int (*timestamp_begin)(struct bt_trace_descriptor *descriptor,
+                       struct bt_trace_handle *handle, enum bt_clock_type type,
+                       int64_t *timestamp);
+       int (*timestamp_end)(struct bt_trace_descriptor *descriptor,
+                       struct bt_trace_handle *handle, enum bt_clock_type type,
+                       int64_t *timestamp);
+       int (*convert_index_timestamp)(struct bt_trace_descriptor *descriptor);
 };
 
-extern struct format *bt_lookup_format(bt_intern_str qname);
+extern struct bt_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);
+extern int bt_register_format(struct bt_format *format);
+extern void bt_unregister_format(struct bt_format *format);
 
 #ifdef __cplusplus
 }