X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Fltt%2Fltt-private.h;h=b26d078ef16a46834c9798c9da32528ece117723;hb=a970363f31999693ffbc0d7d6cf8a15d03677d64;hp=5ffca29b3f66b3bf12daa8968b2687f5dc2196bd;hpb=c88ddec5a160400eaa2f7ee1c255d1bd1c62ffa5;p=lttv.git diff --git a/ltt/branches/poly/ltt/ltt-private.h b/ltt/branches/poly/ltt/ltt-private.h index 5ffca29b..b26d078e 100644 --- a/ltt/branches/poly/ltt/ltt-private.h +++ b/ltt/branches/poly/ltt/ltt-private.h @@ -24,7 +24,7 @@ #include #include #include - +#include #ifndef max #define max(a,b) ((a)>(b)?(a):(b)) @@ -60,88 +60,25 @@ enum ltt_core_events { LTT_EVENT_FACILITY_LOAD, LTT_EVENT_FACILITY_UNLOAD, LTT_EVENT_HEARTBEAT, + LTT_EVENT_HEARTBEAT_FULL, LTT_EVENT_STATE_DUMP_FACILITY_LOAD }; -#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; 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; - struct ltt_event_header_hb { uint32_t timestamp; - unsigned char facility_id; - unsigned char event_id; + uint16_t event_id; uint16_t event_size; } LTT_PACKED_STRUCT; struct ltt_event_header_nohb { uint64_t timestamp; - unsigned char facility_id; - unsigned char event_id; + uint16_t event_id; uint16_t event_size; } LTT_PACKED_STRUCT; @@ -158,30 +95,11 @@ 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; - -/* For version 0.3 */ - -struct ltt_trace_header_0_3 { - 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 has_heartbeat; - uint8_t has_alignment; /* Event header alignment */ - uint32_t freq_scale; -} LTT_PACKED_STRUCT; - -/* For version 0.7 */ - -struct ltt_trace_header_0_7 { +struct ltt_trace_header_1_0 { uint32_t magic_number; uint32_t arch_type; uint32_t arch_variant; @@ -191,7 +109,10 @@ struct ltt_trace_header_0_7 { 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; @@ -216,109 +137,8 @@ struct ltt_block_start_header { } LTT_PACKED_STRUCT; -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. - GArray *fields; // Array of LttFields, for array, sequence, union, struct. - GData *fields_by_name; - guint network; // Is the type in network byte order ? -}; - -struct _LttEventType{ - GQuark name; - gchar * description; - guint index; //id of the event type within the facility - LttFacility * facility; //the facility that contains the event type - GArray * fields; //event's fields (LttField) - GData *fields_by_name; -}; - -/* 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 */ - - unsigned char facility_id; /* facility ID are never reused. */ - unsigned char 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. - - 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 }; -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 - // equels 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. -}; - -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 */ -}; - typedef struct _LttBuffer { void * head; unsigned int index; @@ -342,7 +162,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 @@ -357,10 +177,18 @@ 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; size_t buffer_header_size; + int compact; //compact tracefile ? + 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 /* Current event */ LttEvent event; //Event currently accessible in the trace @@ -382,37 +210,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; - guint8 has_heartbeat; - guint32 freq_scale; - uint64_t start_freq; - uint64_t start_tsc; - uint64_t start_monotonic; - LttTime start_time; - LttTime start_time_from_tsc; - - GData *tracefiles; //tracefiles groups -}; - /* 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; @@ -440,23 +241,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)); }