change facilities to fit with genevent-new

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

diff --git a/ltt/branches/poly/facilities/core.xml b/ltt/branches/poly/facilities/core.xml
index c9004d3fc647aa740e10ee77bdd23629c5e9a937..360ce161bfa79285e8e3ace6db0c8ca2a85c832f 100644 (file)
--- a/ltt/branches/poly/facilities/core.xml
+++ b/ltt/branches/poly/facilities/core.xml
@@ -3,22 +3,18 @@
 
   <event name=facility_load>
     <description>Facility is loaded</description>
-    <struct>
-      <field name="name"><string/></field>
-      <field name="checksum"><uint size=4/></field>
-      <field name="id"><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="alignment"><uint size=4/></field>
-    </struct>
+               <field name="name"><string/></field>
+               <field name="checksum"><uint size=4/></field>
+               <field name="id"><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="alignment"><uint size=4/></field>
   </event>
 
   <event name=facility_unload>
     <description>Facility is unloaded</description>
-    <struct>
-      <field name="id"><uint size=4/></field>
-    </struct>
+    <field name="id"><uint size=4/></field>
   </event>
 
   <event name=time_heartbeat per_tracefile>
@@ -26,28 +22,26 @@
      rollovers. Useful when only the 32 LSB of the TSC are saved in events
      header : we save the full 64 bits in this event.
     </description>
-    <typeref name=timestamp/>
+               <field name="timestamp"><typeref name=timestamp/></field>
   </event>
   
   <event name=state_dump_facility_load per_trace>
     <description>Facility is loaded while in state dump</description>
-    <struct>
-      <field name="name"><string/></field>
-      <field name="checksum"><uint size=4/></field>
-      <field name="id"><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="alignment"><uint size=4/></field>
-    </struct>
+               <field name="name"><string/></field>
+               <field name="checksum"><uint size=4/></field>
+               <field name="id"><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="alignment"><uint size=4/></field>
   </event>
 
   <type name=timestamp>
-    <struct>
-      <field name="seconds"><uint size=4/></field>
-      <field name="nanoseconds"><uint size=4/></field>
-      <field name="cycle_count"><uint size=8/></field>
-    </struct>
+               <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/ltt/branches/poly/facilities/fs.xml b/ltt/branches/poly/facilities/fs.xml
index 2e475023d1f61dc242593c51333f8def028c5501..4fbcf6d1cb009068c9b47fd84a907d957a74bd7b 100644 (file)
--- a/ltt/branches/poly/facilities/fs.xml
+++ b/ltt/branches/poly/facilities/fs.xml
@@ -3,87 +3,65 @@
 
   <event name=buf_wait_start>
     <description>Staring to wait for a buffer</description>
-    <struct>
-      <field name="address"> <description>Address of the buffer head.</description> <pointer/> </field>
-    </struct>
+    <field name="address"> <description>Address of the buffer head.</description> <pointer/> </field>
   </event>
 
   <event name=buf_wait_end>
     <description>Ending to wait for a buffer</description>
-    <struct>
-      <field name="address"> <description>Address of the buffer head.</description> <pointer/> </field>
-    </struct>
+    <field name="address"> <description>Address of the buffer head.</description> <pointer/> </field>
   </event>
 
   <event name=exec>
     <description>Executing a file</description>
-    <struct>
-      <field name="filename"> <description>File name</description> <string/> </field>
-    </struct>
+    <field name="filename"> <description>File name</description> <string/> </field>
   </event>
 
   <event name=open>
     <description>Opening a file</description>
-    <struct>
-      <field name="filename"> <description>File name</description> <string/> </field>
-      <field name="fd"> <description>File descriptor</description> <uint size=4/> </field>
-    </struct>
+    <field name="filename"> <description>File name</description> <string/> </field>
+    <field name="fd"> <description>File descriptor</description> <uint size=4/> </field>
   </event>
 
   <event name=close>
     <description>Closing a file descriptor</description>
-    <struct>
-      <field name="fd"> <description>File descriptor</description> <uint size=4/> </field>
-    </struct>
+    <field name="fd"> <description>File descriptor</description> <uint size=4/> </field>
   </event>
 
   <event name=read>
     <description>Reading from a file descriptor</description>
