Small fixes for Android.

runtime/platform/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"
 #if defined(TARGET_OS_ANDROID)
 
 #include "platform/thread.h"
 
 #include <errno.h>  // NOLINT
@@ skipping 22 matching lines @@
             __FILE__, __LINE__, result, error_message); \
     return result; \
   }
 #else
 #define RETURN_ON_PTHREAD_FAILURE(result) \
   if (result != 0) return result;
 #endif
 
 
 static void ComputeTimeSpecMicros(struct timespec* ts, int64_t micros) {
+  struct timeval tv;
   int64_t secs = micros / kMicrosecondsPerSecond;
-  int64_t nanos =
-      (micros - (secs * kMicrosecondsPerSecond)) * kNanosecondsPerMicrosecond;
-  int result = clock_gettime(CLOCK_MONOTONIC, ts);
+  int64_t remaining_micros = (micros - (secs * kMicrosecondsPerSecond));
+  int result = gettimeofday(&tv, NULL);
   ASSERT(result == 0);
-  ts->tv_sec += secs;
-  ts->tv_nsec += nanos;
+  ts->tv_sec = tv.tv_sec + secs;
+  ts->tv_nsec = (tv.tv_usec + remaining_micros) * kNanosecondsPerMicrosecond;
   if (ts->tv_nsec >= kNanosecondsPerSecond) {
     ts->tv_sec += 1;
     ts->tv_nsec -= kNanosecondsPerSecond;
   }
 }
 
 
 class ThreadStartData {
  public:
   ThreadStartData(Thread::ThreadStartFunction function,
@@ skipping 78 matching lines @@
 }
 
 
 intptr_t Thread::GetMaxStackSize() {
   const int kStackSize = (128 * kWordSize * KB);
   return kStackSize;
 }
 
 
 ThreadId Thread::GetCurrentThreadId() {
-  return pthread_self();
+  return gettid();
 }
 
 
 intptr_t Thread::ThreadIdToIntPtr(ThreadId id) {
   ASSERT(sizeof(id) == sizeof(intptr_t));
   return static_cast<intptr_t>(id);
 }
 
 
 bool Thread::Compare(ThreadId a, ThreadId b) {
   return pthread_equal(a, b) != 0;

[Cutch, 2014/04/23 23:07:14]

This needs to be updated.

[zra, 2014/04/23 23:12:07]

Done.

 }
 
 
 void Thread::GetThreadCpuUsage(ThreadId thread_id, int64_t* cpu_usage) {
   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) /
@@ skipping 142 matching lines @@
 
 void Monitor::NotifyAll() {
   // TODO(iposva): Do we need to track lock owners?
   int result = pthread_cond_broadcast(data_.cond());
   VALIDATE_PTHREAD_RESULT(result);
 }
 
 }  // namespace dart
 
 #endif  // defined(TARGET_OS_ANDROID)