Fix the crash for the AudioShared.

ppapi/shared_impl/ppb_audio_shared.cc

 // Copyright (c) 2012 The Chromium 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 "ppapi/shared_impl/ppb_audio_shared.h"
 
 #include "base/logging.h"
+#include "ppapi/nacl_irt/irt_ppapi.h"
 #include "ppapi/shared_impl/ppapi_globals.h"
 #include "ppapi/shared_impl/ppb_audio_config_shared.h"
 #include "ppapi/shared_impl/proxy_lock.h"
 
 namespace ppapi {
 
-#if defined(OS_NACL)
 namespace {
+bool thread_functions_set = false;
 // Because this is static, the function pointers will be NULL initially.
 PP_ThreadFunctions thread_functions;
 }
-#endif  // defined(OS_NACL)
 
 AudioCallbackCombined::AudioCallbackCombined()
     : callback_1_0_(NULL), callback_(NULL) {}
 
 AudioCallbackCombined::AudioCallbackCombined(
     PPB_Audio_Callback_1_0 callback_1_0)
     : callback_1_0_(callback_1_0), callback_(NULL) {}
 
 AudioCallbackCombined::AudioCallbackCombined(PPB_Audio_Callback callback)
     : callback_1_0_(NULL), callback_(callback) {}
@@ skipping 13 matching lines @@
   } else if (callback_1_0_) {
     callback_1_0_(sample_buffer, buffer_size_in_bytes, user_data);
   } else {
     NOTREACHED();
   }
 }
 
 PPB_Audio_Shared::PPB_Audio_Shared()
     : playing_(false),
       shared_memory_size_(0),
-#if defined(OS_NACL)
       thread_id_(0),
       thread_active_(false),
-#endif
       user_data_(NULL),
       client_buffer_size_bytes_(0),
       bytes_per_second_(0),
       buffer_index_(0) {
 }
 
 PPB_Audio_Shared::~PPB_Audio_Shared() {
   // Shut down the socket to escape any hanging |Receive|s.
   if (socket_.get())
     socket_->Shutdown();
   StopThread();
 }
 
 void PPB_Audio_Shared::SetCallback(const AudioCallbackCombined& callback,
                                    void* user_data) {
   callback_ = callback;
   user_data_ = user_data;
 }
 
 void PPB_Audio_Shared::SetStartPlaybackState() {
   DCHECK(!playing_);
 #if !defined(OS_NACL)
   DCHECK(!audio_thread_.get());
-#else
+#endif
   DCHECK(!thread_active_);
-#endif
   // If the socket doesn't exist, that means that the plugin has started before
   // the browser has had a chance to create all the shared memory info and
   // notify us. This is a common case. In this case, we just set the playing_
   // flag and the playback will automatically start when that data is available
   // in SetStreamInfo.
   playing_ = true;
   StartThread();
 }
 
 void PPB_Audio_Shared::SetStopPlaybackState() {
@@ skipping 38 matching lines @@
   // Don't start the thread unless all our state is set up correctly.
   if (!playing_ || !callback_.IsValid() || !socket_.get() ||
       !shared_memory_->memory() || !audio_bus_.get() || !client_buffer_.get() ||
       bytes_per_second_ == 0)
     return;
   // Clear contents of shm buffer before starting audio thread. This will
   // prevent a burst of static if for some reason the audio thread doesn't
   // start up quickly enough.
   memset(shared_memory_->memory(), 0, shared_memory_size_);
   memset(client_buffer_.get(), 0, client_buffer_size_bytes_);
+
+  if (thread_functions_set) {

[Mark Seaborn, 2014/03/20 23:23:30]

PPB_Audio is meant to fail under NaCl (for both SFI and non-SFI modes) if user
code didn't call ppapi_register_thread_creator().  Currently the code you have
here won't fail in this case because it falls back to the trusted plugin code
path (for --register-pepper-plugins).

I think you need a runtime flag for this file to indicate whether the plugin is
a nexe or a trusted plugin.

[hidehiko, 2014/04/21 14:47:40]

Done.

+    // Use NaCl's special API for IRT code that creates threads that call back
+    // into user code.
+    if (NULL == thread_functions.thread_create ||
+        NULL == thread_functions.thread_join)
+      return;
+
+    int result = thread_functions.thread_create(&thread_id_, CallRun, this);
+    DCHECK_EQ(result, 0);
+    thread_active_ = true;
+    return;
+  }
+
 #if !defined(OS_NACL)
   DCHECK(!audio_thread_.get());
   audio_thread_.reset(
       new base::DelegateSimpleThread(this, "plugin_audio_thread"));
   audio_thread_->Start();
-#else
-  // Use NaCl's special API for IRT code that creates threads that call back
-  // into user code.
-  if (NULL == thread_functions.thread_create ||
-      NULL == thread_functions.thread_join)
-    return;
-
-  int result = thread_functions.thread_create(&thread_id_, CallRun, this);
-  DCHECK_EQ(result, 0);
-  thread_active_ = true;
 #endif
 }
 
 void PPB_Audio_Shared::StopThread() {
 #if !defined(OS_NACL)
   if (audio_thread_.get()) {
     // In general, the audio thread should not do Pepper calls, but it might
     // anyway (for example, our Audio test does CallOnMainThread). If it did
     // a pepper call which acquires the lock (most of them do), and we try to
     // shut down the thread and Join it while holding the lock, we would
     // deadlock. So we give up the lock here so that the thread at least _can_
     // make Pepper calls without causing deadlock.
     CallWhileUnlocked(base::Bind(&base::DelegateSimpleThread::Join,
                                  base::Unretained(audio_thread_.get())));
     audio_thread_.reset();
   }
-#else
+#endif
   if (thread_active_) {
     // See comment above about why we unlock here.
     int result = CallWhileUnlocked(thread_functions.thread_join, thread_id_);
     DCHECK_EQ(0, result);
     thread_active_ = false;
   }
-#endif
 }
 
-#if defined(OS_NACL)
 // static
 void PPB_Audio_Shared::SetThreadFunctions(
     const struct PP_ThreadFunctions* functions) {
+  DCHECK(!thread_functions_set);
   DCHECK(thread_functions.thread_create == NULL);
   DCHECK(thread_functions.thread_join == NULL);
+  thread_functions_set = true;
   thread_functions = *functions;
 }
 
 // static
 void PPB_Audio_Shared::CallRun(void* self) {
   PPB_Audio_Shared* audio = static_cast<PPB_Audio_Shared*>(self);
   audio->Run();
 }
-#endif
 
 void PPB_Audio_Shared::Run() {
   int pending_data = 0;
   while (sizeof(pending_data) ==
          socket_->Receive(&pending_data, sizeof(pending_data))) {
     // |buffer_index_| must track the number of Receive() calls.  See the Send()
     // call below for why this is important.
     ++buffer_index_;
     if (pending_data < 0)
       break;
@@ skipping 11 matching lines @@
     // Let the other end know which buffer we just filled.  The buffer index is
     // used to ensure the other end is getting the buffer it expects.  For more
     // details on how this works see AudioSyncReader::WaitUntilDataIsReady().
     size_t bytes_sent = socket_->Send(&buffer_index_, sizeof(buffer_index_));
     if (bytes_sent != sizeof(buffer_index_))
       break;
   }
 }
 
 }  // namespace ppapi