Debug stub: associate NaClAppThread with IThread

src/trusted/debug_stub/posix/thread_impl.cc

 /*
  * Copyright (c) 2012 The Native Client Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include <stdexcept>
 #include <string.h>
 
 #include "native_client/src/shared/platform/nacl_log.h"
@@ skipping 23 matching lines @@
   return mutex_;
 }
 
 static IThread::ThreadMap_t *ThreadGetMap() {
   static IThread::ThreadMap_t* map_ = new IThread::ThreadMap_t;
   return map_;
 }
 
 class Thread : public IThread {
  public:
-  explicit Thread(uint32_t id) : ref_(1), id_(id), state_(DEAD) {}
+  Thread(uint32_t id, struct NaClAppThread *natp)
+      : ref_(1), id_(id), natp_(natp), state_(DEAD) {}
   ~Thread() {}
 
   uint32_t GetId() {
     return id_;
   }
 
   State GetState() {
     return state_;
   }
 
@@ skipping 62 matching lines @@
       return NACL_SIGNAL_RETURN;
     } else {
       // Do not attempt to debug crashes in trusted code.
       return NACL_SIGNAL_SEARCH;
     }
   }
 
  private:
   uint32_t ref_;
   uint32_t id_;
+  struct NaClAppThread *natp_;
   State  state_;
   struct NaClSignalContext context_;
 
   friend class IThread;
 };
 
-// TODO(mseaborn): This is duplicated in the Windows version.

[Mark Seaborn, 2012/05/07 21:56:49]

This TODO should be kept with Create(), because it still applies.

[eaeltsin, 2012/05/08 11:10:19]

Done.

-IThread* IThread::Acquire(uint32_t id, bool create) {
+IThread* IThread::Create(uint32_t id, struct NaClAppThread* natp) {

[Mark Seaborn, 2012/05/07 21:56:49]

'*' spacing style differs between here and above.  If there's a doubt, I'd
suggest using " *", which is the prevailing NaCl style.

[eaeltsin, 2012/05/08 11:10:19]

But if I change this, it will differ from below (which seems a bit closer as it
is the same function :)) I'll try clean the style in the whole file when
refactoring this in the subsequent changes.

   MutexLock lock(ThreadGetLock());
   Thread* thread;
   ThreadMap_t &map = *ThreadGetMap();
 
-  // Check if we have that thread
   if (map.count(id)) {
-    thread = static_cast<Thread*>(map[id]);
-    thread->ref_++;
-    return thread;
+    NaClLog(LOG_ERROR, "IThread::Create: thread 0x%x already exists\n", id);

[Mark Seaborn, 2012/05/07 21:56:49]

This should be LOG_FATAL because the callers are not checking for NULL.

[eaeltsin, 2012/05/08 11:10:19]

Done.

+    return NULL;
   }
 
-  // If not, can we create it?
-  if (create) {
-    // If not add it to the map
-    thread = new Thread(id);
-    map[id] = thread;
-    return thread;
-  }
-
-  return NULL;
+  thread = new Thread(id, natp);
+  map[id] = thread;
+  return thread;
 }
 
 // TODO(mseaborn): This is duplicated in the Windows version.
+IThread* IThread::Acquire(uint32_t id) {
+  MutexLock lock(ThreadGetLock());
+  Thread* thread;
+  ThreadMap_t &map = *ThreadGetMap();
+
+  if (map.count(id) == 0) {
+    NaClLog(LOG_ERROR, "IThread::Acquire: thread 0x%x does not exist\n", id);

[Mark Seaborn, 2012/05/07 21:56:49]

Shouldn't this be LOG_FATAL too?  The callers aren't checking for NULL.

[eaeltsin, 2012/05/08 11:10:19]

Done.

+    return NULL;
+  }
+
+  thread = static_cast<Thread*>(map[id]);
+  thread->ref_++;
+  return thread;
+}
+
+// TODO(mseaborn): This is duplicated in the Windows version.
 void IThread::Release(IThread *ithread) {
   MutexLock lock(ThreadGetLock());
   Thread* thread = static_cast<Thread*>(ithread);
   thread->ref_--;
 
   if (thread->ref_ == 0) {
     ThreadGetMap()->erase(thread->id_);
     delete static_cast<IThread*>(thread);
   }
 }
 
 void IThread::SetExceptionCatch(IThread::CatchFunc_t func, void *cookie) {
   NaClSignalHandlerAdd(Thread::SignalHandler);
   s_CatchFunc = func;
   s_CatchCookie = cookie;
 }
 
 
 }  // End of port namespace