commit d5076ba63a4e5b9d82f8bfadc5945fb97ea5e695
author Treehugger Robot <treehugger-gerrit@google.com> Mon Jan 28 21:01:24 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jan 28 21:01:24 2019 +0000
tree 7927c5f8d6b3f6c1deeccc9c02dd4d1d66d6fade
parent ecdc451ccf9e3f6fa4a89ec99f0f59b0a8080516
parent 77d0f90c7a06dfa7e96790d9651f3877443f72b9

Merge "Add tracepoints for pthread_create and pthread_join"

libc/bionic/pthread_create.cpp

diff --git a/libc/bionic/pthread_create.cpp b/libc/bionic/pthread_create.cpp
index d80906c..b8784b8 100644
--- a/libc/bionic/pthread_create.cpp
+++ b/libc/bionic/pthread_create.cpp
@@ -44,6 +44,7 @@
 #include "private/bionic_globals.h"
 #include "private/bionic_macros.h"
 #include "private/bionic_ssp.h"
+#include "private/bionic_systrace.h"
 #include "private/bionic_tls.h"
 #include "private/ErrnoRestorer.h"
 
@@ -347,6 +348,7 @@
   ErrnoRestorer errno_restorer;
 
   pthread_attr_t thread_attr;
+  ScopedTrace trace("pthread_create");
   if (attr == nullptr) {
     pthread_attr_init(&thread_attr);
   } else {

libc/bionic/pthread_join.cpp

diff --git a/libc/bionic/pthread_join.cpp b/libc/bionic/pthread_join.cpp
index 9aad458..8e4ca59 100644
--- a/libc/bionic/pthread_join.cpp
+++ b/libc/bionic/pthread_join.cpp
@@ -30,10 +30,12 @@
 
 #include "private/bionic_defs.h"
 #include "private/bionic_futex.h"
+#include "private/bionic_systrace.h"
 #include "pthread_internal.h"
 
 __BIONIC_WEAK_FOR_NATIVE_BRIDGE
 int pthread_join(pthread_t t, void** return_value) {
+  ScopedTrace trace("pthread_join");
   if (t == pthread_self()) {
     return EDEADLK;
   }