X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Ffacilities%2Fkernel.xml;h=1db08202ff2720bb74adc27a3f809df454a45fd9;hb=e56575d5932d5fd7368b87f4a897a79dc4d2d9bd;hp=dd98a6c9355f79ed499ce37dd574e013ca8cc6c0;hpb=1500e1512ad61fe65ada227dfc6282b5e5f104f3;p=lttv.git

diff --git a/ltt/branches/poly/facilities/kernel.xml b/ltt/branches/poly/facilities/kernel.xml
index dd98a6c9..1db08202 100644
--- a/ltt/branches/poly/facilities/kernel.xml
+++ b/ltt/branches/poly/facilities/kernel.xml
@@ -1,12 +1,24 @@
 <facility name=kernel>
   <description>The kernel facility has events related to kernel execution status.</description>
 
+  <type name=tasklet_priority>
+    <enum>
+      <label name=LOW value=0/> <description>Low priority tasklet</description>
+      <label name=HIGH value=1/> <description>High priority tasklet</description>
+    </enum>
+  </type>
+
+  <type name=irq_mode>
+    <enum>
+      <label name=user value=0/> <description>User context</description>
+      <label name=kernel value=1/> <description>Kernel context</description>
+    </enum>
+  </type>
+
   <event name=syscall_entry>
     <description>System call entry</description>
-    <struct>
-      <field name="syscall_id"> <description>Syscall entry number in entry.S</description> <uint size=1/> </field>
-      <field name="address"> <description>Address from which call was made</description> <pointer/> </field>
-     </struct>
+    <field name="syscall_id"> <description>Syscall entry number in entry.S</description> <uint size=1/> </field>
+    <field name="address"> <description>Address from which call was made</description> <pointer/> </field>
   </event>
 	
 	<event name=syscall_exit>
@@ -15,10 +27,8 @@
 	
   <event name=trap_entry>
     <description>Entry in a trap</description>
-    <struct>
-      <field name="trap_id"> <description>Trap number</description> <uint size=2/> </field>
-      <field name="address"> <description>Address where trap occured</description> <pointer/> </field>
-     </struct>
+    <field name="trap_id"> <description>Trap number</description> <uint size=2/> </field>
+    <field name="address"> <description>Address where trap occured</description> <pointer/> </field>
   </event>
 
   <event name=trap_exit>
@@ -27,60 +37,36 @@
 
   <event name=soft_irq_entry>
     <description>Soft IRQ entry</description>
-    <struct>
-      <field name="softirq_id"> <description>Soft IRQ number</description> <pointer/> </field>
-     </struct>
+    <field name="softirq_id"> <description>Soft IRQ number</description> <pointer/> </field>
   </event>
 
   <event name=soft_irq_exit>
     <description>Soft IRQ exit</description>
-    <struct>
-      <field name="softirq_id"> <description>Soft IRQ number</description> <pointer/> </field>
-     </struct>
+    <field name="softirq_id"> <description>Soft IRQ number</description> <pointer/> </field>
   </event>
 
   <event name=tasklet_entry>
     <description>Tasklet entry</description>
-    <struct>
-      <field name="priority"> <description>Tasklet priority</description> <typeref name=tasklet_priority/> </field>
-      <field name="address"> <description>Tasklet function address</description> <pointer/> </field>
-      <field name="data"> <description>Tasklet data address</description> <ulong/> </field>
-     </struct>
+    <field name="priority"> <description>Tasklet priority</description> <typeref name=tasklet_priority/> </field>
+    <field name="address"> <description>Tasklet function address</description> <pointer/> </field>
+    <field name="data"> <description>Tasklet data address</description> <ulong/> </field>
   </event>
 
   <event name=tasklet_exit>
     <description>Tasklet exit</description>
-    <struct>
-      <field name="priority"> <description>Tasklet priority</description> <typeref name=tasklet_priority/> </field>
-      <field name="address"> <description>Tasklet function address</description> <pointer/> </field>
-      <field name="data"> <description>Tasklet data address</description> <ulong/> </field>
-     </struct>
+    <field name="priority"> <description>Tasklet priority</description> <typeref name=tasklet_priority/> </field>
+    <field name="address"> <description>Tasklet function address</description> <pointer/> </field>
+    <field name="data"> <description>Tasklet data address</description> <ulong/> </field>
   </event>
 
   <event name=irq_entry>
     <description>Entry in an irq</description>
-    <struct>
-      <field name="irq_id"> <description>IRQ number</description> <uint size=4/> </field>
-      <field name="mode"> <description>Are we executing kernel code</description> <typeref name=irq_mode/> </field>
-     </struct>
+    <field name="irq_id"> <description>IRQ number</description> <uint size=4/> </field>
+    <field name="mode"> <description>Are we executing kernel code</description> <typeref name=irq_mode/> </field>
   </event>
 
   <event name=irq_exit>
     <description>Exit from an IRQ</description>
   </event>
 
-  <type name=tasklet_priority>
-    <enum size=1>
-      <label name=LOW value=0/> <description>Low priority tasklet</description>
-      <label name=HIGH value=1/> <description>High priority tasklet</description>
-    </enum>
-  </type>
-
-  <type name=irq_mode>
-    <enum size=1>
-      <label name=user value=0/> <description>User context</description>
-      <label name=kernel value=1/> <description>Kernel context</description>
-    </enum>
-  </type>
-
 </facility>