-    <struct>
-      <field name="fd"> <description>File descriptor</description> <uint size=4/> </field>
-      <field name="count"> <description>Number of bytes to read</description> <size_t/> </field>
-    </struct>
+    <field name="fd"> <description>File descriptor</description> <uint size=4/> </field>
+    <field name="count"> <description>Number of bytes to read</description> <size_t/> </field>
   </event>
        
   <event name=write>
     <description>Write to a file descriptor</description>
-    <struct>
-      <field name="fd"> <description>File descriptor</description> <uint size=4/> </field>
-      <field name="count"> <description>Number of bytes to write</description> <size_t/> </field>
-    </struct>
+    <field name="fd"> <description>File descriptor</description> <uint size=4/> </field>
+    <field name="count"> <description>Number of bytes to write</description> <size_t/> </field>
   </event>
 
   <event name=seek>
     <description>Seek a file descriptor</description>
-    <struct>
-      <field name="fd"> <description>File descriptor</description> <uint size=4/> </field>
-      <field name="offset"> <description>Number of bytes to write</description> <off_t/> </field>
-      <field name="origin"> <description>Number of bytes to write</description> <uint size=4/> </field>
-    </struct>
+    <field name="fd"> <description>File descriptor</description> <uint size=4/> </field>
+    <field name="offset"> <description>Number of bytes to write</description> <off_t/> </field>
+    <field name="origin"> <description>Number of bytes to write</description> <uint size=4/> </field>
   </event>
 
   <event name=ioctl>
     <description>Do a IOCTL on a file descriptor</description>
-    <struct>
-      <field name="fd"> <description>File descriptor</description> <uint size=4/> </field>
-      <field name="cmd"> <description>Command</description> <uint size=4/> </field>
-      <field name="arg"> <description>Argument</description> <uint size=4/> </field>
-    </struct>
+    <field name="fd"> <description>File descriptor</description> <uint size=4/> </field>
+    <field name="cmd"> <description>Command</description> <uint size=4/> </field>
+    <field name="arg"> <description>Argument</description> <uint size=4/> </field>
   </event>
 
   <event name=select>
     <description>Do a select on a file descriptor</description>
-    <struct>
-      <field name="fd"> <description>File descriptor</description> <uint size=4/> </field>
-      <field name="timeout"> <description>Time out</description> <ulong/> </field>
-    </struct>
+    <field name="fd"> <description>File descriptor</description> <uint size=4/> </field>
+    <field name="timeout"> <description>Time out</description> <ulong/> </field>
   </event>
 
   <event name=poll>
     <description>Do a poll on a file descriptor</description>
-    <struct>
-      <field name="fd"> <description>File descriptor</description> <uint size=4/> </field>
-    </struct>
+    <field name="fd"> <description>File descriptor</description> <uint size=4/> </field>
   </event>
 
 </facility>

diff --git a/ltt/branches/poly/facilities/ipc.xml b/ltt/branches/poly/facilities/ipc.xml
index 1a0c47a73f6cbbf8d5474b7e25b96a2e3e5f703f..c1eb130462ed8018ddd56faea774632b2bec23ef 100644 (file)
--- a/ltt/branches/poly/facilities/ipc.xml
+++ b/ltt/branches/poly/facilities/ipc.xml
@@ -4,34 +4,27 @@
   <event name=call>
 
     <description>IPC call</description>
-    <struct>
-      <field name="call_number"> <description>Number of IPC call</description> <uint size=4/> </field>
+    <field name="call_number"> <description>Number of IPC call</description> <uint size=4/> </field>
 
-      <field name="first"> <description>First argument</description> <int size=4/> </field>
-    </struct>
+    <field name="first"> <description>First argument</description> <int size=4/> </field>
   </event>
+
   <event name=msg_create>
     <description>Get an IPC message queue identifier</description>
-    <struct>
-      <field name="id"> <description>Message queue identifier</description><long/> </field>
-      <field name="flags"> <description>Message flags</description> <int size=4/> </field>
-    </struct>
+    <field name="id"> <description>Message queue identifier</description><long/> </field>
+    <field name="flags"> <description>Message flags</description> <int size=4/> </field>
   </event>
 
   <event name=sem_create>
     <description>Get an IPC semaphore identifier</description>
