Use pthread_mach_thread_np(pthread_self()) instead of mach_thread_self()

src/shared/platform/osx/nacl_clock.c

 /*
  * Copyright (c) 2012 The Native Client 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 "native_client/src/shared/platform/nacl_clock.h"
 
 #include "native_client/src/include/nacl_macros.h"
 #include "native_client/src/include/portability.h"
 #include "native_client/src/shared/platform/nacl_host_desc.h"
 #include "native_client/src/shared/platform/nacl_log.h"
 #include "native_client/src/shared/platform/nacl_time.h"
 #include "native_client/src/trusted/service_runtime/include/sys/errno.h"
 
 /*
  * OSX does not include POSIX.1-2011 functions, so we emulate using
  * Mach calls.
  */
 #include <mach/mach.h>
 #include <mach/mach_time.h>
 #include <mach/task.h>
 #include <mach/task_info.h>
 #include <mach/thread_info.h>
+#include <pthread.h>
 
 static int                        g_NaClClock_is_initialized = 0;
 static mach_timebase_info_data_t  g_NaCl_time_base_info;
 
 int NaClClockInit(void) {
   g_NaClClock_is_initialized = (mach_timebase_info(&g_NaCl_time_base_info)
                                 == KERN_SUCCESS);
 
   return g_NaClClock_is_initialized;
 }
@@ skipping 89 matching lines @@
                      + absolutetime_info.total_system)
                     / NACL_NANOS_PER_UNIT);
       tp->tv_nsec = ((absolutetime_info.total_user
                       + absolutetime_info.total_system)
                      % NACL_NANOS_PER_UNIT);
       rv = 0;
       break;
     case NACL_CLOCK_THREAD_CPUTIME_ID:
       count = THREAD_BASIC_INFO_COUNT;
 
-      if (KERN_SUCCESS == thread_info(mach_thread_self(),
+      /*
+       * Don't use mach_thread_self() because it requires a separate
+       * mach_port_deallocate() system call to release it. Instead, rely on
+       * pthread's cached copy of the port.
+       */
+      if (KERN_SUCCESS == thread_info(pthread_mach_thread_np(pthread_self()),
                                       THREAD_BASIC_INFO,
                                       (thread_info_t) basic_info,
                                       &count)) {
         tick_ns = ((basic_info->user_time.microseconds
                     + basic_info->system_time.microseconds)
                    * NACL_NANOS_PER_MICRO);
         tp->tv_sec = (basic_info->user_time.seconds
                       + basic_info->system_time.seconds
                       + (tick_ns / NACL_NANOS_PER_UNIT));
         tp->tv_nsec = tick_ns % NACL_NANOS_PER_UNIT;
         rv = 0;
       }
       break;
   }
   return rv;
 }