complete compact facility

git-svn-id: http://ltt.polymtl.ca/svn@2425 04897980-b3bd-0310-b5e0-8ef037075253

diff --git a/ltt-control/facilities/compact.xml b/ltt-control/facilities/compact.xml
index 822e14ee8392d0846bd532f1092d6d72403cc1f3..e48ae33f218d4a2cddfa33a098e0141ee5b857ee 100644 (file)
--- a/ltt-control/facilities/compact.xml
+++ b/ltt-control/facilities/compact.xml
@@ -1,7 +1,22 @@
 <?xml version="1.0"?>
-<facility name="compact">
+<facility name="compact" align="0">
   <description>The compact facility contains high rate compact events.</description>
 
+  <event name="time_heartbeat" scope="tracefile">
+    <description>System time values sent periodically to detect cycle counter
+     rollovers. Useful when only the 32 LSB of the TSC are saved in events
+     header : we save the full 64 bits in this event. Put here for core.xml
+     facility compatibility.
+    </description>
+  </event>
+
+  <event name="time_heartbeat_full" scope="tracefile" scope="trace" attribute="force">
+    <description>System time, full 64 bits TSC. Saved before trace restart.
+    Forced write, even if trace is stopped.
+    </description>
+               <field name="tsc"><uint_fixed size="8"/></field>
+  </event>
+
   <event name="event_a">
     <description>Compact event with no data</description>
   </event>
@@ -16,4 +31,16 @@
     <field name="data1"> <uint_fixed size="8"/> </field>
   </event>
 
+  <event name="event_d" attribute="compact_data">
+    <description>Compact data event</description>
+    <field name="data1"> <uint_fixed size="4"/> </field>
+  </event>
+
+  <event name="event_e" attribute="compact_data">
+    <description>Compact data event</description>
+    <field name="data1"> <uint_fixed size="4"/> </field>
+    <field name="data2"> <uint_fixed size="8"/> </field>
+  </event>
+
+
 </facility>

diff --git a/ltt-control/facilities/core.xml b/ltt-control/facilities/core.xml
index 20f6bb43ebb40a5e179477ad90f1ceb881333abd..b38c6a63154a837cecf38fdc98eb25981f34ae95 100644 (file)
--- a/ltt-control/facilities/core.xml
+++ b/ltt-control/facilities/core.xml
@@ -5,18 +5,18 @@
   <event name="facility_load">
     <description>Facility is loaded</description>
                <field name="name"><string/></field>
-               <field name="checksum"><uint size="4"/></field>
-               <field name="id"><uint size="4"/></field>
-               <field name="int_size"><uint size="4"/></field>
-               <field name="long_size"><uint size="4"/></field>
-               <field name="pointer_size"><uint size="4"/></field>
-               <field name="size_t_size"><uint size="4"/></field>
-               <field name="has_alignment"><uint size="4"/></field>
+               <field name="checksum"><uint_fixed size="4"/></field>
+               <field name="id"><uint_fixed size="4"/></field>
+               <field name="int_size"><uint_fixed size="4"/></field>
+               <field name="long_size"><uint_fixed size="4"/></field>
+               <field name="pointer_size"><uint_fixed size="4"/></field>
+               <field name="size_t_size"><uint_fixed size="4"/></field>
+               <field name="has_alignment"><uint_fixed size="4"/></field>
   </event>
 
   <event name="facility_unload">
     <description>Facility is unloaded</description>
-    <field name="id"><uint size="4"/></field>
+    <field name="id"><uint_fixed size="4"/></field>
   </event>
 
   <event name="time_heartbeat" scope="tracefile">
@@ -25,17 +25,24 @@
      header : we save the full 64 bits in this event.
     </description>
   </event>
-  
+
+   <event name="time_heartbeat_full" scope="tracefile" scope="trace" attribute="force">
+    <description>System time, full 64 bits TSC. Saved before trace restart.
+    Forced write, even if trace is stopped.
+    </description>
+               <field name="tsc"><uint_fixed size="8"/></field>
+  </event>
+ 
   <event name="state_dump_facility_load" scope="trace">
     <description>Facility is loaded while in state dump</description>
                <field name="name"><string/></field>
-               <field name="checksum"><uint size="4"/></field>
-               <field name="id"><uint size="4"/></field>
-               <field name="int_size"><uint size="4"/></field>
-               <field name="long_size"><uint size="4"/></field>
-               <field name="pointer_size"><uint size="4"/></field>
-               <field name="size_t_size"><uint size="4"/></field>
-               <field name="has_alignment"><uint size="4"/></field>
+               <field name="checksum"><uint_fixed size="4"/></field>
+               <field name="id"><uint_fixed size="4"/></field>
+               <field name="int_size"><uint_fixed size="4"/></field>
+               <field name="long_size"><uint_fixed size="4"/></field>
+               <field name="pointer_size"><uint_fixed size="4"/></field>
+               <field name="size_t_size"><uint_fixed size="4"/></field>
+               <field name="has_alignment"><uint_fixed size="4"/></field>
   </event>
 
 </facility>