-    <struct>
-      <field name="id"> <description>Semaphore identifier</description> <long/> </field>
-      <field name="flags"> <description>Semaphore flags</description> <int size=4/> </field>
-    </struct>
+    <field name="id"> <description>Semaphore identifier</description> <long/> </field>
+    <field name="flags"> <description>Semaphore flags</description> <int size=4/> </field>
   </event>
 
   <event name=shm_create>
     <description>Get an IPC shared memory identifier</description>
-    <struct>
-      <field name="id"> <description>Shared memory identifier</description> <long/> </field>
-      <field name="flags"> <description>Shared memory flags</description> <int size=4/> </field>
-    </struct>
+    <field name="id"> <description>Shared memory identifier</description> <long/> </field>
+    <field name="flags"> <description>Shared memory flags</description> <int size=4/> </field>
   </event>
 
 </facility>

diff --git a/ltt/branches/poly/facilities/kernel.xml b/ltt/branches/poly/facilities/kernel.xml
index dd98a6c9355f79ed499ce37dd574e013ca8cc6c0..eb10f722db042321f5abad3e36dce60306649b37 100644 (file)
--- a/ltt/branches/poly/facilities/kernel.xml
+++ b/ltt/branches/poly/facilities/kernel.xml
@@ -3,10 +3,8 @@
 
   <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 +13,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,42 +23,32 @@
 
   <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>
@@ -70,14 +56,14 @@
   </event>
 
   <type name=tasklet_priority>
-    <enum size=1>
+    <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 size=1>
+    <enum>
       <label name=user value=0/> <description>User context</description>
       <label name=kernel value=1/> <description>Kernel context</description>
     </enum>

diff --git a/ltt/branches/poly/facilities/memory.xml b/ltt/branches/poly/facilities/memory.xml
index b6788f6bf9a61240535e797dcb565b52ca88601f..57bc7dd57b0dc8283b3a433eabba2fb51617e710 100644 (file)
--- a/ltt/branches/poly/facilities/memory.xml
+++ b/ltt/branches/poly/facilities/memory.xml
@@ -3,47 +3,34 @@
 
   <event name=page_alloc>
     <description>Page allocation</description>
-    <struct>
-      <field name="order"> <description>Order of the page to allocate</description> <uint size=4/> </field>
-      <field name="address"> <description>Assigned page address, or 0 if
-                       failed.</description> <pointer/> </field>
-     </struct>
+    <field name="order"> <description>Order of the page to allocate</description> <uint size=4/> </field>
+    <field name="address"> <description>Assigned page address, or 0 if failed.</description> <pointer/> </field>
   </event>
 
   <event name=page_free>
     <description>Page free</description>
-    <struct>
-      <field name="order"> <description>Order of the page to free</description> <uint size=4/> </field>
-      <field name="address"> <description>Address of the page to free.</description> <pointer/> </field>
-     </struct>
+    <field name="order"> <description>Order of the page to free</description> <uint size=4/> </field>
+    <field name="address"> <description>Address of the page to free.</description> <pointer/> </field>
   </event>
 
   <event name=swap_in>
     <description>Page swapped into memory</description>
-    <struct>
-      <field name="address"> <description>Address of the page to swap in.</description> <pointer/> </field>
-     </struct>
+    <field name="address"> <description>Address of the page to swap in.</description> <pointer/> </field>
   </event>
 
   <event name=swap_out>
     <description>Page swapped to disk</description>
-    <struct>
-      <field name="address"> <description>Address of the page to swap out.</description> <pointer/> </field>
-     </struct>
+    <field name="address"> <description>Address of the page to swap out.</description> <pointer/> </field>
   </event>
 
   <event name=page_wait_start>
     <description>Staring to wait for a page</description>
-    <struct>
-      <field name="address"> <description>Address of the page we wait for.</description> <pointer/> </field>
-     </struct>
+    <field name="address"> <description>Address of the page we wait for.</description> <pointer/> </field>
   </event>
 
   <event name=page_wait_end>
     <description>Ending wait for a page</description>
-    <struct>
-      <field name="address"> <description>Address of the page we wait for.</description> <pointer/> </field>
-     </struct>
+    <field name="address"> <description>Address of the page we wait for.</description> <pointer/> </field>
   </event>
 
 </facility>

