Refs #10260 OpenBSD support #25327

runtime/vm/os_thread_openbsd.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)
+#if defined(TARGET_OS_OPENBSD)
 
 #include "vm/os_thread.h"
 
 #include <errno.h>  // NOLINT
 #include <sys/time.h>  // NOLINT
 
 #include "platform/assert.h"
 #include "platform/utils.h"
 
 namespace dart {
@@ skipping 83 matching lines @@
     OSThread::SetCurrent(thread);
     thread->set_name(name);
 
     // Call the supplied thread start function handing it its parameters.
     function(parameter);
   }
 
   return NULL;
 }
 
-

[Ivan Posva, 2016/01/11 23:58:40]

White space changes.

[mulander, 2016/01/12 00:22:46]

Acknowledged.

 int OSThread::Start(const char* name,
                     ThreadStartFunction function,
                     uword parameter) {
   pthread_attr_t attr;
   int result = pthread_attr_init(&attr);
   RETURN_ON_PTHREAD_FAILURE(result);
 
   result = pthread_attr_setstacksize(&attr, OSThread::GetMaxStackSize());
   RETURN_ON_PTHREAD_FAILURE(result);
 
   ThreadStartData* data = new ThreadStartData(name, function, parameter);
 
   pthread_t tid;
   result = pthread_create(&tid, &attr, ThreadStart, data);
   RETURN_ON_PTHREAD_FAILURE(result);
 
   result = pthread_attr_destroy(&attr);
   RETURN_ON_PTHREAD_FAILURE(result);
 
   return 0;
 }
 
 
 const ThreadId OSThread::kInvalidThreadId = static_cast<ThreadId>(0);
 const ThreadJoinId OSThread::kInvalidThreadJoinId =
     static_cast<ThreadJoinId>(0);
 
-
 ThreadLocalKey OSThread::CreateThreadLocal(ThreadDestructor destructor) {
   pthread_key_t key = kUnsetThreadLocalKey;
   int result = pthread_key_create(&key, destructor);
   VALIDATE_PTHREAD_RESULT(result);
   ASSERT(key != kUnsetThreadLocalKey);
   return key;
 }
 
 
 void OSThread::DeleteThreadLocal(ThreadLocalKey key) {
@@ skipping 10 matching lines @@
 }
 
 
 intptr_t OSThread::GetMaxStackSize() {
   const int kStackSize = (128 * kWordSize * KB);
   return kStackSize;
 }
 
 
 ThreadId OSThread::GetCurrentThreadId() {
-  return gettid();
+  return pthread_self();
 }
 
-
 ThreadId OSThread::GetCurrentThreadTraceId() {
   return GetCurrentThreadId();
 }
 
-
 ThreadJoinId OSThread::GetCurrentThreadJoinId() {
   return pthread_self();
 }
 
-
 void OSThread::Join(ThreadJoinId id) {
   int result = pthread_join(id, NULL);
   ASSERT(result == 0);
 }
 
-
 intptr_t OSThread::ThreadIdToIntPtr(ThreadId id) {
   ASSERT(sizeof(id) == sizeof(intptr_t));
-  return static_cast<intptr_t>(id);
+  return reinterpret_cast<intptr_t>(id);
 }
 
 
 ThreadId OSThread::ThreadIdFromIntPtr(intptr_t id) {
-  return static_cast<ThreadId>(id);
+  return reinterpret_cast<ThreadId>(id);
 }
 
 
 bool OSThread::Compare(ThreadId a, ThreadId b) {
-  return a == b;
+  return pthread_equal(a, b) != 0;
 }
 
 
 void OSThread::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 11 matching lines @@
   VALIDATE_PTHREAD_RESULT(result);
 #endif  // defined(DEBUG)
 
   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);
 
+  // When running with assertions enabled we do track the owner.
 #if defined(DEBUG)
-  // When running with assertions enabled we do track the owner.
   owner_ = OSThread::kInvalidThreadId;
 #endif  // defined(DEBUG)
 }
 
 
 Mutex::~Mutex() {
   int result = pthread_mutex_destroy(data_.mutex());
   // Verify that the pthread_mutex was destroyed.
   VALIDATE_PTHREAD_RESULT(result);
 
+  // When running with assertions enabled we do track the owner.
 #if defined(DEBUG)
-  // When running with assertions enabled we do track the owner.
   ASSERT(owner_ == OSThread::kInvalidThreadId);
 #endif  // defined(DEBUG)
 }
 
 
 void Mutex::Lock() {
   int result = pthread_mutex_lock(data_.mutex());
   // Specifically check for dead lock to help debugging.
   ASSERT(result != EDEADLK);
   ASSERT_PTHREAD_SUCCESS(result);  // Verify no other errors.
+  // When running with assertions enabled we do track the owner.
 #if defined(DEBUG)
-  // When running with assertions enabled we do track the owner.
   owner_ = OSThread::GetCurrentThreadId();
 #endif  // defined(DEBUG)
 }
 
 
 bool Mutex::TryLock() {
   int result = pthread_mutex_trylock(data_.mutex());
   // Return false if the lock is busy and locking failed.
   if (result == EBUSY) {
     return false;
   }
   ASSERT_PTHREAD_SUCCESS(result);  // Verify no other errors.
+  // When running with assertions enabled we do track the owner.
 #if defined(DEBUG)
-  // When running with assertions enabled we do track the owner.
   owner_ = OSThread::GetCurrentThreadId();
 #endif  // defined(DEBUG)
   return true;
 }
 
 
 void Mutex::Unlock() {
+  // When running with assertions enabled we do track the owner.
 #if defined(DEBUG)
-  // When running with assertions enabled we do track the owner.
   ASSERT(IsOwnedByCurrentThread());
   owner_ = OSThread::kInvalidThreadId;
 #endif  // defined(DEBUG)
   int result = pthread_mutex_unlock(data_.mutex());
   // Specifically check for wrong thread unlocking to aid debugging.
   ASSERT(result != EPERM);
   ASSERT_PTHREAD_SUCCESS(result);  // Verify no other errors.
 }
 
 
@@ skipping 116 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)
+#endif  // defined(TARGET_OS_OPENBSD)