[NaCl SDK] Upate atomic ops in nacl_io

native_client_sdk/src/libraries/nacl_io/mount_dev.cc

 /* Copyright (c) 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.
  */
 #if defined(WIN32)
 #define _CRT_RAND_S
 #endif
 
 #include <errno.h>
 #include <fcntl.h>
@@ skipping 202 matching lines @@
   VarInterface* var_intr = mount_->ppapi()->GetVarInterface();
 
   if (!(var_intr && msg_intr))
     return ENOSYS;
 
   // We append the prefix_ to the data in buf, then package it up
   // and post it as a message.
   const char* data = static_cast<const char*>(buf);
   std::string message;
   {
-    AutoLock lock(&lock_);
+    AUTO_LOCK(node_lock_);
     message = prefix_;
   }
   message.append(data, count);
   uint32_t len = static_cast<uint32_t>(message.size());
   struct PP_Var val = var_intr->VarFromUtf8(message.data(), len);
   msg_intr->PostMessage(mount_->ppapi()->GetInstance(), val);
   *out_bytes = count;
   return 0;
 }
 
 Error TtyNode::Read(size_t offs, void* buf, size_t count, int* out_bytes) {
-  AutoLock lock(&lock_);
+  AUTO_LOCK(node_lock_);
   while (input_buffer_.size() <= 0) {
-    pthread_cond_wait(&is_readable_, &lock_);
+    pthread_cond_wait(&is_readable_, node_lock_.mutex());
   }
 
   // Copies data from the input buffer into buf.
   size_t bytes_to_copy = std::min(count, input_buffer_.size());
   std::copy(input_buffer_.begin(), input_buffer_.begin() + bytes_to_copy,
             static_cast<char*>(buf));
   *out_bytes = bytes_to_copy;
   input_buffer_.erase(input_buffer_.begin(),
                       input_buffer_.begin() + bytes_to_copy);
   return 0;
 }
 
 Error TtyNode::Ioctl(int request, char* arg) {
   if (request == TIOCNACLPREFIX) {
     // This ioctl is used to change the prefix for this tty node.
     // The prefix is used to distinguish messages intended for this
     // tty node from all the other messages cluttering up the
     // javascript postMessage() channel.
-    AutoLock lock(&lock_);
+    AUTO_LOCK(node_lock_);
     prefix_ = arg;
     return 0;
   } else if (request == TIOCNACLINPUT) {
     // This ioctl is used to deliver data from the user to this tty node's
     // input buffer. We check if the prefix in the input data matches the
     // prefix for this node, and only deliver the data if so.
     struct tioc_nacl_input_string* message =
       reinterpret_cast<struct tioc_nacl_input_string*>(arg);
-    AutoLock lock(&lock_);
+    AUTO_LOCK(node_lock_);
     if (message->length >= prefix_.size() &&
         strncmp(message->buffer, prefix_.data(), prefix_.size()) == 0) {
       input_buffer_.insert(input_buffer_.end(),
                            message->buffer + prefix_.size(),
                            message->buffer + message->length);
       pthread_cond_broadcast(&is_readable_);
       return 0;
     }
     return ENOTTY;
   } else {
@@ skipping 80 matching lines @@
 
   // Don't allow execute access.
   if (a_mode & X_OK)
     return EACCES;
 
   return 0;
 }
 
 Error MountDev::Open(const Path& path, int mode, ScopedMountNode* out_node) {
   out_node->reset(NULL);
-  AutoLock lock(&lock_);
 
   // Don't allow creating any files.
   if (mode & O_CREAT)
     return EINVAL;
 
   return root_->FindChild(path.Join(), out_node);
 }
 
 Error MountDev::Unlink(const Path& path) { return EINVAL; }
 
@@ skipping 30 matching lines @@
   INITIALIZE_DEV_NODE_1("/console2", ConsoleNode, PP_LOGLEVEL_WARNING);
   INITIALIZE_DEV_NODE_1("/console3", ConsoleNode, PP_LOGLEVEL_ERROR);
   INITIALIZE_DEV_NODE("/tty", TtyNode);
   INITIALIZE_DEV_NODE_1("/stdin", RealNode, 0);
   INITIALIZE_DEV_NODE_1("/stdout", RealNode, 1);
   INITIALIZE_DEV_NODE_1("/stderr", RealNode, 2);
 
   return 0;
 }