X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=trunk%2Flttv%2Fltt%2Fltt-private.h;h=24e82f291e25949da8a6ae7b3dd76fb1e6157b3b;hb=e0c7c4004c56c9ad749889225f9b53aedc01fb30;hp=e6389ae0f84e113a965838f6c222bcc6d7affb08;hpb=9aa806f6154cd8e8ab9a028902b382731f65730d;p=lttv.git

diff --git a/trunk/lttv/ltt/ltt-private.h b/trunk/lttv/ltt/ltt-private.h
index e6389ae0..24e82f29 100644
--- a/trunk/lttv/ltt/ltt-private.h
+++ b/trunk/lttv/ltt/ltt-private.h
@@ -41,71 +41,65 @@
 
 #define NSEC_PER_USEC 1000
 
-#define LTT_PACKED_STRUCT __attribute__ ((packed))
-
 /* Byte ordering */
 #define LTT_GET_BO(t) ((t)->reverse_bo)
 
-#define LTT_HAS_FLOAT(t) ((t)->float_word_order!=0)
+#define LTT_HAS_FLOAT(t) ((t)->float_word_order ! =0)
 #define LTT_GET_FLOAT_BO(t) \
-  (((t)->float_word_order==__BYTE_ORDER)?0:1)
+  (((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;
 
-/* Block and trace headers */
-
-struct ltt_trace_header_any {
-  uint32_t        magic_number;
-  uint32_t        arch_type;
-  uint32_t        arch_variant;
-  uint32_t        float_word_order;
-  uint8_t         arch_size;
-  uint8_t         major_version;
-  uint8_t         minor_version;
-  uint8_t         flight_recorder;
-  uint8_t         alignment;    /* Architecture alignment */
-} LTT_PACKED_STRUCT;
-
-struct ltt_trace_header_2_0 {
-  uint32_t        magic_number;
-  uint32_t        arch_type;
-  uint32_t        arch_variant;
-  uint32_t        float_word_order;
-  uint8_t         arch_size;
-  uint8_t         major_version;
-  uint8_t         minor_version;
-  uint8_t         flight_recorder;
-  uint8_t         alignment;    /* Architecture alignment */
-  uint8_t         tscbits;
-  uint8_t         eventbits;
-  uint8_t         unused1;
-  uint32_t        freq_scale;
-  uint64_t        start_freq;
-  uint64_t        start_tsc;
-  uint64_t        start_monotonic;
-  uint64_t        start_time_sec;
-  uint64_t        start_time_usec;
-} LTT_PACKED_STRUCT;
-
-struct ltt_block_start_header {
-  struct { 
-    uint64_t                cycle_count;
-    uint64_t                freq;
-  } begin;
-  struct {
-    uint64_t                cycle_count;
-    uint64_t                freq;
-  } end;
-  uint32_t                lost_size;  /* Size unused at the end of the buffer */
-  uint32_t                buf_size;   /* The size of this sub-buffer */
-  struct ltt_trace_header_any trace[0];
-} LTT_PACKED_STRUCT;
+/* Subbuffer header */
+struct ltt_subbuffer_header_2_1 {
+	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.
+					 * contains endianness information.
+					 */
+	uint8_t major_version;
+	uint8_t minor_version;
+	uint8_t arch_size;		/* Architecture pointer size */
+	uint8_t alignment;		/* LTT data alignment */
+	uint64_t start_time_sec;	/* NTP-corrected start time */
+	uint64_t start_time_usec;
+	uint64_t start_freq;		/*
+					 * Frequency at trace start,
+					 * used all along the trace.
+					 */
+	uint32_t freq_scale;		/* Frequency scaling */
+	uint32_t lost_size;		/* Size unused at end of subbuffer */
+	uint32_t buf_size;		/* Size of this subbuffer */
+	char header_end[0];		/* End of header */
+};
+
+typedef struct ltt_subbuffer_header_2_1 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 };
 
@@ -128,7 +122,6 @@ typedef struct _LttBuffer {
   /* Timekeeping */
   uint64_t                tsc;       /* Current timestamp counter */
   uint64_t                freq; /* Frequency in khz */
-  //double                  nsecs_per_cycle;  /* Precalculated from freq */
   guint32                 cyc2ns_scale;
 } LttBuffer;