X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Fltt%2Fltt-private.h;h=c37fd0b0fc7e0811875b5e4beb10da783f8e892f;hb=d27446d1c753dc4d628c3072f11e6b7581ccfcd8;hp=c7c4deef3bcdc027a5542b5f30325d99939d1874;hpb=f0b795e0b579719a95fee5f84d4dcb893044d926;p=lttv.git diff --git a/ltt/branches/poly/ltt/ltt-private.h b/ltt/branches/poly/ltt/ltt-private.h index c7c4deef..c37fd0b0 100644 --- a/ltt/branches/poly/ltt/ltt-private.h +++ b/ltt/branches/poly/ltt/ltt-private.h @@ -24,7 +24,9 @@ #include #include #include - +#include +#include +#include #ifndef max #define max(a,b) ((a)>(b)?(a):(b)) @@ -60,6 +62,7 @@ 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 }; @@ -106,11 +109,11 @@ typedef guint64 uint64_t; struct LttFacilityLoad { guint32 checksum; guint32 id; - guint32 int_size; + guint32 int_size; guint32 long_size; guint32 pointer_size; guint32 size_t_size; - guint32 has_alignment; + guint32 has_alignment; } LTT_PACKED_STRUCT; struct LttFacilityUnload { @@ -120,29 +123,30 @@ struct LttFacilityUnload { struct LttStateDumpFacilityLoad { guint32 checksum; guint32 id; - guint32 int_size; + guint32 int_size; guint32 long_size; guint32 pointer_size; guint32 size_t_size; - guint32 has_alignment; + guint32 has_alignment; } LTT_PACKED_STRUCT; +/* Empty event */ typedef struct _TimeHeartbeat { - LttTime time; //Time stamp of this block - uint64_t cycle_count; //cycle count of the event } LTT_PACKED_STRUCT TimeHeartbeat; +typedef struct _TimeHeartbeatFull { + guint64 tsc; +} LTT_PACKED_STRUCT TimeHeartbeatFull; + 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; @@ -160,29 +164,10 @@ struct ltt_trace_header_any { 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.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; + 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; @@ -193,6 +178,8 @@ struct ltt_trace_header_0_7 { uint8_t flight_recorder; uint8_t has_heartbeat; uint8_t has_alignment; /* Event header alignment */ + uint8_t tsc_lsb_truncate; + uint8_t tscbits; uint32_t freq_scale; uint64_t start_freq; uint64_t start_tsc; @@ -217,6 +204,7 @@ 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 @@ -224,62 +212,33 @@ struct _LttType{ 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 ? + 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 - LttFacility * facility; //the facility that contains the event type + 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) }; - -/* 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 */ -}; - +#endif //0 enum field_status { FIELD_UNKNOWN, FIELD_VARIABLE, FIELD_FIXED }; +#if 0 struct _LttField{ GQuark name; gchar *description; @@ -293,14 +252,15 @@ struct _LttField{ // (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. + // 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; @@ -319,6 +279,7 @@ struct _LttFacility{ unsigned char exists; /* 0 does not exist, 1 exists */ }; +#endif //0 typedef struct _LttBuffer { void * head; @@ -343,11 +304,14 @@ 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 guint cpu_num; //cpu number of the tracefile + guint tid; //Usertrace tid, else 0 + guint pgid; //Usertrace pgid, else 0 + guint64 creation; //Usertrace creation, else 0 LttTrace * trace; //trace containing the tracefile int fd; //file descriptor off_t file_size; //file size @@ -355,19 +319,26 @@ 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. - // 0 or the architecture size in bytes. + size_t has_alignment; //alignment of events in the tracefile. + // 0 or the architecture size in bytes. + guint8 has_heartbeat; size_t buffer_header_size; - - /* Current event */ + int compact; //compact tracefile ? + uint8_t tsc_lsb_truncate; + uint8_t tscbits; + uint8_t tsc_msb_cutoff; + 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 - /* Current block */ + /* Current block */ LttBuffer buffer; //current buffer guint32 buf_size; /* The size of blocks */ - /* Time flow */ + /* Time flow */ //unsigned int count; //the number of overflow of cycle count //double nsec_per_cycle; //Nsec per cycle //TimeHeartbeat * last_heartbeat; //last heartbeat @@ -380,37 +351,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; @@ -438,20 +382,23 @@ struct _LttSystemDescription { //#define EVENT_HEADER_SIZE (TIMESTAMP_SIZE + EVENT_ID_SIZE) +//off_t get_alignment(LttField *field); + /* Calculate the offset needed to align the type. * If has_alignment is 0, alignment is disactivated. * else, the function returns the offset needed to * align align_drift on the has_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 size_of_type, + size_t has_alignment) { - size_t alignment = min(has_alignment, size_of_type); - - if(!has_alignment) return 0; - - return ((alignment - align_drift) & (alignment-1)); + size_t alignment = min(has_alignment, size_of_type); + + if(!has_alignment) return 0; + + g_assert(size_of_type != 0); + return ((alignment - align_drift) & (alignment-1)); }