X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=trunk%2Flttv%2Fltt%2Fltt-private.h;h=797c57ca183e1c8b403ccd2ccc08115255b26843;hb=9c1292dbe77fa62cbb0ef2461ef125301de857f6;hp=1233b8fe8afa9d06e6602206e0ea682c40042506;hpb=64dd41a5e4653a36bd966e1badbe2c3d78b66ef1;p=lttv.git

diff --git a/trunk/lttv/ltt/ltt-private.h b/trunk/lttv/ltt/ltt-private.h
index 1233b8fe..797c57ca 100644
--- a/trunk/lttv/ltt/ltt-private.h
+++ b/trunk/lttv/ltt/ltt-private.h
@@ -49,17 +49,28 @@
   (((t)->float_word_order == __BYTE_ORDER) ? 0 : 1)
 
 #define SEQUENCE_AVG_ELEMENTS 1000
-                               
+ 
+/*
+ * offsetof taken from Linux kernel.
+ */
+#undef offsetof
+#ifdef __compiler_offsetof
+#define offsetof(TYPE,MEMBER) __compiler_offsetof(TYPE,MEMBER)
+#else
+#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
+#endif
+
 typedef guint8 uint8_t;
 typedef guint16 uint16_t;
 typedef guint32 uint32_t;
 typedef guint64 uint64_t;
 
 /* Subbuffer header */
-struct ltt_subbuffer_header_2_0 {
+struct ltt_subbuffer_header_2_3 {
 	uint64_t cycle_count_begin;	/* Cycle count at subbuffer start */
 	uint64_t cycle_count_end;	/* Cycle count at subbuffer end */
-	uint32_t magic_number;		/* Trace magic number.
+	uint32_t magic_number;		/*
+					 * Trace magic number.
 					 * contains endianness information.
 					 */
 	uint8_t major_version;
@@ -72,12 +83,33 @@ struct ltt_subbuffer_header_2_0 {
 					 * Frequency at trace start,
 					 * used all along the trace.
 					 */
-	uint32_t freq_scale;		/* Frequency scaling */
+	uint32_t freq_scale;		/* Frequency scaling (divide freq) */
 	uint32_t lost_size;		/* Size unused at end of subbuffer */
 	uint32_t buf_size;		/* Size of this subbuffer */
+	uint32_t events_lost;		/*
+					 * Events lost in this subbuffer since
+					 * the beginning of the trace.
+					 * (may overflow)
+					 */
+	uint32_t subbuf_corrupt;	/*
+					 * Corrupted (lost) subbuffers since
+					 * the begginig of the trace.
+					 * (may overflow)
+					 */
+	char header_end[0];		/* End of header */
 };
 
-typedef struct ltt_subbuffer_header_2_0 ltt_subbuffer_header_t;
+typedef struct ltt_subbuffer_header_2_3 ltt_subbuffer_header_t;
+
+/*
+ * Return header size without padding after the structure. Don't use packed
+ * structure because gcc generates inefficient code on some architectures
+ * (powerpc, mips..)
+ */
+static inline size_t ltt_subbuffer_header_size(void)
+{
+	return offsetof(ltt_subbuffer_header_t, header_end);
+}
 
 enum field_status { FIELD_UNKNOWN, FIELD_VARIABLE, FIELD_FIXED };
 
@@ -112,6 +144,7 @@ struct LttTracefile {
   guint pgid;                         //Usertrace pgid, else 0
   guint64 creation;                   //Usertrace creation, else 0
   LttTrace * trace;                  //trace containing the tracefile
+  struct marker_data *mdata;         // marker id/name/fields mapping
   int fd;                            //file descriptor 
   off_t file_size;                   //file size
   //unsigned block_size;               //block_size
@@ -125,7 +158,9 @@ struct LttTracefile {
   uint8_t   tscbits;
   uint8_t   eventbits;
   uint64_t  tsc_mask;
-  uint64_t  tsc_mask_next_bit;       //next MSB after the mask
+  uint64_t  tsc_mask_next_bit;       //next MSB after the mask<
+  uint32_t  events_lost;
+  uint32_t  subbuf_corrupt;
 
   /* Current event */
   LttEvent event;                    //Event currently accessible in the trace