From bae0bb204e68541830c68b049bd44f17e56a2662 Mon Sep 17 00:00:00 2001
From: compudj <compudj@04897980-b3bd-0310-b5e0-8ef037075253>
Date: Mon, 6 Jun 2005 13:58:37 +0000
Subject: [PATCH] xml fixed

git-svn-id: http://ltt.polymtl.ca/svn@939 04897980-b3bd-0310-b5e0-8ef037075253
---
 genevent/core.xml      | 24 +++++++-----------------
 genevent/heartbeat.xml | 10 ++--------
 genevent/kernel.xml    |  2 --
 genevent/socket.xml    |  2 +-
 genevent/timer.xml     | 20 +++++---------------
 5 files changed, 15 insertions(+), 43 deletions(-)

diff --git a/genevent/core.xml b/genevent/core.xml
index 1b7cd1b9..3bc0f6cf 100644
--- a/genevent/core.xml
+++ b/genevent/core.xml
@@ -20,31 +20,21 @@
   <event name=block_start>
     <description>Block start timestamp</description>
     <struct>
-    <field name="timestamp"><typeref name=timestamp/></field>
-    <field name="block_id"><uint size=4/></field>
+     <field name="seconds"><uint size=4/></field>
+     <field name="nanoseconds"><uint size=4/></field>
+     <field name="cycle_count"><uint size=8/></field>
+     <field name="block_id"><uint size=4/></field>
     </struct>
   </event>
 
   <event name=block_end>
     <description>Block end timestamp</description>
-    <struct>
-      <field name="timestamp"><typeref name=timestamp/></field>
-      <field name="block_id"><uint size=4/></field>
-    </struct>
-  </event>
-
-  <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>
+      <field name="cycle_count"><uint size=8/></field>
+      <field name="block_id"><uint size=4/></field>
     </struct>
-  </type>
+  </event>
 
 </facility>
diff --git a/genevent/heartbeat.xml b/genevent/heartbeat.xml
index 9bbd0d99..f3caad92 100644
--- a/genevent/heartbeat.xml
+++ b/genevent/heartbeat.xml
@@ -10,17 +10,11 @@
   </event>
 
   <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>
+      <field name="cycle_count"><uint size=8/></field>
     </struct>
   </type>
-	
+
 </facility>
diff --git a/genevent/kernel.xml b/genevent/kernel.xml
index b2448663..acbebbf4 100644
--- a/genevent/kernel.xml
+++ b/genevent/kernel.xml
@@ -67,8 +67,6 @@
     <description>Exit from an IRQ</description>
   </event>
 
-
-
   <type name=tasklet_priority>
     <enum size=1>
       <label name=LOW value=0/> <description>Low priority tasklet</description>
diff --git a/genevent/socket.xml b/genevent/socket.xml
index 4669e7ab..b9ef60a7 100644
--- a/genevent/socket.xml
+++ b/genevent/socket.xml
@@ -2,7 +2,7 @@
   <description>The socket facility contains events related to sockets</description>
 
   <event name=call>
-    <descriptiona>Generic socket call : FIXME : should be more detailed.</description>
+    <description>Generic socket call : FIXME : should be more detailed.</description>
     <struct>
       <field name="call_number"> <description>Number of socket call</description> <int size=4/> </field>
     </struct>
diff --git a/genevent/timer.xml b/genevent/timer.xml
index a3209c7d..a6e4ec98 100644
--- a/genevent/timer.xml
+++ b/genevent/timer.xml
@@ -16,14 +16,11 @@
     <description>An interval timer is set.</description>
      <struct>
       <field name="which"> <description>kind of interval timer.</description>
-			<typeref name=itimer_kind/>
-      </field>
-      <field name="interval"> <description>timer interval.</description>
-			<typeref name=timeval/>
-      </field>
-      <field name="value"> <description>current value.</description>
-			<typeref name=timeval/>
-      </field>
+			<typeref name=itimer_kind/></field>
+     <field name="interval_seconds"><uint size=4/></field>
+      <field name="interval_microseconds"><uint size=4/></field>
+      <field name="value_seconds"><uint size=4/></field>
+      <field name="value_microseconds"><uint size=4/></field>
      </struct>
   </event>
 
@@ -41,11 +38,4 @@
     </enum>
   </type>
 
-  <type name=timeval>
-    <struct>
-      <field name="seconds"><uint size=4/></field>
-      <field name="microseconds"><uint size=4/></field>
-    </struct>
-  </type>
-	
 </facility>
-- 
2.34.1