Create DispatchSourceMach to run a MACH_RECV dispatch source.

sandbox/mac/mach_message_server.cc

 // Copyright 2014 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 "sandbox/mac/mach_message_server.h"
 
 #include <bsm/libbsm.h>
 #include <servers/bootstrap.h>
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/mac/mach_logging.h"
 #include "base/strings/stringprintf.h"
+#include "sandbox/mac/dispatch_source_mach.h"
 
 namespace sandbox {
 
 MachMessageServer::MachMessageServer(
     MessageDemuxer* demuxer,
     mach_port_t server_receive_right,
     mach_msg_size_t buffer_size)
     : demuxer_(demuxer),
       server_port_(server_receive_right),
-      server_queue_(NULL),
-      server_source_(NULL),
-      source_canceled_(dispatch_semaphore_create(0)),
       buffer_size_(
           mach_vm_round_page(buffer_size + sizeof(mach_msg_audit_trailer_t))),
       did_forward_message_(false) {
   DCHECK(demuxer_);
 }
 
 MachMessageServer::~MachMessageServer() {
-  if (server_source_) {
-    dispatch_source_cancel(server_source_);
-    dispatch_release(server_source_);
-
-    dispatch_semaphore_wait(source_canceled_, DISPATCH_TIME_FOREVER);
-    dispatch_release(source_canceled_);
-  }
-  if (server_queue_)
-    dispatch_release(server_queue_);
 }
 
 bool MachMessageServer::Initialize() {
   mach_port_t task = mach_task_self();
   kern_return_t kr;
 
   // Allocate a port for use as a new server port if one was not passed to the
   // constructor.
   if (!server_port_.is_valid()) {
     mach_port_t port;
@@ skipping 18 matching lines @@
   request_buffer_.reset(buffer, buffer_size_);
 
   kr = vm_allocate(task, &buffer, buffer_size_, kMachMsgMemoryFlags);
   if (kr != KERN_SUCCESS) {
     MACH_LOG(ERROR, kr) << "Failed to allocate reply buffer.";
     return false;
   }
   reply_buffer_.reset(buffer, buffer_size_);
 
   // Set up the dispatch queue to service the bootstrap port.
-  // TODO(rsesek): Specify DISPATCH_QUEUE_SERIAL, in the 10.7 SDK. NULL means
-  // the same thing but is not symbolically clear.
   std::string label = base::StringPrintf(
       "org.chromium.sandbox.MachMessageServer.%p", demuxer_);
-  server_queue_ = dispatch_queue_create(label.c_str(), NULL);
-  server_source_ = dispatch_source_create(DISPATCH_SOURCE_TYPE_MACH_RECV,
-      server_port_.get(), 0, server_queue_);
-  dispatch_source_set_event_handler(server_source_, ^{ ReceiveMessage(); });
-  dispatch_source_set_cancel_handler(server_source_, ^{
-      dispatch_semaphore_signal(source_canceled_);
-  });
-  dispatch_resume(server_source_);
+  dispatch_source_.reset(new DispatchSourceMach(
+      label.c_str(), server_port_.get(), ^{ ReceiveMessage(); }));
+  dispatch_source_->Resume();
 
   return true;
 }
 
 pid_t MachMessageServer::GetMessageSenderPID(IPCMessage request) {
   // Get the PID of the task that sent this request. This requires getting at
   // the trailer of the message, from the header.
   mach_msg_audit_trailer_t* trailer =
       reinterpret_cast<mach_msg_audit_trailer_t*>(
           reinterpret_cast<vm_address_t>(request.mach) +
@@ skipping 99 matching lines @@
   // forwarded message was sent from the process hosting this sandbox server,
   // destroying the message could also destroy rights held outside the scope of
   // this message server.
   if (!did_forward_message_) {
     mach_msg_destroy(request);
     mach_msg_destroy(reply);
   }
 }
 
 }  // namespace sandbox