Convert core.{h,cc} to use mojo::system::Mutex (and MutexLocker).

mojo/edk/system/core.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 "mojo/edk/system/core.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/time/time.h"
@@ skipping 68 matching lines @@
 
 // TODO(vtl): This should take a |scoped_ptr<PlatformSupport>| as a parameter.
 Core::Core(embedder::PlatformSupport* platform_support)
     : platform_support_(platform_support) {
 }
 
 Core::~Core() {
 }
 
 MojoHandle Core::AddDispatcher(const scoped_refptr<Dispatcher>& dispatcher) {
-  base::AutoLock locker(handle_table_lock_);
+  MutexLocker locker(&handle_table_mutex_);
   return handle_table_.AddDispatcher(dispatcher);
 }
 
 scoped_refptr<Dispatcher> Core::GetDispatcher(MojoHandle handle) {
   if (handle == MOJO_HANDLE_INVALID)
     return nullptr;
 
-  base::AutoLock locker(handle_table_lock_);
+  MutexLocker locker(&handle_table_mutex_);
   return handle_table_.GetDispatcher(handle);
 }
 
 MojoResult Core::GetAndRemoveDispatcher(MojoHandle handle,
                                         scoped_refptr<Dispatcher>* dispatcher) {
   if (handle == MOJO_HANDLE_INVALID)
     return MOJO_RESULT_INVALID_ARGUMENT;
 
-  base::AutoLock locker(handle_table_lock_);
+  MutexLocker locker(&handle_table_mutex_);
   return handle_table_.GetAndRemoveDispatcher(handle, dispatcher);
 }
 
 MojoResult Core::AsyncWait(MojoHandle handle,
                            MojoHandleSignals signals,
                            const base::Callback<void(MojoResult)>& callback) {
   scoped_refptr<Dispatcher> dispatcher = GetDispatcher(handle);
   DCHECK(dispatcher);
 
   scoped_ptr<AsyncWaiter> waiter = make_scoped_ptr(new AsyncWaiter(callback));
   MojoResult rv = dispatcher->AddAwakable(waiter.get(), signals, 0, nullptr);
   if (rv == MOJO_RESULT_OK)
     ignore_result(waiter.release());
   return rv;
 }
 
 MojoTimeTicks Core::GetTimeTicksNow() {
   return base::TimeTicks::Now().ToInternalValue();
 }
 
 MojoResult Core::Close(MojoHandle handle) {
   if (handle == MOJO_HANDLE_INVALID)
     return MOJO_RESULT_INVALID_ARGUMENT;
 
   scoped_refptr<Dispatcher> dispatcher;
   {
-    base::AutoLock locker(handle_table_lock_);
+    MutexLocker locker(&handle_table_mutex_);
     MojoResult result =
         handle_table_.GetAndRemoveDispatcher(handle, &dispatcher);
     if (result != MOJO_RESULT_OK)
       return result;
   }
 
   // The dispatcher doesn't have a say in being closed, but gets notified of it.
-  // Note: This is done outside of |handle_table_lock_|. As a result, there's a
+  // Note: This is done outside of |handle_table_mutex_|. As a result, there's a
   // race condition that the dispatcher must handle; see the comment in
   // |Dispatcher| in dispatcher.h.
   return dispatcher->Close();
 }
 
 MojoResult Core::Wait(MojoHandle handle,
                       MojoHandleSignals signals,
                       MojoDeadline deadline,
                       UserPointer<MojoHandleSignalsState> signals_state) {
   uint32_t unused = static_cast<uint32_t>(-1);
@@ skipping 52 matching lines @@
   if (result != MOJO_RESULT_OK)
     return result;
 
   scoped_refptr<MessagePipeDispatcher> dispatcher0 =
       MessagePipeDispatcher::Create(validated_options);
   scoped_refptr<MessagePipeDispatcher> dispatcher1 =
       MessagePipeDispatcher::Create(validated_options);
 
   std::pair<MojoHandle, MojoHandle> handle_pair;
   {
-    base::AutoLock locker(handle_table_lock_);
+    MutexLocker locker(&handle_table_mutex_);
     handle_pair = handle_table_.AddDispatcherPair(dispatcher0, dispatcher1);
   }
   if (handle_pair.first == MOJO_HANDLE_INVALID) {
     DCHECK_EQ(handle_pair.second, MOJO_HANDLE_INVALID);
     LOG(ERROR) << "Handle table full";
     dispatcher0->Close();
     dispatcher1->Close();
     return MOJO_RESULT_RESOURCE_EXHAUSTED;
   }
 
@@ skipping 44 matching lines @@
   // |WriteMessage()| and also so that we can unlock their locks afterwards
   // without accessing the handle table. These can be dumb pointers, since their
   // entries in the handle table won't get removed (since they'll be marked as
   // busy).
   std::vector<DispatcherTransport> transports(num_handles);
 
   // When we pass handles, we have to try to take all their dispatchers' locks
   // and mark the handles as busy. If the call succeeds, we then remove the
   // handles from the handle table.
   {
-    base::AutoLock locker(handle_table_lock_);
+    MutexLocker locker(&handle_table_mutex_);
     MojoResult result = handle_table_.MarkBusyAndStartTransport(
         message_pipe_handle, handles_reader.GetPointer(), num_handles,
         &transports);
     if (result != MOJO_RESULT_OK)
       return result;
   }
 
   MojoResult rv =
       dispatcher->WriteMessage(bytes, num_bytes, &transports, flags);
 
   // We need to release the dispatcher locks before we take the handle table
   // lock.
   for (uint32_t i = 0; i < num_handles; i++)
     transports[i].End();
 
   {
-    base::AutoLock locker(handle_table_lock_);
+    MutexLocker locker(&handle_table_mutex_);
     if (rv == MOJO_RESULT_OK) {
       handle_table_.RemoveBusyHandles(handles_reader.GetPointer(), num_handles);
     } else {
       handle_table_.RestoreBusyHandles(handles_reader.GetPointer(),
                                        num_handles);
     }
   }
 
   return rv;
 }
