From 66ad5b240aec3dfe4948a86bec5f845031436bc8 Mon Sep 17 00:00:00 2001
From: compudj <compudj@04897980-b3bd-0310-b5e0-8ef037075253>
Date: Mon, 2 Apr 2007 22:40:22 +0000
Subject: [PATCH] update facilities

git-svn-id: http://ltt.polymtl.ca/svn@2465 04897980-b3bd-0310-b5e0-8ef037075253
---
 ltt-control/facilities/Makefile.am          |  8 ++------
 ltt-control/facilities/fs.xml               |  4 ++--
 ltt-control/facilities/kernel.xml           | 15 +++++++--------
 ltt-control/facilities/kernel_arch_i386.xml |  2 +-
 ltt-control/facilities/kernel_process.xml   |  4 ----
 ltt-control/facilities/list.xml             |  2 +-
 ltt-control/facilities/stack.xml            |  2 +-
 7 files changed, 14 insertions(+), 23 deletions(-)
 delete mode 100644 ltt-control/facilities/kernel_process.xml

diff --git a/ltt-control/facilities/Makefile.am b/ltt-control/facilities/Makefile.am
index 51baa79..2a69880 100644
--- a/ltt-control/facilities/Makefile.am
+++ b/ltt-control/facilities/Makefile.am
@@ -14,10 +14,8 @@ kernel_arch_x86_64.xml \
 locking.xml \
 mm.xml \
 net.xml \
-process.xml \
-stack.xml \
+stack_arch_i386.xml \
 list.xml \
-timer.xml \
 user_generic.xml \
 xen.xml \
 compact.xml
@@ -37,10 +35,8 @@ kernel_arch_x86_64.xml \
 locking.xml \
 mm.xml \
 net.xml \
-process.xml \
-stack.xml \
+stack_arch_i386.xml \
 list.xml \
-timer.xml \
 user_generic.xml \
 xen.xml \
 compact.xml
diff --git a/ltt-control/facilities/fs.xml b/ltt-control/facilities/fs.xml
index 75a8f83..4d836ca 100644
--- a/ltt-control/facilities/fs.xml
+++ b/ltt-control/facilities/fs.xml
@@ -109,7 +109,7 @@
     <field name="fd"> <description>File descriptor</description> <uint/> </field>
     <field name="count"> <description>Number of bytes to read</description> <size_t/> </field>
     <field name="data"> <description>data read</description>
-      <sequence write="custom">
+      <sequence>
         <uint/>
         <uchar/>
       </sequence>
@@ -121,7 +121,7 @@
     <field name="fd"> <description>File descriptor</description> <uint/> </field>
     <field name="count"> <description>Number of bytes to write</description> <size_t/> </field>
     <field name="data"> <description>data written</description>
-      <sequence write="custom">
+      <sequence>
         <uint/>
         <uchar/>
       </sequence>
diff --git a/ltt-control/facilities/kernel.xml b/ltt-control/facilities/kernel.xml
index b314ad3..cb6992d 100644
--- a/ltt-control/facilities/kernel.xml
+++ b/ltt-control/facilities/kernel.xml
@@ -95,32 +95,32 @@
     <field name="signal"> <description></description> <typeref name="signal_name"/> </field>
   </event>
 
-  <event name="kernel_sched_wait_task">
+  <event name="sched_wait_task">
     <description>Process exit</description>
     <field name="pid"> <description>PID of the process we are waiting for</description> <int/> </field>
     <field name="state"> <description>State of the process we are waiting for : -1 unrunnable, 0 runnable, >0 stopped</description> <long/> </field>
   </event>
 
-  <event name="kernel_sched_try_wakeup">
+  <event name="sched_try_wakeup">
     <description>Process exit</description>
     <field name="pid"> <description>PID of the process we are waiting for</description> <int/> </field>
     <field name="state"> <description>State of the process we are waiting for : -1 unrunnable, 0 runnable, >0 stopped</description> <long/> </field>
   </event>
 
