From b21482e79b375b93d0a09438dbc6fb4b8de83025 Mon Sep 17 00:00:00 2001
From: compudj <compudj@04897980-b3bd-0310-b5e0-8ef037075253>
Date: Thu, 29 Mar 2007 03:47:00 +0000
Subject: [PATCH] update

git-svn-id: http://ltt.polymtl.ca/svn@2454 04897980-b3bd-0310-b5e0-8ef037075253
---
 ltt-control/facilities/Makefile.am            | 12 ++----
 ltt-control/facilities/fs.xml                 | 22 ++++-------
 ltt-control/facilities/ipc.xml                |  7 ----
 ltt-control/facilities/kernel.xml             | 10 -----
 ltt-control/facilities/kernel_arch_i386.xml   | 23 +++++++++++
 ltt-control/facilities/{memory.xml => mm.xml} | 38 ++++++++++---------
 ltt-control/facilities/process.xml            |  7 ----
 7 files changed, 56 insertions(+), 63 deletions(-)
 rename ltt-control/facilities/{memory.xml => mm.xml} (75%)

diff --git a/ltt-control/facilities/Makefile.am b/ltt-control/facilities/Makefile.am
index 0e181eb..f5c9879 100644
--- a/ltt-control/facilities/Makefile.am
+++ b/ltt-control/facilities/Makefile.am
@@ -13,15 +13,13 @@ kernel_arch_powerpc.xml \
 kernel_arch_ppc.xml \
 kernel_arch_x86_64.xml \
 locking.xml \
-memory.xml \
-network.xml \
+mm.xml \
+net.xml \
 process.xml \
-socket.xml \
 stack.xml \
 statedump.xml \
 timer.xml \
 user_generic.xml \
-network_ip_interface.xml \
 xen.xml \
 compact.xml
 
@@ -39,15 +37,13 @@ kernel_arch_powerpc.xml \
 kernel_arch_ppc.xml \
 kernel_arch_x86_64.xml \
 locking.xml \
-memory.xml \
-network.xml \
+mm.xml \
+net.xml \
 process.xml \
-socket.xml \
 stack.xml \
 statedump.xml \
 timer.xml \
 user_generic.xml \
-network_ip_interface.xml \
 xen.xml \
 compact.xml
 
diff --git a/ltt-control/facilities/fs.xml b/ltt-control/facilities/fs.xml
index 45eb07e..266efa2 100644
--- a/ltt-control/facilities/fs.xml
+++ b/ltt-control/facilities/fs.xml
@@ -2,12 +2,12 @@
 <facility name="fs">
   <description>The fs facility contains events related to file system operation</description>
 
-  <event name="buf_wait_start">
+  <event name="buffer_wait_start">
     <description>Staring to wait for a buffer</description>
     <field name="address"> <description>Address of the buffer head.</description> <pointer/> </field>
   </event>
 
-  <event name="buf_wait_end">
+  <event name="buffer_wait_end">
     <description>Ending to wait for a buffer</description>
     <field name="address"> <description>Address of the buffer head.</description> <pointer/> </field>
   </event>
@@ -15,22 +15,16 @@
   <event name="exec">
     <description>Executing a file</description>
     <field name="filename"> <description>File name</description>
-      <sequence>
-        <uint/>
-        <uchar/>
-      </sequence>
+      <string/>
     </field>
   </event>
 
   <event name="open">
     <description>Opening a file</description>
+    <field name="fd"> <description>File descriptor</description> <int/> </field>
     <field name="filename"> <description>File name</description>
-      <sequence>
-        <uint/>
-        <uchar/>
-      </sequence>
+      <string/>
     </field>
-    <field name="fd"> <description>File descriptor</description> <uint/> </field>
   </event>
 
   <event name="close">
@@ -96,7 +90,7 @@
     <description>Do a IOCTL on a file descriptor</description>
     <field name="fd"> <description>File descriptor</description> <uint/> </field>
     <field name="cmd"> <description>Command</description> <uint/> </field>
-    <field name="arg"> <description>Argument</description> <uint/> </field>
+    <field name="arg"> <description>Argument</description> <ulong/> </field>
   </event>
 
   <event name="select">
@@ -105,9 +99,9 @@
     <field name="timeout"> <description>Timeout</description> <int_fixed size="8"/> </field>
   </event>
 
-  <event name="poll">
+  <event name="pollfd">
     <description>Do a poll on a file descriptor</description>
-    <field name="fd"> <description>File descriptor</description> <uint/> </field>
+    <field name="fd"> <description>File descriptor</description> <int/> </field>
   </event>
 
 </facility>
diff --git a/ltt-control/facilities/ipc.xml b/ltt-control/facilities/ipc.xml
index 3326bf0..45541c9 100644
--- a/ltt-control/facilities/ipc.xml
+++ b/ltt-control/facilities/ipc.xml
@@ -2,13 +2,6 @@
 <facility name="ipc">
   <description>The ipc facility contains events related to Inter Process Communication</description>
 	
