X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;ds=sidebyside;f=include%2Fbabeltrace%2Fformat.h;h=c9b84a6f59abf1c4462778a955b37a8b41c5bb2e;hb=61cf588beae752e5ddfc60b6b5310f769ac9e852;hp=8d4ac4b290a794af51af64006e029c80343015f2;hpb=c150f912b9a128f830d7a0fe42141ae1c9bec1ae;p=babeltrace.git

diff --git a/include/babeltrace/format.h b/include/babeltrace/format.h
index 8d4ac4b2..c9b84a6f 100644
--- a/include/babeltrace/format.h
+++ b/include/babeltrace/format.h
@@ -44,21 +44,19 @@ typedef int bt_intern_str;
 struct bt_stream_pos;
 struct bt_context;
 struct bt_trace_handle;
-
-/* Parent trace descriptor */
-struct bt_trace_descriptor {
-};
+struct bt_trace_descriptor;
 
 struct bt_mmap_stream {
 	int fd;
 	struct bt_list_head list;
+	void *priv;
 };
 
 struct bt_mmap_stream_list {
 	struct bt_list_head head;
 };
 
-struct format {
+struct bt_format {
 	bt_intern_str name;
 
 	struct bt_trace_descriptor *(*open_trace)(const char *path, int flags,
@@ -75,17 +73,19 @@ struct format {
 			struct bt_context *ctx);
 	void (*set_handle)(struct bt_trace_descriptor *descriptor,
 			struct bt_trace_handle *handle);
-	uint64_t (*timestamp_begin)(struct bt_trace_descriptor *descriptor,
-			struct bt_trace_handle *handle, enum bt_clock_type type);
-	uint64_t (*timestamp_end)(struct bt_trace_descriptor *descriptor,
-			struct bt_trace_handle *handle, enum bt_clock_type type);
+	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
 }