lttng: trace mutex::unlock

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>

diff --git a/src/common/Mutex.cc b/src/common/Mutex.cc
index a79d6ade5d9f46bd6addf237453d81566ccec32a..0a407f9fd2dc5543cceaa0701fb2d0102705c9ee 100644 (file)
--- a/src/common/Mutex.cc
+++ b/src/common/Mutex.cc
@@ -102,3 +102,11 @@ void Mutex::Lock(bool no_lockdep) {
 out:
   tracepoint(mutex, lock_exit, this, name);
 }
+
+void Mutex::Unlock() {
+  _pre_unlock();
+  if (lockdep && g_lockdep) _will_unlock();
+  int r = pthread_mutex_unlock(&_m);
+  assert(r == 0);
+  tracepoint(mutex, unlock, this, name);
+}

diff --git a/src/common/Mutex.h b/src/common/Mutex.h
index e26a090703d2cd63844877f31de17ece441ba157..e2ebe1fa6e8f4818b604e85f6f7a6f25c8b1133e 100644 (file)
--- a/src/common/Mutex.h
+++ b/src/common/Mutex.h
@@ -101,12 +101,7 @@ public:
       assert(nlock == 0);
     }
   }
-  void Unlock() {
-    _pre_unlock();
-    if (lockdep && g_lockdep) _will_unlock();
-    int r = pthread_mutex_unlock(&_m);
-    assert(r == 0);
-  }
+  void Unlock();
 
   friend class Cond;
 

diff --git a/src/tracing/Makefile.am b/src/tracing/Makefile.am
index 8da61a843e7f230cbb2314ac7a353dbc0ea3833c..f759a6a46e99d5a7b0f02c9bb705e11f6854b148 100644 (file)
--- a/src/tracing/Makefile.am
+++ b/src/tracing/Makefile.am
@@ -3,6 +3,6 @@ libtracepoints_la_SOURCES = \
        mutex.tp.h
 
 libtracepoints_la_LIBADD = -llttng-ust -ldl
-libtracepoints_la_CPPFLAGS = -DTRACEPOINT_DEFINE -DTRACEPOINT_PROBE_DYNAMIC_LINKAGE
+libtracepoints_la_CPPFLAGS = -DTRACEPOINT_PROBE_DYNAMIC_LINKAGE
 libtracepoints_la_LDFLAGS =
 noinst_LTLIBRARIES = libtracepoints.la

diff --git a/src/tracing/mutex.tp b/src/tracing/mutex.tp
index 82bdf15a522045a9516ee280197483801c791f31..7cdfdb35064c7cab9f40a36fcdaab1dcdd3d23b9 100644 (file)
--- a/src/tracing/mutex.tp
+++ b/src/tracing/mutex.tp
@@ -17,3 +17,13 @@ TRACEPOINT_EVENT(mutex, lock_exit,
         ctf_string(name, name)
     )
 )
+
+TRACEPOINT_EVENT(mutex, unlock,
+    TP_ARGS(
+        const void *, addr,
+        const char *, name),
+    TP_FIELDS(
+        ctf_integer_hex(unsigned long, addr, addr)
+        ctf_string(name, name)
+    )
+)

diff --git a/src/tracing/mutex.tp.h b/src/tracing/mutex.tp.h
index 24d45543863b19e3919ffd10190ed1ac45055676..e26e86d1f588b3a6a2374147b83b3bdb29965ee8 100644 (file)
--- a/src/tracing/mutex.tp.h
+++ b/src/tracing/mutex.tp.h
@@ -30,6 +30,16 @@ TRACEPOINT_EVENT(mutex, lock_exit,
     )
 )
 
+TRACEPOINT_EVENT(mutex, unlock,
+    TP_ARGS(
+        const void *, addr,
+        const char *, name),
+    TP_FIELDS(
+        ctf_integer_hex(unsigned long, addr, addr)
+        ctf_string(name, name)
+    )
+)
+
 #endif /* MUTEX_TP_H */
 
 #include <lttng/tracepoint-event.h>