diff --git a/ltt/branches/poly/facilities/network.xml b/ltt/branches/poly/facilities/network.xml
index f80f8cb461a126a59875ffeac66242e969e7761c..41a4ba913ae2f9620fc381382ae153154c05697b 100644 (file)
--- a/ltt/branches/poly/facilities/network.xml
+++ b/ltt/branches/poly/facilities/network.xml
@@ -3,18 +3,14 @@
 
   <event name=packet_in>
     <description>A packet is arriving</description>
-    <struct>
-      <field name="skbuff"> <description>Socket buffer pointer : identify the socket buffer</description> <pointer/> </field>
-      <field name="protocol"> <description>Protocol of the packet</description> <uint size=2/> </field>
-    </struct>
+    <field name="skbuff"> <description>Socket buffer pointer : identify the socket buffer</description> <pointer/> </field>
+    <field name="protocol"> <description>Protocol of the packet</description> <uint size=2/> </field>
   </event>
 
   <event name=packet_out>
     <description>We send a packet</description>
-    <struct>
-      <field name="skbuff"> <description>Socket buffer pointer : identify the socket buffer</description> <pointer/> </field>
-      <field name="protocol"> <description>Protocol of the packet</description> <uint size=2/> </field>
-    </struct>
+    <field name="skbuff"> <description>Socket buffer pointer : identify the socket buffer</description> <pointer/> </field>
+    <field name="protocol"> <description>Protocol of the packet</description> <uint size=2/> </field>
   </event>
 
 </facility>

diff --git a/ltt/branches/poly/facilities/process.xml b/ltt/branches/poly/facilities/process.xml
index 85dbf4332cccff166777d81c7e7267f05e7dcd66..46bd0d833efd82b46487cf9731dddf0b7396df91 100644 (file)
--- a/ltt/branches/poly/facilities/process.xml
+++ b/ltt/branches/poly/facilities/process.xml
@@ -4,79 +4,61 @@
 
   <event name=fork>
     <description>Process fork</description>
-    <struct>
-      <field name="parent_pid"> <description>PID of the parent process</description> <uint size=4/> </field>
-      <field name="child_pid"> <description>PID of the child process</description> <uint size=4/> </field>
-     </struct>
+    <field name="parent_pid"> <description>PID of the parent process</description> <uint size=4/> </field>
+    <field name="child_pid"> <description>PID of the child process</description> <uint size=4/> </field>
   </event>
        
   <event name=kernel_thread>
     <description>Just created a new kernel thread</description>
-    <struct>
-      <field name="pid"> <description>PID of the kernel thread</description> <uint size=4/> </field>
-      <field name="function"> <description>Function called</description> <pointer/> </field>
-     </struct>
+    <field name="pid"> <description>PID of the kernel thread</description> <uint size=4/> </field>
+    <field name="function"> <description>Function called</description> <pointer/> </field>
   </event>
 
 
   <event name=exit>
     <description>Process exit</description>
-    <struct>
-      <field name="pid"> <description>PID of the process</description> <uint size=4/> </field>
-     </struct>
+    <field name="pid"> <description>PID of the process</description> <uint size=4/> </field>
   </event>
 
   <event name=wait>
     <description>Process wait</description>
-    <struct>
-      <field name="parent_pid"> <description>PID of the waiting process</description> <uint size=4/> </field>
-      <field name="child_pid"> <description>PID of the process waited for</description> <uint size=4/> </field>
-     </struct>
+    <field name="parent_pid"> <description>PID of the waiting process</description> <uint size=4/> </field>
+    <field name="child_pid"> <description>PID of the process waited for</description> <uint size=4/> </field>
   </event>
 
   <event name=free>
     <description>Process kernel data structure free (end of life of a zombie)</description>
-    <struct>
-      <field name="pid"> <description>PID of the freed process</description> <uint size=4/> </field>
-     </struct>
+    <field name="pid"> <description>PID of the freed process</description> <uint size=4/> </field>
   </event>
 
   <event name=kill>
     <description>Process kill system call</description>
