fix tabs
[lttv.git] / ltt / branches / poly / ltt / ltt-private.h
index 89c5e6ce297dc6f9b1e4b9ce4cfaf87d2ad78f6e..5ffca29b3f66b3bf12daa8968b2687f5dc2196bd 100644 (file)
@@ -1,19 +1,20 @@
 /* This file is part of the Linux Trace Toolkit viewer
  * Copyright (C) 2003-2004 Xiangxiu Yang
+ *               2006 Mathieu Desnoyers
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License Version 2 as
- * published by the Free Software Foundation;
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License Version 2.1 as published by the Free Software Foundation.
  *
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
- * MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
  */
 
 #ifndef LTT_PRIVATE_H
@@ -105,11 +106,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 {
@@ -119,16 +120,15 @@ 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;
 
 struct ltt_event_header_hb {
@@ -159,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;
 
 
@@ -176,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;
@@ -192,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;
@@ -204,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;
@@ -232,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{
@@ -257,12 +251,9 @@ 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 facility_id;  /* facility ID are never reused. */
   unsigned char event_id;
 
   LttTime event_time;
@@ -356,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
@@ -363,19 +357,19 @@ 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.
 
   size_t    buffer_header_size;
 
-       /* Current event */
+  /* 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
@@ -405,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;
@@ -446,20 +440,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_alignement) 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));
 }
 
 
This page took 0.039656 seconds and 4 git commands to generate.