X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Fltt%2Fltt-private.h;h=eceadc437c36f12879912ccb0fb109c889839add;hb=ae3d0f50f89e7b965795a9b9ad7e1f533f760598;hp=57f0063e6f7126278ea8827d5f61d7f21220c976;hpb=1b44b0b5729fbc82eab287323dc14d12c028dd44;p=lttv.git

diff --git a/ltt/branches/poly/ltt/ltt-private.h b/ltt/branches/poly/ltt/ltt-private.h
index 57f0063e..eceadc43 100644
--- a/ltt/branches/poly/ltt/ltt-private.h
+++ b/ltt/branches/poly/ltt/ltt-private.h
@@ -127,9 +127,8 @@ struct LttStateDumpFacilityLoad {
 	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;
 
 struct ltt_event_header_hb {
@@ -160,7 +159,7 @@ struct ltt_trace_header_any {
   uint8_t         flight_recorder;
   uint8_t         has_heartbeat;
   uint8_t         has_alignment;  /* Event header alignment */
-	uint8_t			    has_tsc;
+	uint32_t			  freq_scale;
 } LTT_PACKED_STRUCT;
 
 
@@ -177,12 +176,12 @@ struct ltt_trace_header_0_3 {
   uint8_t         flight_recorder;
   uint8_t         has_heartbeat;
   uint8_t         has_alignment;  /* Event header alignment */
-	uint8_t				 has_tsc;
+	uint32_t				freq_scale;
 } LTT_PACKED_STRUCT;
 
-/* For version 0.6 */
+/* For version 0.7 */
 
-struct ltt_trace_header_0_6 {
+struct ltt_trace_header_0_7 {
   uint32_t        magic_number;
   uint32_t        arch_type;
   uint32_t        arch_variant;
@@ -193,11 +192,10 @@ struct ltt_trace_header_0_6 {
   uint8_t         flight_recorder;
   uint8_t         has_heartbeat;
   uint8_t         has_alignment;  /* Event header alignment */
-  uint8_t         has_tsc;
+  uint32_t        freq_scale;
   uint64_t        start_freq;
   uint64_t        start_tsc;
   uint64_t        start_monotonic;
-  //struct timespec start_time; // not portable
   uint64_t        start_time_sec;
   uint64_t        start_time_usec;
 } LTT_PACKED_STRUCT;
@@ -205,16 +203,10 @@ struct ltt_trace_header_0_6 {
 
 struct ltt_block_start_header {
   struct { 
-    //struct timeval          timestamp;
-    uint64_t                timestamp_sec;
-    uint64_t                timestamp_usec;
     uint64_t                cycle_count;
     uint64_t                freq;
   } begin;
   struct {
-    //struct timeval          timestamp;
-    uint64_t                timestamp_sec;
-    uint64_t                timestamp_usec;
     uint64_t                cycle_count;
     uint64_t                freq;
   } end;
@@ -233,6 +225,7 @@ struct _LttType{
   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{
@@ -258,10 +251,7 @@ struct _LttEvent{
   
   /* End of LttEventPosition fields */
 
-	union {											/* choice by trace has_tsc */
-	  guint32  timestamp;				/* truncated timestamp */
-  	LttTime  delta;
-	} time;
+  guint32  timestamp;				/* truncated timestamp */
 
   unsigned char facility_id;	/* facility ID are never reused. */
   unsigned char event_id;
@@ -357,6 +347,9 @@ struct _LttTracefile{
   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
@@ -406,7 +399,7 @@ struct _LttTrace{
   guint8    ltt_minor_version;
   guint8    flight_recorder;
   guint8    has_heartbeat;
-	guint8		has_tsc;
+	guint32		freq_scale;
   uint64_t  start_freq;
   uint64_t  start_tsc;
   uint64_t  start_monotonic;