From e56575d5932d5fd7368b87f4a897a79dc4d2d9bd Mon Sep 17 00:00:00 2001
From: compudj <compudj@04897980-b3bd-0310-b5e0-8ef037075253>
Date: Fri, 2 Dec 2005 00:04:58 +0000
Subject: [PATCH] put typedef before events

git-svn-id: http://ltt.polymtl.ca/svn@1356 04897980-b3bd-0310-b5e0-8ef037075253
---
 ltt/branches/poly/facilities/core.xml    | 16 ++---
 ltt/branches/poly/facilities/kernel.xml  | 28 ++++-----
 ltt/branches/poly/facilities/process.xml | 75 ++++++++++++------------
 ltt/branches/poly/facilities/timer.xml   | 28 ++++-----
 4 files changed, 73 insertions(+), 74 deletions(-)

diff --git a/ltt/branches/poly/facilities/core.xml b/ltt/branches/poly/facilities/core.xml
index 360ce161..74713e1a 100644
--- a/ltt/branches/poly/facilities/core.xml
+++ b/ltt/branches/poly/facilities/core.xml
@@ -1,5 +1,13 @@
 <facility name=core>
   <description>The core facility contains the basic tracing related events</description>
+	
+  <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>
+  </type>
 
   <event name=facility_load>
     <description>Facility is loaded</description>
@@ -36,12 +44,4 @@
 		<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>
-  </type>
-
 </facility>
diff --git a/ltt/branches/poly/facilities/kernel.xml b/ltt/branches/poly/facilities/kernel.xml
index eb10f722..1db08202 100644
--- a/ltt/branches/poly/facilities/kernel.xml
+++ b/ltt/branches/poly/facilities/kernel.xml
@@ -1,6 +1,20 @@
 <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>
     <field name="syscall_id"> <description>Syscall entry number in entry.S</description> <uint size=1/> </field>
@@ -55,18 +69,4 @@
     <description>Exit from an IRQ</description>
   </event>
 
-  <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>
-
 </facility>
diff --git a/ltt/branches/poly/facilities/process.xml b/ltt/branches/poly/facilities/process.xml
index 46bd0d83..e9f403e7 100644
--- a/ltt/branches/poly/facilities/process.xml
+++ b/ltt/branches/poly/facilities/process.xml
@@ -2,6 +2,43 @@
   <description>The process facility has events related to process handling in
 	the kernel.</description>
 
+  <type name=signal_name>
+    <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>
+      <label name=SIGILL value=4/> <description>Illegal instruction (ANSI).</description>
+      <label name=SIGTRAP value=5/> <description>Trace trap (POSIX).</description>
+      <label name=SIGABRT value=6/> <description>Abort (ANSI).</description>
+      <label name=SIGBUS value=7/> <description>BUS error (4.2 BSD).</description>
+      <label name=SIGFPE value=8/> <description>Floating-point exception (ANSI).</description>
+      <label name=SIGKILL value=9/> <description>Kill, unblockable (POSIX).</description>
+      <label name=SIGUSR1 value=10/> <description>User-defined signal 1 (POSIX).</description>
+      <label name=SIGSEGV value=11/> <description>Segmentation violation (ANSI).</description>
+      <label name=SIGUSR2 value=12/> <description>User-defined signal 2 (POSIX).</description>
+      <label name=SIGPIPE value=13/> <description>Broken pipe (POSIX).</description>
+      <label name=SIGALRM value=14/> <description>Alarm clock (POSIX).</description>
+      <label name=SIGTERM value=15/> <description>Termination (ANSI).</description>
+      <label name=SIGSTKFLT value=16/> <description>Stack fault.</description>
+  
+      <label name=SIGCHLD value=17/> <description>Child status has changed (POSIX).</description>
+      <label name=SIGCONT value=18/> <description>Continue (POSIX).</description>
+      <label name=SIGSTOP value=19/> <description>Stop, unblockable (POSIX).</description>
+      <label name=SIGTSTP value=20/> <description>Keyboard stop (POSIX).</description>
+      <label name=SIGTTIN value=21/> <description>Background read from tty (POSIX).</description>
+      <label name=SIGTTOU value=22/> <description>Background write to tty (POSIX).</description>
+      <label name=SIGURG value=23/> <description>Urgent condition on socket (4.2 BSD).</description>
+      <label name=SIGXCPU value=24/> <description>CPU limit exceeded (4.2 BSD).</description>
+      <label name=SIGXFSZ value=25/> <description>File size limit exceeded (4.2 BSD).</description>
+      <label name=SIGVTALRM value=26/> <description>Virtual alarm clock (4.2 BSD).</description>
+      <label name=SIGPROF value=27/> <description>Profiling alarm clock (4.2 BSD).</description>
+      <label name=SIGWINCH value=28/> <description>Window size change (4.3 BSD, Sun).</description>
+      <label name=SIGIO value=29/> <description>I/O now possible (4.2 BSD). (aka SIGPOLL)</description>
+      <label name=SIGPWR value=30/> <description>Power failure restart (System V).</description>
+      <label name=SIGSYS value=31/> <description>Bad system call.</description>
+    </enum>
+  </type>
+
   <event name=fork>
     <description>Process fork</description>
     <field name="parent_pid"> <description>PID of the parent process</description> <uint size=4/> </field>
