update lock

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

diff --git a/ltt-control/configure.in b/ltt-control/configure.in
index b61ced4ac2fa9d181d9017849bd5dbfcf9c56f12..0546c04955a90dfdaa357cbeb568a32e3283fa7f 100644 (file)
--- a/ltt-control/configure.in
+++ b/ltt-control/configure.in
@@ -23,7 +23,7 @@
 AC_PREREQ(2.57)
 AC_INIT(FULL-PACKAGE-NAME, VERSION, BUG-REPORT-ADDRESS)
 #AC_WITH_LTDL  # not needed ?
-AM_INIT_AUTOMAKE(ltt-control,0.26-04102006)
+AM_INIT_AUTOMAKE(ltt-control,0.27-04102006)
 AM_CONFIG_HEADER(config.h)
 AM_PROG_LIBTOOL
 

diff --git a/ltt-control/facilities/locking.xml b/ltt-control/facilities/locking.xml
index d4ed9226e78cc3554d10aeb525aa8a127e7b7da3..d4ee266ba02887bfd00b86dd8d01e5cc25b5ee1a 100644 (file)
--- a/ltt-control/facilities/locking.xml
+++ b/ltt-control/facilities/locking.xml
@@ -1,64 +1,40 @@
 <?xml version="1.0"?>
 <facility name="locking">
   <description>The locking facility instruments the kernel locking.</description>
-  <event name="spin_lock_wait">
-    <description>Takes a spinlock</description>
-    <field name="spinlock"> <description>Spinlock address</description> <pointer/> </field>
-  </event>
-
-  <event name="spin_lock_try">
-    <description>Tries a spinlock</description>
-    <field name="spinlock"> <description>Spinlock address</description> <pointer/> </field>
-  </event>
 
-  <event name="spin_lock_entry">
-    <description>Get a spinlock</description>
-    <field name="spinlock"> <description>Spinlock address</description> <pointer/> </field>
+  <event name="hardirqs_on">
+    <description>Enable IRQs</description>
+    <field name="ip"> <description>Instruction address</description> <ulong/> </field>
   </event>
 
-  <event name="spin_lock_exit">
-    <description>Releases a spinlock</description>
-    <field name="spinlock"> <description>Spinlock address</description> <pointer/> </field>
+  <event name="hardirqs_off">
+    <description>Disable IRQs</description>
+    <field name="ip"> <description>Instruction address</description> <ulong/> </field>
   </event>
 
-  <event name="irq_save">
-    <description>Disable IRQ, saving state</description>
-    <field name="EIP">
-                       <description>Instruction pointer where the irq_save is located.</description>
-                       <pointer/>
-               </field>
-    <field name="flags">
-                       <description>Saved IRQ state.</description>
-                       <ulong/>
-               </field>
+  <event name="softirqs_on">
+    <description>Enable SoftIRQs</description>
+    <field name="ip"> <description>Instruction address</description> <ulong/> </field>
   </event>
 
-  <event name="irq_restore">
-    <description>Disable IRQ, saving state</description>
-    <field name="EIP">
-                       <description>Instruction pointer where the irq_restore is located.</description>
-                       <pointer/> 
-               </field>
-    <field name="flags">
-                       <description>Restored IRQ state.</description>
-                       <ulong/>
-               </field>
+  <event name="softirqs_off">
+    <description>Disable SoftIRQs</description>
+    <field name="ip"> <description>Instruction address</description> <ulong/> </field>
   </event>
 
-  <event name="irq_disable">
-    <description>Disable IRQ</description>
-    <field name="EIP">
-                       <description>Instruction pointer where the irq_disable is located.</description>
-                       <pointer/>
-               </field>
+  <event name="lock_acquire">
+    <description>Acquire lock</description>
+    <field name="ip"> <description>Instruction address</description> <ulong/> </field>
+    <field name="subclass"> <description>Lock subclass</description> <uint/> </field>
+    <field name="lock"> <description>Lock address</description> <pointer/> </field>
+    <field name="trylock"> <description>Trylock ?</description> <int/> </field>
   </event>
 
-  <event name="irq_enable">
-    <description>Disable IRQ</description>
-    <field name="EIP">
-                       <description>Instruction pointer where the irq_enable is located.</description>
-                       <pointer/>
-               </field>
+  <event name="lock_release">
+    <description>Release lock</description>
+    <field name="ip"> <description>Instruction address</description> <ulong/> </field>
+    <field name="lock"> <description>Lock address</description> <pointer/> </field>
+    <field name="nested"> <description>Nested release ?</description> <int/> </field>
   </event>
 
 </facility>