Signal condition variable in the critical section.

components/nacl/loader/nacl_ipc_adapter.cc

 // Copyright 2013 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 "components/nacl/loader/nacl_ipc_adapter.h"
 
 #include <limits.h>
 #include <string.h>
 
 #include "base/basictypes.h"
@@ skipping 419 matching lines @@
     base::AutoLock lock(lock_);
     while (locked_data_.to_be_received_.empty() &&
            !locked_data_.channel_closed_)
       cond_var_.Wait();
     if (locked_data_.channel_closed_) {
       retval = -1;
     } else {
       retval = LockedReceive(msg);
       DCHECK(retval > 0);
     }
+    cond_var_.Signal();
   }
-  cond_var_.Signal();
   return retval;
 }
 
 void NaClIPCAdapter::CloseChannel() {
   {
     base::AutoLock lock(lock_);
     locked_data_.channel_closed_ = true;
+    cond_var_.Signal();
   }
-  cond_var_.Signal();
 
   task_runner_->PostTask(FROM_HERE,
       base::Bind(&NaClIPCAdapter::CloseChannelOnIOThread, this));
 }
 
 NaClDesc* NaClIPCAdapter::MakeNaClDesc() {
   return MakeNaClDescCustom(this);
 }
 
 #if defined(OS_POSIX)
@@ skipping 83 matching lines @@
         }
         // No default, so the compiler will warn us if new types get added.
       }
       if (nacl_desc.get())
         rewritten_msg->AddDescriptor(nacl_desc.release());
     }
     if (new_msg)
       SaveMessage(*new_msg, rewritten_msg.get());
     else
       SaveMessage(msg, rewritten_msg.get());
+    cond_var_.Signal();
   }
-  cond_var_.Signal();
   return true;
 }
 
 void NaClIPCAdapter::OnChannelConnected(int32 peer_pid) {
 }
 
 void NaClIPCAdapter::OnChannelError() {
   CloseChannel();
 }
 
@@ skipping 117 matching lines @@
   header.flags = msg.flags();
   header.num_fds = static_cast<int>(rewritten_msg->desc_count());
 
   rewritten_msg->SetData(header, msg.payload(), msg.payload_size());
   locked_data_.to_be_received_.push(rewritten_msg);
 }
 
 int TranslatePepperFileReadWriteOpenFlagsForTesting(int32_t pp_open_flags) {
   return TranslatePepperFileReadWriteOpenFlags(pp_open_flags);
 }