change has_alignment for alignment

[lttv.git] / ltt / branches / poly / ltt / ltt-private.h

diff --git a/ltt/branches/poly/ltt/ltt-private.h b/ltt/branches/poly/ltt/ltt-private.h
index c37fd0b0fc7e0811875b5e4beb10da783f8e892f..c255916cb6bf5ad95c177d696e4dadffbabecd32 100644 (file)
--- a/ltt/branches/poly/ltt/ltt-private.h
+++ b/ltt/branches/poly/ltt/ltt-private.h
@@ -25,7 +25,7 @@
 #include <ltt/ltt.h>
 #include <endian.h>
 #include <ltt/event.h>
-#include <ltt/markers.h>
+#include <ltt/marker.h>
 #include <ltt/trace.h>
 
 #ifndef max
@@ -105,39 +105,6 @@ typedef guint16 uint16_t;
 typedef guint32 uint32_t;
 typedef guint64 uint64_t;
 
-/* Hardcoded facility load event : this plus an preceding "name" string */
-struct LttFacilityLoad {
-  guint32 checksum;
-  guint32 id;
-  guint32 int_size;
-  guint32 long_size;
-  guint32 pointer_size;
-  guint32 size_t_size;
-  guint32 has_alignment;
-} LTT_PACKED_STRUCT;
-
-struct LttFacilityUnload {
-  guint32 id;
-} LTT_PACKED_STRUCT;
-
-struct LttStateDumpFacilityLoad {
-  guint32 checksum;
-  guint32 id;
-  guint32 int_size;
-  guint32 long_size;
-  guint32 pointer_size;
-  guint32 size_t_size;
-  guint32  has_alignment;
-} LTT_PACKED_STRUCT;
-
-/* Empty event */
-typedef struct _TimeHeartbeat {
-} LTT_PACKED_STRUCT TimeHeartbeat;
-
-typedef struct _TimeHeartbeatFull {
-  guint64 tsc;
-} LTT_PACKED_STRUCT TimeHeartbeatFull;
-
 struct ltt_event_header_hb {
   uint32_t      timestamp;
   uint16_t      event_id;
@@ -163,7 +130,7 @@ struct ltt_trace_header_any {
   uint8_t         minor_version;
   uint8_t         flight_recorder;
   uint8_t         has_heartbeat;
-  uint8_t         has_alignment;  /* Event header alignment */
+  uint8_t         alignment;  /* Event header alignment */
   uint32_t        freq_scale;
 } LTT_PACKED_STRUCT;
 
@@ -177,7 +144,7 @@ struct ltt_trace_header_1_0 {
   uint8_t         minor_version;
   uint8_t         flight_recorder;
   uint8_t         has_heartbeat;
-  uint8_t         has_alignment;  /* Event header alignment */
+  uint8_t         alignment;  /* Event header alignment */
   uint8_t         tsc_lsb_truncate;
   uint8_t         tscbits;
   uint32_t        freq_scale;
@@ -319,7 +286,7 @@ struct LttTracefile {
   guint num_blocks;           //number of blocks in the file
   gboolean  reverse_bo;              //must we reverse byte order ?
   gboolean  float_word_order;        //what is the byte order of floats ?
-  size_t    has_alignment;           //alignment of events in the tracefile.
+  size_t    alignment;               //alignment of events in the tracefile.
                                      // 0 or the architecture size in bytes.
 
   guint8    has_heartbeat;
@@ -385,20 +352,21 @@ struct LttSystemDescription {
 //off_t get_alignment(LttField *field);
 
 /* Calculate the offset needed to align the type.
- * If has_alignment is 0, alignment is disactivated.
+ * If alignment is 0, alignment is disactivated.
  * else, the function returns the offset needed to
- * align align_drift on the has_alignment value (should be
+ * align align_drift on the alignment value (should be
  * the size of the architecture). */
 static inline unsigned int ltt_align(size_t align_drift,
           size_t size_of_type,
-          size_t has_alignment)
+          size_t alignment)
 {
-  size_t alignment = min(has_alignment, size_of_type);
+  size_t align_offset = min(alignment, size_of_type);
   
-  if(!has_alignment) return 0;
+  if(!alignment)
+    return 0;
   
   g_assert(size_of_type != 0);
-  return ((alignment - align_drift) & (alignment-1));
+  return ((align_offset - align_drift) & (align_offset-1));
 }