X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Fltt%2Fltt-private.h;h=b26d078ef16a46834c9798c9da32528ece117723;hb=a970363f31999693ffbc0d7d6cf8a15d03677d64;hp=5f6d3e112bc9c031d780a36c859576253c6af35f;hpb=2e13d6afdf079eaa03549ae6c8f4ccf3be90e0d2;p=lttv.git diff --git a/ltt/branches/poly/ltt/ltt-private.h b/ltt/branches/poly/ltt/ltt-private.h index 5f6d3e11..b26d078e 100644 --- a/ltt/branches/poly/ltt/ltt-private.h +++ b/ltt/branches/poly/ltt/ltt-private.h @@ -25,8 +25,6 @@ #include #include #include -#include -#include #ifndef max #define max(a,b) ((a)>(b)?(a):(b)) @@ -67,39 +65,6 @@ enum ltt_core_events { }; -#if 0 -/* enumeration definition */ - -typedef enum _BuildinEvent{ - TRACE_FACILITY_LOAD = 0, - TRACE_BLOCK_START = 17, - TRACE_BLOCK_END = 18, - TRACE_TIME_HEARTBEAT= 19 -} BuildinEvent; - - -/* structure definition */ - -typedef struct _FacilityLoad{ - gchar * name; - LttChecksum checksum; - guint32 base_code; -} LTT_PACKED_STRUCT FacilityLoad; - -typedef struct _BlockStart { - LttTime time; //Time stamp of this block - LttCycleCount cycle_count; //cycle count of the event - guint32 block_id; //block id -} LTT_PACKED_STRUCT BlockStart; - -typedef struct _BlockEnd { - LttTime time; //Time stamp of this block - LttCycleCount cycle_count; //cycle count of the event - guint32 block_id; //block id -} LTT_PACKED_STRUCT BlockEnd; -#endif //0 - - typedef guint8 uint8_t; typedef guint16 uint16_t; typedef guint32 uint32_t; @@ -130,7 +95,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; @@ -144,9 +109,10 @@ 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; + uint8_t compact_data_shift; uint32_t freq_scale; uint64_t start_freq; uint64_t start_tsc; @@ -171,83 +137,8 @@ struct ltt_block_start_header { } LTT_PACKED_STRUCT; -#if 0 -struct _LttType{ -// LTTV does not care about type names. Everything is a field. -// GQuark type_name; //type name if it is a named type - gchar * fmt; - guint size; - LttTypeEnum type_class; //which type - GHashTable *enum_map; //maps enum labels to numbers. - gint32 highest_value; //For enum - gint32 lowest_value; //For enum - GArray *fields; // Array of LttFields, for array, sequence, union, struct. - GData *fields_by_name; - guint network; // Is the type in network byte order ? - //part added by gaby for fmt: - char *header; - char *separator; - char *footer; -}; -#endif //0 - -#if 0 -struct _LttEventType{ - GQuark name; - gchar * description; - guint index; //id of the event type within the facility - struct marker_info *info; - GArray * fields; //event's fields (LttField) - GData *fields_by_name; - int has_compact_data; //event header contains compact data (first field) -}; -#endif //0 - enum field_status { FIELD_UNKNOWN, FIELD_VARIABLE, FIELD_FIXED }; -#if 0 -struct _LttField{ - GQuark name; - gchar *description; - LttType field_type; //field type - - off_t offset_root; //offset from the root - enum field_status fixed_root; //offset fixed according to the root - - guint field_size; // size of the field - // Only if field type size is set to 0 - // (it's variable), then the field_size should be - // dynamically calculated while reading the trace - // and put here. Otherwise, the field_size always - // equals the type size. - off_t array_offset; // offset of the beginning of the array (for array - // and sequences) - GArray * dynamic_offsets; // array of offsets calculated dynamically at - // each event for sequences and arrays that - // contain variable length fields. -}; -#endif //0 -#if 0 -struct _LttFacility{ - LttTrace *trace; - GQuark name; - guint32 checksum; //checksum of the facility - guint32 id; //id of the facility - - guint32 int_size; - guint32 long_size; - guint32 pointer_size; - guint32 size_t_size; - guint32 alignment; - - GArray *events; - GData *events_by_name; - // not necessary in LTTV GData *named_types; - - unsigned char exists; /* 0 does not exist, 1 exists */ -}; -#endif //0 - typedef struct _LttBuffer { void * head; unsigned int index; @@ -286,7 +177,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; @@ -295,6 +186,7 @@ struct LttTracefile { 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 @@ -352,20 +244,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)); }