#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
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;
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;
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;
+ uint8_t compact_data_shift;
uint32_t freq_scale;
uint64_t start_freq;
uint64_t start_tsc;
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;
uint8_t tsc_lsb_truncate;
uint8_t tscbits;
uint8_t tsc_msb_cutoff;
+ uint8_t compact_event_bits;
uint64_t tsc_mask;
uint64_t tsc_mask_next_bit; //next MSB after the mask
//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));
}