X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Fctf%2Ftypes.h;h=67b24ee4aa940cf3185bff55c57c2a127b2f2904;hb=0c880b0af719e4d58ccebe61acdd0e77a4479bfd;hp=06c130f80d8773a691b427479aa830020690b3ce;hpb=731087d8e045649286a83aa9909b8b0d79b3368d;p=babeltrace.git

diff --git a/include/babeltrace/ctf/types.h b/include/babeltrace/ctf/types.h
index 06c130f8..67b24ee4 100644
--- a/include/babeltrace/ctf/types.h
+++ b/include/babeltrace/ctf/types.h
@@ -44,15 +44,20 @@
 
 struct bt_stream_callbacks;
 
+struct packet_index_time {
+	uint64_t timestamp_begin;
+	uint64_t timestamp_end;
+};
+
 struct packet_index {
 	off_t offset;		/* offset of the packet in the file, in bytes */
 	int64_t data_offset;	/* offset of data within the packet, in bits */
 	uint64_t packet_size;	/* packet size, in bits */
 	uint64_t content_size;	/* content size, in bits */
-	uint64_t timestamp_begin;
-	uint64_t timestamp_end;
 	uint64_t events_discarded;
 	uint64_t events_discarded_len;	/* length of the field, in bits */
+	struct packet_index_time ts_cycles;	/* timestamp in cycles */
+	struct packet_index_time ts_real;	/* realtime timestamp */
 };
 
 /*
@@ -62,8 +67,7 @@ struct ctf_stream_pos {
 	struct bt_stream_pos parent;
 	int fd;			/* backing file fd. -1 if unset. */
 	FILE *index_fp;		/* backing index file fp. NULL if unset. */
-	GArray *packet_cycles_index;	/* contains struct packet_index in cycles */
-	GArray *packet_real_index;	/* contains struct packet_index in ns */
+	GArray *packet_index;	/* contains struct packet_index */
 	int prot;		/* mmap protection */
 	int flags;		/* mmap flags */
 
@@ -76,6 +80,7 @@ struct ctf_stream_pos {
 	struct mmap_align *base_mma;/* mmap base address */
 	int64_t offset;		/* offset from base, in bits. EOF for end of file. */
 	int64_t last_offset;	/* offset before the last read_event */
+	int64_t data_offset;	/* offset of data in current packet */
 	uint64_t cur_index;	/* current index in packet index */
 	uint64_t last_events_discarded;	/* last known amount of event discarded */
 	void (*packet_seek)(struct bt_stream_pos *pos, size_t index,
@@ -237,5 +242,7 @@ void ctf_pos_get_event(struct ctf_stream_pos *pos)
 
 void ctf_print_timestamp(FILE *fp, struct ctf_stream_definition *stream,
 			uint64_t timestamp);
+int ctf_append_trace_metadata(struct bt_trace_descriptor *tdp,
+			FILE *metadata_fp);
 
 #endif /* _BABELTRACE_CTF_TYPES_H */