X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=trunk%2Flttv%2Fltt%2Fltt-private.h;h=e6389ae0f84e113a965838f6c222bcc6d7affb08;hb=9aa806f6154cd8e8ab9a028902b382731f65730d;hp=b26d078ef16a46834c9798c9da32528ece117723;hpb=d5662043c1570c860ee97af8d6cdd95af95a8c50;p=lttv.git

diff --git a/trunk/lttv/ltt/ltt-private.h b/trunk/lttv/ltt/ltt-private.h
index b26d078e..e6389ae0 100644
--- a/trunk/lttv/ltt/ltt-private.h
+++ b/trunk/lttv/ltt/ltt-private.h
@@ -43,9 +43,6 @@
 
 #define LTT_PACKED_STRUCT __attribute__ ((packed))
 
-/* Hardcoded facilities */
-#define LTT_FACILITY_CORE 0
- 
 /* Byte ordering */
 #define LTT_GET_BO(t) ((t)->reverse_bo)
 
@@ -55,34 +52,11 @@
 
 #define SEQUENCE_AVG_ELEMENTS 1000
                                
-/* Hardcoded core events */
-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
-};
-
-
 typedef guint8 uint8_t;
 typedef guint16 uint16_t;
 typedef guint32 uint32_t;
 typedef guint64 uint64_t;
 
-struct ltt_event_header_hb {
-  uint32_t      timestamp;
-  uint16_t      event_id;
-  uint16_t      event_size;
-} LTT_PACKED_STRUCT;
-
-struct ltt_event_header_nohb {
-  uint64_t      timestamp;
-  uint16_t      event_id;
-  uint16_t      event_size;
-} LTT_PACKED_STRUCT;
-
-
 /* Block and trace headers */
 
 struct ltt_trace_header_any {
@@ -94,12 +68,10 @@ struct ltt_trace_header_any {
   uint8_t         major_version;
   uint8_t         minor_version;
   uint8_t         flight_recorder;
-  uint8_t         has_heartbeat;
-  uint8_t         alignment;  /* Event header alignment */
-  uint32_t        freq_scale;
+  uint8_t         alignment;    /* Architecture alignment */
 } LTT_PACKED_STRUCT;
 
-struct ltt_trace_header_1_0 {
+struct ltt_trace_header_2_0 {
   uint32_t        magic_number;
   uint32_t        arch_type;
   uint32_t        arch_variant;
@@ -108,11 +80,10 @@ struct ltt_trace_header_1_0 {
   uint8_t         major_version;
   uint8_t         minor_version;
   uint8_t         flight_recorder;
-  uint8_t         has_heartbeat;
-  uint8_t         alignment;  /* Event header alignment */
-  uint8_t         tsc_lsb_truncate;
+  uint8_t         alignment;    /* Architecture alignment */
   uint8_t         tscbits;
-  uint8_t         compact_data_shift;
+  uint8_t         eventbits;
+  uint8_t         unused1;
   uint32_t        freq_scale;
   uint64_t        start_freq;
   uint64_t        start_tsc;
@@ -121,7 +92,6 @@ struct ltt_trace_header_1_0 {
   uint64_t        start_time_usec;
 } LTT_PACKED_STRUCT;
 
-
 struct ltt_block_start_header {
   struct { 
     uint64_t                cycle_count;
@@ -180,13 +150,9 @@ struct LttTracefile {
   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;
+  uint8_t   eventbits;
   uint64_t  tsc_mask;
   uint64_t  tsc_mask_next_bit;       //next MSB after the mask
 
@@ -196,18 +162,6 @@ struct LttTracefile {
   /* Current block */
   LttBuffer buffer;                  //current buffer
   guint32 buf_size;                  /* The size of blocks */
-
-  /* Time flow */
-  //unsigned int      count;           //the number of overflow of cycle count
-  //double nsec_per_cycle;             //Nsec per cycle
-  //TimeHeartbeat * last_heartbeat;    //last heartbeat
-
-  //LttCycleCount cycles_per_nsec_reciprocal; // Optimisation for speed
-  //void * last_event_pos;
-
-  //LttTime prev_block_end_time;       //the end time of previous block
-  //LttTime prev_event_time;           //the time of the previous event
-  //LttCycleCount pre_cycle_count;     //previous cycle count of the event
 };
 
 /* The characteristics of the system on which the trace was obtained
@@ -231,18 +185,6 @@ struct LttSystemDescription {
   LttTime trace_end;
 };
 
-/*****************************************************************************
- macro for size of some data types
- *****************************************************************************/
-// alignment -> dynamic!
-
-//#define TIMESTAMP_SIZE    sizeof(guint32)
-//#define EVENT_ID_SIZE     sizeof(guint16)
-//#define EVENT_HEADER_SIZE (TIMESTAMP_SIZE + EVENT_ID_SIZE)
-
-
-//off_t get_alignment(LttField *field);
-
 /* Calculate the offset needed to align the type.
  * If alignment is 0, alignment is disactivated.
  * else, the function returns the offset needed to