X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Fltt%2Fltt-private.h;h=3cbb9bf26380f8f10bd19e2695c60099b966c12f;hb=4d4528813f83afd049d937aea321b10f9598185e;hp=91ee9347b59d97a0e65190e2f0df203bdd3a76bb;hpb=14b1ac277816ecf66cb6906cdbc06fc992a2e279;p=lttv.git diff --git a/ltt/branches/poly/ltt/ltt-private.h b/ltt/branches/poly/ltt/ltt-private.h index 91ee9347..3cbb9bf2 100644 --- a/ltt/branches/poly/ltt/ltt-private.h +++ b/ltt/branches/poly/ltt/ltt-private.h @@ -24,6 +24,9 @@ #include #include #include +#include +#include +#include #ifndef max #define max(a,b) ((a)>(b)?(a):(b)) @@ -102,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; @@ -160,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; @@ -174,9 +144,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; @@ -233,46 +204,6 @@ struct _LttEventType{ }; #endif //0 -/* Structure LttEvent and LttEventPosition must begin with the _exact_ same - * fields in the exact same order. LttEventPosition is a parent of LttEvent. */ -struct _LttEvent{ - - /* Begin of LttEventPosition fields */ - LttTracefile *tracefile; - unsigned int block; - unsigned int offset; - - /* Timekeeping */ - uint64_t tsc; /* Current timestamp counter */ - - /* End of LttEventPosition fields */ - - guint32 timestamp; /* truncated timestamp */ - - guint16 event_id; - - LttTime event_time; - - void * data; //event data - guint data_size; - guint event_size; //event_size field of the header : - //used to verify data_size from facility. - uint32_t compact_data; - - int count; //the number of overflow of cycle count - gint64 overflow_nsec; //precalculated nsec for overflows -}; - -struct _LttEventPosition{ - LttTracefile *tracefile; - unsigned int block; - unsigned int offset; - - /* Timekeeping */ - uint64_t tsc; /* Current timestamp counter */ -}; - - enum field_status { FIELD_UNKNOWN, FIELD_VARIABLE, FIELD_FIXED }; #if 0 @@ -341,7 +272,7 @@ typedef struct _LttBuffer { guint32 cyc2ns_scale; } LttBuffer; -struct _LttTracefile{ +struct LttTracefile { gboolean cpu_online; //is the cpu online ? GQuark long_name; //tracefile complete filename GQuark name; //tracefile name @@ -356,7 +287,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; @@ -365,6 +296,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 @@ -388,40 +320,10 @@ struct _LttTracefile{ //LttCycleCount pre_cycle_count; //previous cycle count of the event }; -struct _LttTrace{ - GQuark pathname; //the pathname of the trace - //LttSystemDescription * system_description;//system description - - GArray *facilities_by_num; /* fac_id as index in array */ - GData *facilities_by_name; /* fac name (GQuark) as index */ - /* Points to array of fac_id of all the - * facilities that has this name. */ - guint num_cpu; - - guint32 arch_type; - guint32 arch_variant; - guint8 arch_size; - guint8 ltt_major_version; - guint8 ltt_minor_version; - guint8 flight_recorder; - guint32 freq_scale; - uint64_t start_freq; - uint64_t start_tsc; - uint64_t start_monotonic; - LttTime start_time; - LttTime start_time_from_tsc; - uint8_t compact_event_bits; - - GData *tracefiles; //tracefiles groups - /* Support for markers */ - GArray *markers; //indexed by marker ID - GHashTable *markers_hash; //indexed by name hash -}; - /* The characteristics of the system on which the trace was obtained is described in a LttSystemDescription structure. */ -struct _LttSystemDescription { +struct LttSystemDescription { gchar *description; gchar *node_name; gchar *domain_name; @@ -449,23 +351,24 @@ struct _LttSystemDescription { //#define EVENT_HEADER_SIZE (TIMESTAMP_SIZE + EVENT_ID_SIZE) -off_t get_alignment(LttField *field); +//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)); }