Use task_t, thread_t, and exception_handler_t uniformly

util/mach/mach_message_server.cc

 // Copyright 2014 The Crashpad Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 115 matching lines @@
   mach_msg_size_t request_alloc = round_page(max_request_size + trailer_alloc);
   mach_msg_size_t request_size = (options & MACH_RCV_LARGE)
                                      ? request_alloc
                                      : max_request_size + trailer_alloc;
 
   mach_msg_size_t max_reply_size = interface->MachMessageServerReplySize();
   mach_msg_size_t reply_alloc = round_page(
       (options & MACH_SEND_TRAILER) ? (max_reply_size + MAX_TRAILER_SIZE)
                                     : max_reply_size);
 
-  mach_port_t self = mach_task_self();

[Mark Mentovai, 2014/09/18 16:16:13]

This was the only place in bpoop where mach_task_self() was cached in a local
variable.

Since we know how mach_task_self() actually works, it’s pointless to cache it in
a local. In all modern code, I just use it inline wherever I need it.

-
   kern_return_t kr;
 
   do {
     mach_msg_size_t this_request_alloc = request_alloc;
     mach_msg_size_t this_request_size = request_size;
 
     base::mac::ScopedMachVM request_scoper;
     mach_msg_header_t* request_header = NULL;
 
     while (!request_scoper.address()) {
       vm_address_t request_addr;
-      kr = vm_allocate(self,
+      kr = vm_allocate(mach_task_self(),
                        &request_addr,
                        this_request_alloc,
                        VM_FLAGS_ANYWHERE | VM_MAKE_TAG(VM_MEMORY_MACH_MSG));
       if (kr != KERN_SUCCESS) {
         return kr;
       }
       base::mac::ScopedMachVM trial_request_scoper(request_addr,
                                                    this_request_alloc);
       request_header = reinterpret_cast<mach_msg_header_t*>(request_addr);
 
@@ skipping 22 matching lines @@
       } else if (kr == MACH_RCV_TOO_LARGE && options & MACH_RCV_LARGE) {
         this_request_size =
             round_page(request_header->msgh_size + trailer_alloc);
         this_request_alloc = this_request_size;
       } else {
         return kr;
       }
     }
 
     vm_address_t reply_addr;
-    kr = vm_allocate(self,
+    kr = vm_allocate(mach_task_self(),
                      &reply_addr,
                      reply_alloc,
                      VM_FLAGS_ANYWHERE | VM_MAKE_TAG(VM_MEMORY_MACH_MSG));
     if (kr != KERN_SUCCESS) {
       return kr;
     }
 
     base::mac::ScopedMachVM reply_scoper(reply_addr, reply_alloc);
 
     mach_msg_header_t* reply_header =
@@ skipping 76 matching lines @@
         // persistent mode, and just return success when not in persistent mode.
         return (persistent == kPersistent) ? MACH_RCV_TIMED_OUT : kr;
       }
     }
   } while (persistent == kPersistent);
 
   return kr;
 }
 
 }  // namespace crashpad