@@ skipping 21 matching lines @@
                                  &num_handles_value, flags);
     if (!dispatchers.empty()) {
       DCHECK_EQ(rv, MOJO_RESULT_OK);
       DCHECK(!num_handles.IsNull());
       DCHECK_LE(dispatchers.size(), static_cast<size_t>(num_handles_value));
 
       bool success;
       UserPointer<MojoHandle>::Writer handles_writer(handles,
                                                      dispatchers.size());
       {
-        base::AutoLock locker(handle_table_lock_);
+        MutexLocker locker(&handle_table_mutex_);
         success = handle_table_.AddDispatcherVector(
             dispatchers, handles_writer.GetPointer());
       }
       if (success) {
         handles_writer.Commit();
       } else {
         LOG(ERROR) << "Received message with " << dispatchers.size()
                    << " handles, but handle table full";
         // Close dispatchers (outside the lock).
         for (size_t i = 0; i < dispatchers.size(); i++) {
@@ skipping 21 matching lines @@
   if (result != MOJO_RESULT_OK)
     return result;
 
   scoped_refptr<DataPipeProducerDispatcher> producer_dispatcher =
       DataPipeProducerDispatcher::Create();
   scoped_refptr<DataPipeConsumerDispatcher> consumer_dispatcher =
       DataPipeConsumerDispatcher::Create();
 
   std::pair<MojoHandle, MojoHandle> handle_pair;
   {
-    base::AutoLock locker(handle_table_lock_);
+    MutexLocker locker(&handle_table_mutex_);
     handle_pair = handle_table_.AddDispatcherPair(producer_dispatcher,
                                                   consumer_dispatcher);
   }
   if (handle_pair.first == MOJO_HANDLE_INVALID) {
     DCHECK_EQ(handle_pair.second, MOJO_HANDLE_INVALID);
     LOG(ERROR) << "Handle table full";
     producer_dispatcher->Close();
     consumer_dispatcher->Close();
     return MOJO_RESULT_RESOURCE_EXHAUSTED;
   }
@@ skipping 141 matching lines @@
     return MOJO_RESULT_INVALID_ARGUMENT;
 
   scoped_ptr<embedder::PlatformSharedBufferMapping> mapping;
   MojoResult result = dispatcher->MapBuffer(offset, num_bytes, flags, &mapping);
   if (result != MOJO_RESULT_OK)
     return result;
 
   DCHECK(mapping);
   void* address = mapping->GetBase();
   {
-    base::AutoLock locker(mapping_table_lock_);
+    MutexLocker locker(&mapping_table_mutex_);
     result = mapping_table_.AddMapping(mapping.Pass());
   }
   if (result != MOJO_RESULT_OK)
     return result;
 
   buffer.Put(address);
   return MOJO_RESULT_OK;
 }
 
 MojoResult Core::UnmapBuffer(UserPointer<void> buffer) {
-  base::AutoLock locker(mapping_table_lock_);
+  MutexLocker locker(&mapping_table_mutex_);
   return mapping_table_.RemoveMapping(buffer.GetPointerValue());
 }
 
 // Note: We allow |handles| to repeat the same handle multiple times, since
 // different flags may be specified.
 // TODO(vtl): This incurs a performance cost in |Remove()|. Analyze this
 // more carefully and address it if necessary.
 MojoResult Core::WaitManyInternal(const MojoHandle* handles,
                                   const MojoHandleSignals* signals,
                                   uint32_t num_handles,
@@ skipping 45 matching lines @@
   if (signals_states) {
     for (; i < num_handles; i++)
       signals_states[i] = dispatchers[i]->GetHandleSignalsState();
   }
 
   return rv;
 }
 
 }  // namespace system
 }  // namespace mojo