VM: Fix deadlock in time line recording.

runtime/vm/os_thread_android.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "platform/globals.h"  // NOLINT
 #if defined(TARGET_OS_ANDROID)
 
 #include "vm/os_thread.h"
 
 #include <errno.h>  // NOLINT
@@ skipping 193 matching lines @@
   ASSERT(thread_id == GetCurrentThreadId());
   ASSERT(cpu_usage != NULL);
   struct timespec ts;
   int r = clock_gettime(CLOCK_THREAD_CPUTIME_ID, &ts);
   ASSERT(r == 0);
   *cpu_usage = (ts.tv_sec * kNanosecondsPerSecond + ts.tv_nsec) /
                kNanosecondsPerMicrosecond;
 }
 
 
-Mutex::Mutex() {
+Mutex::Mutex(bool recursive) {
   pthread_mutexattr_t attr;
   int result = pthread_mutexattr_init(&attr);
   VALIDATE_PTHREAD_RESULT(result);
 
 #if defined(DEBUG)
   result = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK);
   VALIDATE_PTHREAD_RESULT(result);
 #endif  // defined(DEBUG)
 
+  if (recursive) {
+    result = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
+    VALIDATE_PTHREAD_RESULT(result);
+  }
+
   result = pthread_mutex_init(data_.mutex(), &attr);
   // Verify that creating a pthread_mutex succeeded.
   VALIDATE_PTHREAD_RESULT(result);
 
   result = pthread_mutexattr_destroy(&attr);
   VALIDATE_PTHREAD_RESULT(result);
 
 #if defined(DEBUG)
   // When running with assertions enabled we do track the owner.
   owner_ = OSThread::kInvalidThreadId;
@@ skipping 173 matching lines @@
 void Monitor::NotifyAll() {
   // When running with assertions enabled we track the owner.
   ASSERT(IsOwnedByCurrentThread());
   int result = pthread_cond_broadcast(data_.cond());
   VALIDATE_PTHREAD_RESULT(result);
 }
 
 }  // namespace dart
 
 #endif  // defined(TARGET_OS_ANDROID)