-    <struct>
-      <field name="pid"> <description>PID of the process</description> <uint size=4/> </field>
-      <field name="target_pid"> <description>PID of the process to kill</description> <uint size=4/> </field>
-      <field name="signal"> <description>Signal number</description> <typeref name=signal_name/> </field>
-     </struct>
+    <field name="pid"> <description>PID of the process</description> <uint size=4/> </field>
+    <field name="target_pid"> <description>PID of the process to kill</description> <uint size=4/> </field>
+    <field name="signal"> <description>Signal number</description> <typeref name=signal_name/> </field>
   </event>
 
   <event name=signal>
     <description>Process signal reception</description>
-    <struct>
-      <field name="pid"> <description>PID of the receiving process</description> <uint size=4/> </field>
-      <field name="signal"> <description>Signal number</description> <typeref name=signal_name/> </field>
-     </struct>
+    <field name="pid"> <description>PID of the receiving process</description> <uint size=4/> </field>
+    <field name="signal"> <description>Signal number</description> <typeref name=signal_name/> </field>
   </event>
 
   <event name=wakeup>
     <description>Process wakeup</description>
-    <struct>
-      <field name="pid"> <description>PID of the receiving process</description> <uint size=4/> </field>
-      <field name="state"> <description>State of the awakened process. -1 unrunnable, 0 runnable, >0 stopped.</description> <int size=4/> </field>
-     </struct>
+    <field name="pid"> <description>PID of the receiving process</description> <uint size=4/> </field>
+    <field name="state"> <description>State of the awakened process. -1 unrunnable, 0 runnable, >0 stopped.</description> <int size=4/> </field>
   </event>
 
   <event name=schedchange>
     <description>Scheduling change</description>
-    <struct>
-      <field name="out"> <description>Outgoing process</description> <uint size=4/> </field>
-      <field name="in"> <description>Incoming process</description> <uint size=4/> </field>
-      <field name="out_state"> <description>Outgoing process' state. -1 unrunnable, 0 runnable, >0 stopped.</description> <int size=4/> </field>
-     </struct>
+    <field name="out"> <description>Outgoing process</description> <uint size=4/> </field>
+    <field name="in"> <description>Incoming process</description> <uint size=4/> </field>
+    <field name="out_state"> <description>Outgoing process' state. -1 unrunnable, 0 runnable, >0 stopped.</description> <int size=4/> </field>
   </event>
 
   <type name=signal_name>
-    <enum size=4>
+    <enum>
       <label name=SIGHUP value=1/> <description>Hangup (POSIX).</description>
       <label name=SIGINT value=2/> <description>Interrupt (ANSI).</description>
       <label name=SIGQUIT value=3/> <description>Quit (POSIX).</description>

diff --git a/ltt/branches/poly/facilities/s390_kernel.xml b/ltt/branches/poly/facilities/s390_kernel.xml
index 8334c9d679ded86a5b9add8604f0ac71a4749579..00a313e6b357f2a4d868d6b1c87a9de6fe8f9df6 100644 (file)
--- a/ltt/branches/poly/facilities/s390_kernel.xml
+++ b/ltt/branches/poly/facilities/s390_kernel.xml
@@ -3,10 +3,8 @@
 
   <event name=trap_entry>
     <description>Entry in a trap</description>
-    <struct>
-      <field name="trap_id"> <description>Trap number</description> <uint size=8/> </field>
-      <field name="address"> <description>Address where trap occured</description> <pointer/> </field>
-     </struct>
+    <field name="trap_id"> <description>Trap number</description> <uint size=8/> </field>
+    <field name="address"> <description>Address where trap occured</description> <pointer/> </field>
   </event>
 
 </facility>

diff --git a/ltt/branches/poly/facilities/socket.xml b/ltt/branches/poly/facilities/socket.xml
index f70761e944ab8ad8a1d324441e0132900cfdfec6..f62d82d4168150c6b8feef9152807e2091d75e19 100644 (file)
--- a/ltt/branches/poly/facilities/socket.xml
+++ b/ltt/branches/poly/facilities/socket.xml
@@ -3,47 +3,35 @@
 
   <event name=call>
     <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>
