X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Fltt%2Fltt-private.h;h=91ee9347b59d97a0e65190e2f0df203bdd3a76bb;hb=14b1ac277816ecf66cb6906cdbc06fc992a2e279;hp=b1e69c0d267b6d87e7463e4eb81782507836bcc4;hpb=d2007fbdaf35a3299861d6d2994f0185c7b64647;p=lttv.git

diff --git a/ltt/branches/poly/ltt/ltt-private.h b/ltt/branches/poly/ltt/ltt-private.h
index b1e69c0d..91ee9347 100644
--- a/ltt/branches/poly/ltt/ltt-private.h
+++ b/ltt/branches/poly/ltt/ltt-private.h
@@ -137,15 +137,13 @@ typedef 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;
 
@@ -166,47 +164,7 @@ struct ltt_trace_header_any {
   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 {
-  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;
-  uint64_t        start_freq;
-  uint64_t        start_tsc;
-  uint64_t        start_monotonic;
-  uint64_t        start_time_sec;
-  uint64_t        start_time_usec;
-} LTT_PACKED_STRUCT;
-
-/* For version 0.8 */
-
-struct ltt_trace_header_0_8 {
+struct ltt_trace_header_1_0 {
   uint32_t        magic_number;
   uint32_t        arch_type;
   uint32_t        arch_variant;
@@ -243,6 +201,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
@@ -260,16 +219,19 @@ struct _LttType{
   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)
 };
+#endif //0
 
 /* Structure LttEvent and LttEventPosition must begin with the _exact_ same
  * fields in the exact same order. LttEventPosition is a parent of LttEvent. */
@@ -287,8 +249,7 @@ struct _LttEvent{
 
   guint32  timestamp;        /* truncated timestamp */
 
-  unsigned char facility_id;  /* facility ID are never reused. */
-  unsigned char event_id;
+  guint16 event_id;
 
   LttTime event_time;
 
@@ -314,6 +275,7 @@ struct _LttEventPosition{
 
 enum field_status { FIELD_UNKNOWN, FIELD_VARIABLE, FIELD_FIXED };
 
+#if 0
 struct _LttField{
   GQuark name;
   gchar *description;
@@ -334,7 +296,8 @@ struct _LttField{
                             // each event for sequences and arrays that
                             // contain variable length fields.
 };
-
+#endif //0
+#if 0
 struct _LttFacility{
   LttTrace  *trace;
   GQuark name;
@@ -353,6 +316,7 @@ struct _LttFacility{
   
   unsigned char exists; /* 0 does not exist, 1 exists */
 };
+#endif //0
 
 typedef struct _LttBuffer {
   void * head;
@@ -446,7 +410,6 @@ struct _LttTrace{
   uint64_t  start_monotonic;
   LttTime   start_time;
   LttTime   start_time_from_tsc;
-  GArray    *compact_facilities;
   uint8_t   compact_event_bits;
 
   GData     *tracefiles;                    //tracefiles groups