From: yangxx <yangxx@04897980-b3bd-0310-b5e0-8ef037075253>
Date: Wed, 30 Jul 2003 20:31:15 +0000 (+0000)
Subject: git-svn-id: http://ltt.polymtl.ca/svn@149 04897980-b3bd-0310-b5e0-8ef037075253
X-Git-Tag: v0.12.20~3340
X-Git-Url: https://git.lttng.org/?a=commitdiff_plain;h=092b71180bd470e1f080daec24284d22a322b3fc;hp=dd27264637553ee7d8ae9443dd9e8bdf442a2e04;p=lttv.git

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

diff --git a/ltt/branches/yangxx/convert/convert.c b/ltt/branches/yangxx/convert/convert.c
index 67ee2630..2b79d5d5 100644
--- a/ltt/branches/yangxx/convert/convert.c
+++ b/ltt/branches/yangxx/convert/convert.c
@@ -384,6 +384,9 @@ int main(int argc, char ** argv){
       }
       evId = *(uint8_t *)cur_pos;
       newId = evId;
+      if(evId == TRACE_HEARTBEAT) {
+	newId = 19;
+      }
       cur_pos += sizeof(uint8_t);
       time_delta = *(uint32_t*)cur_pos;
       cur_pos += sizeof(uint32_t); 
diff --git a/ltt/branches/yangxx/convert/core.xml b/ltt/branches/yangxx/convert/core.xml
index 261160af..c7c2449b 100644
--- a/ltt/branches/yangxx/convert/core.xml
+++ b/ltt/branches/yangxx/convert/core.xml
@@ -1,6 +1,15 @@
 <facility name=core>
   <description>The core facility contains the basic events</description>
 
+  <event name=facility_load>
+    <description>Facility used in the trace</description>
+    <struct>
+      <field name="name"><string/></field>
+      <field name="checksum"><uint size=4/></field>
+      <field name="base_code"><uint size=4/></field>
+    </struct>
+  </event>
+
   <event name=syscall_entry>
     <description>Entry in a given system call</description>
     <struct>
@@ -193,13 +202,45 @@
      </struct>
   </event>
 
-  <event name=change_mask>
-    <description>Change in event mask</description>
-    <struct>
-      <field name="mask"> <description>Event mask</description> <uint size=8/> </field>
-     </struct>
+  <event name=block_start>
+    <description>Block start timestamp</description>
+    <typeref name=block_timestamp/>
+  </event>
+
+  <event name=block_end>
+    <description>Block end timestamp</description>
+    <typeref name=block_timestamp/>
+  </event>
+
+  <event name=time_heartbeat>
+    <description>System time values sent periodically to minimize cycle counter
+                 drift with respect to real time clock and to detect cycle counter roolovers
+    </description>
+    <typeref name=timestamp/>
   </event>
 
+  <type name=block_timestamp>
+    <struct>
+      <field name=timestamp><typeref name=timestamp/></field>
+      <field name=block_id><uint size=4/></field>
+    </struct>
+  </type>
+
+  <type name=timestamp>
+    <struct>
+      <field name=time><typeref name=timespec/></field>
+      <field name="cycle_count"><uint size=8/></field>
+    </struct>
+  </type>
+
+  <type name=timespec>
+    <struct>
+      <field name="seconds"><uint size=4/></field>
+      <field name="nanoseconds"><uint size=4/></field>
+    </struct>
+  </type>
+
+
 </facility>