Thread and Timeline fixes for Mojo.

runtime/vm/os_thread.h

 // 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.
 
 #ifndef VM_OS_THREAD_H_
 #define VM_OS_THREAD_H_
 
 #include "platform/globals.h"
 #include "vm/allocation.h"
 #include "vm/globals.h"
@@ skipping 40 matching lines @@
 class OSThread : public BaseThread {
  public:
   OSThread();
   ~OSThread();
 
   ThreadId id() const {
     ASSERT(id_ != OSThread::kInvalidThreadId);
     return id_;
   }
 
-  ThreadId join_id() const {
+  ThreadJoinId join_id() const {
     ASSERT(join_id_ != OSThread::kInvalidThreadJoinId);
     return join_id_;
   }
 
   ThreadId trace_id() const {
     ASSERT(trace_id_ != OSThread::kInvalidThreadJoinId);
     return trace_id_;
   }
 
   const char* name() const {
@@ skipping 47 matching lines @@
   static OSThread* Current() {
     BaseThread* thread = GetCurrentTLS();
     OSThread* os_thread = NULL;
     if (thread != NULL) {
       if (thread->is_os_thread()) {
         os_thread = reinterpret_cast<OSThread*>(thread);
       } else {
         Thread* vm_thread = reinterpret_cast<Thread*>(thread);
         os_thread = GetOSThreadFromThread(vm_thread);
       }
+    } else {
+      os_thread = new OSThread();

[Ivan Posva, 2015/12/01 18:00:51]

Wondering whether we should move this out into a helper function to make this
function small and inlineable.

[zra, 2015/12/01 18:51:51]

Done.

+      OSThread::SetCurrent(os_thread);
+      os_thread->set_name("Unknown");
     }
     return os_thread;
   }
   static void SetCurrent(OSThread* current);
 
   // TODO(5411455): Use flag to override default value and Validate the
   // stack size by querying OS.
   static uword GetSpecifiedStackSize() {
     ASSERT(OSThread::kStackSizeBuffer < OSThread::GetMaxStackSize());
     uword stack_size = OSThread::GetMaxStackSize() - OSThread::kStackSizeBuffer;
@@ skipping 25 matching lines @@
   static intptr_t GetMaxStackSize();
   static void Join(ThreadJoinId id);
   static intptr_t ThreadIdToIntPtr(ThreadId id);
   static ThreadId ThreadIdFromIntPtr(intptr_t id);
   static bool Compare(ThreadId a, ThreadId b);
   static void GetThreadCpuUsage(ThreadId thread_id, int64_t* cpu_usage);
 
   // Called at VM startup and shutdown.
   static void InitOnce();
 
-  static bool IsThreadInList(ThreadId join_id);
+  static bool IsThreadInList(ThreadJoinId join_id);
 
   static const intptr_t kStackSizeBuffer = (4 * KB * kWordSize);
 
   static ThreadLocalKey kUnsetThreadLocalKey;
   static ThreadId kInvalidThreadId;
   static ThreadJoinId kInvalidThreadJoinId;
 
  private:
   // These methods should not be used in a generic way and hence
   // are private, they have been added to solve the problem of
   // accessing the VM thread structure from an OSThread object
   // in the windows thread interrupter which is used for profiling.
   // We could eliminate this requirement if the windows thread interrupter
   // is implemented differently.
   Thread* thread() const { return thread_; }
   void set_thread(Thread* value) {
     thread_ = value;
   }
 
   static void Cleanup();
   static ThreadId GetCurrentThreadTraceId();
   static ThreadJoinId GetCurrentThreadJoinId();
   static OSThread* GetOSThreadFromThread(Thread* thread);
   static void AddThreadToList(OSThread* thread);
   static void RemoveThreadFromList(OSThread* thread);
 
   static ThreadLocalKey thread_key_;
 
   const ThreadId id_;
-  const ThreadId join_id_;
+  const ThreadJoinId join_id_;
   const ThreadId trace_id_;  // Used to interface with tracing tools.
   char* name_;  // A name for this thread.
 
   Mutex* timeline_block_lock_;
   TimelineEventBlock* timeline_block_;
 
   // All |Thread|s are registered in the thread list.
   OSThread* thread_list_next_;
 
   uintptr_t thread_interrupt_disabled_;
@@ skipping 99 matching lines @@
 #endif  // defined(DEBUG)
 
   DISALLOW_COPY_AND_ASSIGN(Monitor);
 };
 
 
 }  // namespace dart
 
 
 #endif  // VM_OS_THREAD_H_