-  <event name="call">
-
-    <description>IPC call</description>
-    <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>
-  </event>
-
   <event name="msg_create">
     <description>Get an IPC message queue identifier</description>
     <field name="id"> <description>Message queue identifier</description><long/> </field>
diff --git a/ltt-control/facilities/kernel.xml b/ltt-control/facilities/kernel.xml
index 4af2585..7a406f6 100644
--- a/ltt-control/facilities/kernel.xml
+++ b/ltt-control/facilities/kernel.xml
@@ -16,16 +16,6 @@
     </enum>
   </type>
 
-  <event name="trap_entry">
-    <description>Entry in a trap</description>
-    <field name="trap_id"> <description>Trap number</description> <long/> </field>
-    <field name="address"> <description>Address where trap occured</description> <pointer/> </field>
-  </event>
-
-  <event name="trap_exit">
-    <description>Exit from a trap</description>
-  </event>
-
   <event name="soft_irq_entry">
     <description>Soft IRQ entry</description>
     <field name="softirq_id"> <description>Soft IRQ number</description> <ulong/> </field>
diff --git a/ltt-control/facilities/kernel_arch_i386.xml b/ltt-control/facilities/kernel_arch_i386.xml
index 6728d83..19523ef 100644
--- a/ltt-control/facilities/kernel_arch_i386.xml
+++ b/ltt-control/facilities/kernel_arch_i386.xml
@@ -326,6 +326,16 @@
     </enum>
   </type>
 
+  <event name="trap_entry">
+    <description>Entry in a trap</description>
+    <field name="trap_id"> <description>Trap number</description> <long/> </field>
+    <field name="address"> <description>Address where trap occured</description> <long/> </field>
+  </event>
+
+  <event name="trap_exit">
+    <description>Exit from a trap</description>
+  </event>
+
   <event name="syscall_entry">
     <description>System call entry</description>
     <field name="syscall_id"> <description>Syscall entry number in entry.S</description> <typeref name="syscall_name"/> </field>
@@ -335,4 +345,17 @@
   <event name="syscall_exit">
     <description>System call exit</description>
   </event>
+
+  <event name="ipc_call">
+    <description>IPC call</description>
+    <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>
+  </event>
+
+  <event name="thread_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>
+  </event>
+
 </facility>
diff --git a/ltt-control/facilities/memory.xml b/ltt-control/facilities/mm.xml
similarity index 75%
rename from ltt-control/facilities/memory.xml
rename to ltt-control/facilities/mm.xml
index c6825a7..a128376 100644
--- a/ltt-control/facilities/memory.xml
+++ b/ltt-control/facilities/mm.xml
@@ -2,6 +2,26 @@
 <facility name="memory">
   <description>The memory facility has memory management events.</description>
 
+  <event name="handle_fault_entry">
+    <description>Entry in a trap</description>
+    <field name="trap_id"> <description>Trap number</description> <long/> </field>
+    <field name="address"> <description>Address where trap occured</description> <long/> </field>
+  </event>
+
+  <event name="handle_fault_exit">
+    <description>Exit from the fault handler</description>
+  </event>
+
+  <event name="filemap_wait_start">
+    <description>Staring to wait for a page</description>
+    <field name="address"> <description>Address of the page we wait for.</description> <pointer/> </field>
+  </event>
+
+  <event name="filemap_wait_end">
+    <description>Ending wait for a page</description>
+    <field name="address"> <description>Address of the page we wait for.</description> <pointer/> </field>
+  </event>
+
   <event name="page_alloc">
     <description>Page allocation</description>
     <field name="order"> <description>Order of the page to allocate</description> <uint size="4"/> </field>
@@ -16,7 +36,7 @@
 
   <event name="swap_in">
     <description>Page swapped into memory</description>
-    <field name="address"> <description>Address of the page to swap in.</description> <pointer/> </field>
+    <field name="address"> <description>Address of the page to swap in.</description> <ulong/> </field>
   </event>
 
   <event name="swap_out">
@@ -24,20 +44,4 @@
     <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>
-    <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>
-    <field name="address"> <description>Address of the page we wait for.</description> <pointer/> </field>
-  </event>
-
-  <event name="page_fault">
-    <description>Ending wait for a page</description>
-    <field name="address"> <description>Address of the page faulted.</description> <ulong/> </field>
-    <field name="eip"> <description>Instruction causing the fault.</description> <long/> </field>
-  </event>
-
 </facility>
diff --git a/ltt-control/facilities/process.xml b/ltt-control/facilities/process.xml
index 77e1e03..7d609a6 100644
--- a/ltt-control/facilities/process.xml
+++ b/ltt-control/facilities/process.xml
@@ -45,13 +45,6 @@
     <field name="child_pid"> <description>PID of the child process</description> <uint/> </field>
     <field name="child_tgid"> <description>Thread group ID of the child process (POSIX PID)</description> <uint/> </field>
   </event>
-	
-  <event name="kernel_thread">
-    <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>
-  </event>
-
 
   <event name="exit">
     <description>Process exit</description>
-- 
2.34.1