X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Fformat.h;h=dea8e0e5431e71d69e53df24fc97f1ed753bc18c;hb=b7b61ced2a4d4e3222640ad20e6655cb4379c012;hp=c50b28dc330b8c81c23aefb4133829974b2f7cce;hpb=01c76b246be85b5d9c8e99813950fb194c9f714f;p=babeltrace.git

diff --git a/include/babeltrace/format.h b/include/babeltrace/format.h
index c50b28dc..dea8e0e5 100644
--- a/include/babeltrace/format.h
+++ b/include/babeltrace/format.h
@@ -19,28 +19,74 @@
  *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  */
 
-#include <babeltrace/types.h>
+#include <babeltrace/list.h>
+#include <babeltrace/clock-types.h>
 #include <stdint.h>
 #include <stdio.h>
-#include <glib.h>
 
-/* Parent trace descriptor */
-struct trace_descriptor {
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef int bt_intern_str;
+
+/* forward declaration */
+struct bt_stream_pos;
+struct bt_context;
+struct bt_trace_handle;
+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 {
-	GQuark name;
+struct bt_format {
+	bt_intern_str name;
 
-	struct trace_descriptor *(*open_trace)(const char *path, int flags);
-	void (*close_trace)(struct trace_descriptor *descriptor);
+	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 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 bt_trace_descriptor *descriptor);
+	void (*set_context)(struct bt_trace_descriptor *descriptor,
+			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 (*convert_index_timestamp)(struct bt_trace_descriptor *descriptor);
 };
 
-extern struct format *bt_lookup_format(GQuark 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 int bt_register_format(struct bt_format *format);
+extern void bt_unregister_format(struct bt_format *format);
 
-/* TBD: format unregistration */
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* _BABELTRACE_FORMAT_H */