@@ -57,42 +94,4 @@
     <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>
-      <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>
-      <label name=SIGILL value=4/> <description>Illegal instruction (ANSI).</description>
-      <label name=SIGTRAP value=5/> <description>Trace trap (POSIX).</description>
-      <label name=SIGABRT value=6/> <description>Abort (ANSI).</description>
-      <label name=SIGBUS value=7/> <description>BUS error (4.2 BSD).</description>
-      <label name=SIGFPE value=8/> <description>Floating-point exception (ANSI).</description>
-      <label name=SIGKILL value=9/> <description>Kill, unblockable (POSIX).</description>
-      <label name=SIGUSR1 value=10/> <description>User-defined signal 1 (POSIX).</description>
-      <label name=SIGSEGV value=11/> <description>Segmentation violation (ANSI).</description>
-      <label name=SIGUSR2 value=12/> <description>User-defined signal 2 (POSIX).</description>
-      <label name=SIGPIPE value=13/> <description>Broken pipe (POSIX).</description>
-      <label name=SIGALRM value=14/> <description>Alarm clock (POSIX).</description>
-      <label name=SIGTERM value=15/> <description>Termination (ANSI).</description>
-      <label name=SIGSTKFLT value=16/> <description>Stack fault.</description>
-  
-      <label name=SIGCHLD value=17/> <description>Child status has changed (POSIX).</description>
-      <label name=SIGCONT value=18/> <description>Continue (POSIX).</description>
-      <label name=SIGSTOP value=19/> <description>Stop, unblockable (POSIX).</description>
-      <label name=SIGTSTP value=20/> <description>Keyboard stop (POSIX).</description>
-      <label name=SIGTTIN value=21/> <description>Background read from tty (POSIX).</description>
-      <label name=SIGTTOU value=22/> <description>Background write to tty (POSIX).</description>
-      <label name=SIGURG value=23/> <description>Urgent condition on socket (4.2 BSD).</description>
-      <label name=SIGXCPU value=24/> <description>CPU limit exceeded (4.2 BSD).</description>
-      <label name=SIGXFSZ value=25/> <description>File size limit exceeded (4.2 BSD).</description>
-      <label name=SIGVTALRM value=26/> <description>Virtual alarm clock (4.2 BSD).</description>
-      <label name=SIGPROF value=27/> <description>Profiling alarm clock (4.2 BSD).</description>
-      <label name=SIGWINCH value=28/> <description>Window size change (4.3 BSD, Sun).</description>
-      <label name=SIGIO value=29/> <description>I/O now possible (4.2 BSD). (aka SIGPOLL)</description>
-      <label name=SIGPWR value=30/> <description>Power failure restart (System V).</description>
-      <label name=SIGSYS value=31/> <description>Bad system call.</description>
-    </enum>
-  </type>
-
-
 </facility>
diff --git a/ltt/branches/poly/facilities/timer.xml b/ltt/branches/poly/facilities/timer.xml
index 01b7f467..26abb0f8 100644
--- a/ltt/branches/poly/facilities/timer.xml
+++ b/ltt/branches/poly/facilities/timer.xml
@@ -1,6 +1,20 @@
 <facility name=timer>
   <description>The timer facility has events related to timer events in the kernel.</description>
 
+  <type name=itimer_kind>
+    <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
+      process is executing, and delivers SIGVTALRM upon expiration.</description>
+      <label name=ITIMER_PROF value=2/> <description>decrements both when the
+      process executes and when the system is executing on behalf of the
+      process. Coupled with ITIMER_VIRTUAL, this timer is usually used to
+      profile the time spent by the application in user and kernel space.
+      SIGPROF is delivered upon expiration.</description>
+    </enum>
+  </type>
+
   <event name=expired>
     <description>A timer or itimer has expired.</description>
     <field name="pid"> <description>PID of the process to wake up.</description> <uint size=4/> </field>
@@ -20,18 +34,4 @@
     <field name="value_microseconds"><uint size=4/></field>
   </event>
 
-  <type name=itimer_kind>
-    <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
-      process is executing, and delivers SIGVTALRM upon expiration.</description>
-      <label name=ITIMER_PROF value=2/> <description>decrements both when the
-      process executes and when the system is executing on behalf of the
-      process. Coupled with ITIMER_VIRTUAL, this timer is usually used to
-      profile the time spent by the application in user and kernel space.
-      SIGPROF is delivered upon expiration.</description>
-    </enum>
-  </type>
-
 </facility>
-- 
2.34.1