-  <event name="kernel_sched_wakeup_new_task">
+  <event name="sched_wakeup_new_task">
     <description>Process exit</description>
     <field name="pid"> <description>PID of the process we are waiting for</description> <int/> </field>
     <field name="state"> <description>State of the process we are waiting for : -1 unrunnable, 0 runnable, >0 stopped</description> <long/> </field>
   </event>
 
-  <event name="kernel_sched_migrate_task">
+  <event name="sched_migrate_task">
     <description>Process exit</description>
     <field name="pid"> <description>PID of the process we are waiting for</description> <int/> </field>
     <field name="state"> <description>State of the process we are waiting for : -1 unrunnable, 0 runnable, >0 stopped</description> <long/> </field>
     <field name="dest_cpu"> <description>Destination CPU</description> <int/> </field>
   </event>
 
-  <event name="kernel_sched_schedule">
+  <event name="sched_schedule">
     <description>Process exit</description>
     <field name="prev_pid"> <description>Previously scheduled PID</description> <int/> </field>
     <field name="next_pid"> <description>Next PID to be scheduled</description> <int/> </field>
@@ -231,12 +231,12 @@
     <field name="data"> <description>Tasklet data address</description> <ulong/> </field>
   </event>
 
-  <event name="kernel_kthread_stop">
+  <event name="kthread_stop">
     <description>Process exit</description>
     <field name="pid"> <description>PID of the kthread we stop</description> <int/> </field>
   </event>
 
-  <event name="kernel_kthread_stop_ret">
+  <event name="kthread_stop_ret">
     <description>Process exit</description>
     <field name="retval"> <description>Return value of the kthread_stop call</description> <int/> </field>
   </event>
@@ -255,7 +255,6 @@
     </field>
   </event>
 
-
   <event name="irq_entry">
     <description>Entry in an irq</description>
     <field name="irq_id"> <description>IRQ number</description> <uint size="4"/> </field>
diff --git a/ltt-control/facilities/kernel_arch_i386.xml b/ltt-control/facilities/kernel_arch_i386.xml
index 19523ef..c921254 100644
--- a/ltt-control/facilities/kernel_arch_i386.xml
+++ b/ltt-control/facilities/kernel_arch_i386.xml
@@ -352,7 +352,7 @@
     <field name="first"> <description>First argument</description> <int size="4"/> </field>
   </event>
 
-  <event name="thread_create">
+  <event name="kthread_create">
     <description>Just created a new kernel thread</description>
     <field name="pid"> <description>PID of the kernel thread</description> <uint/> </field>
     <field name="function"> <description>Function called</description> <pointer/> </field>
diff --git a/ltt-control/facilities/kernel_process.xml b/ltt-control/facilities/kernel_process.xml
deleted file mode 100644
index 604d374..0000000
--- a/ltt-control/facilities/kernel_process.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0"?>
-<facility name="process">
-  <description>The process facility has events related to process handling in the kernel.</description>
-</facility>
diff --git a/ltt-control/facilities/list.xml b/ltt-control/facilities/list.xml
index 920bb20..69db03d 100644
--- a/ltt-control/facilities/list.xml
+++ b/ltt-control/facilities/list.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<facility name="statedump">
+<facility name="list">
   <description>The statedump facility contains the events generated at trace startup</description>
 
   <type name="thread_type">
diff --git a/ltt-control/facilities/stack.xml b/ltt-control/facilities/stack.xml
index 6e3c3e5..e0c79e9 100644
--- a/ltt-control/facilities/stack.xml
+++ b/ltt-control/facilities/stack.xml
@@ -3,7 +3,7 @@
   <description>The stack facility has events related to getting process stack.</description>
 
   <event name="process_dump_32">
-    <description>Dump process EIPs on the user stackfor a 32 bits process</description>
+    <description>Dump process EIPs on the user stack for a 32 bits process</description>
     <field name="eip"> <description>Sequence of EIP</description>
       <sequence write="custom">
         <uint/>
-- 
2.34.1