-      <field name="first_argument"> <description>First argument of socket call</description> <ulong/> </field>
-    </struct>
+    <field name="call_number"> <description>Number of socket call</description> <int size=4/> </field>
+    <field name="first_argument"> <description>First argument of socket call</description> <ulong/> </field>
   </event>
 
   <event name=create>
     <description>Create a socket</description>
-    <struct>
-      <field name="socket"> <description>Socket structure address</description> <pointer/> </field>
-      <field name="family"> <description>Socket family</description> <int size=4/> </field>
-      <field name="type"> <description>Socket type</description> <int size=4/> </field>
-      <field name="protocol"> <description>Socket protocol</description> <int size=4/> </field>
-      <field name="fd"> <description>Socket file descriptor</description> <int size=4/> </field>
-    </struct>
+    <field name="socket"> <description>Socket structure address</description> <pointer/> </field>
+    <field name="family"> <description>Socket family</description> <int size=4/> </field>
+    <field name="type"> <description>Socket type</description> <int size=4/> </field>
+    <field name="protocol"> <description>Socket protocol</description> <int size=4/> </field>
+    <field name="fd"> <description>Socket file descriptor</description> <int size=4/> </field>
   </event>
 
   <event name=sendmsg>
     <description>Sending a socket message</description>
-    <struct>
-      <field name="socket"> <description>Socket structure address</description> <pointer/> </field>
-      <field name="family"> <description>Socket family</description> <int size=4/> </field>
-      <field name="type"> <description>Socket type</description> <int size=4/> </field>
-      <field name="protocol"> <description>Socket protocol</description> <int size=4/> </field>
-      <field name="size"> <description>Size of the message</description> <size_t/> </field>
-    </struct>
+    <field name="socket"> <description>Socket structure address</description> <pointer/> </field>
+    <field name="family"> <description>Socket family</description> <int size=4/> </field>
+    <field name="type"> <description>Socket type</description> <int size=4/> </field>
+    <field name="protocol"> <description>Socket protocol</description> <int size=4/> </field>
+    <field name="size"> <description>Size of the message</description> <size_t/> </field>
   </event>
 
   <event name=recvmsg>
     <description>Receiving a socket message</description>
-    <struct>
-      <field name="socket"> <description>Socket structure address</description> <pointer/> </field>
-      <field name="family"> <description>Socket family</description> <int size=4/> </field>
-      <field name="type"> <description>Socket type</description> <int size=4/> </field>
-      <field name="protocol"> <description>Socket protocol</description> <int size=4/> </field>
-      <field name="size"> <description>Size of the message</description> <size_t/> </field>
-    </struct>
+    <field name="socket"> <description>Socket structure address</description> <pointer/> </field>
+    <field name="family"> <description>Socket family</description> <int size=4/> </field>
+    <field name="type"> <description>Socket type</description> <int size=4/> </field>
+    <field name="protocol"> <description>Socket protocol</description> <int size=4/> </field>
+    <field name="size"> <description>Size of the message</description> <size_t/> </field>
   </event>
 
-
-
-
-
 </facility>

diff --git a/ltt/branches/poly/facilities/timer.xml b/ltt/branches/poly/facilities/timer.xml
index a6e4ec986d9ad822ce8aef114ecab8d4a1897416..01b7f467cf8d1a2d5bcc63aa3b2d020095249a05 100644 (file)
--- a/ltt/branches/poly/facilities/timer.xml
+++ b/ltt/branches/poly/facilities/timer.xml
@@ -3,9 +3,7 @@
 
   <event name=expired>
     <description>A timer or itimer has expired.</description>
-     <struct>
-      <field name="pid"> <description>PID of the process to wake up.</description> <uint size=4/> </field>
-     </struct>
+    <field name="pid"> <description>PID of the process to wake up.</description> <uint size=4/> </field>
   </event>
 
   <event name=softirq>
@@ -14,18 +12,16 @@
 
   <event name=set_itimer>
     <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_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>
+    <field name="which"> <description>kind of interval timer.</description>
+           <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>
   </event>
 
   <type name=itimer_kind>
-    <enum size=4>
+    <enum>
       <label name=ITIMER_REAL value=0/> <description>decrements in real time,
       and delivers SIGALRM upon expiration.</description>
       <label name=ITIMER_VIRTUAL value=1/> <description>decrements only when the