commit 4b16f0b860f4d59601706305b2949b98db586a47
author Brian Carlstrom <bdc@google.com> Mon Mar 20 22:27:28 2017 -0700
committer Brian Carlstrom <bdc@google.com> Mon Mar 20 22:27:28 2017 -0700
tree 0ec41cbe1e526b6c185c4c540c3891ea2acf7ead
parent 0877ddb38a798827de962723d0436cab1551975d

Restore broken code for the Mac

Test: m -j48
Bug: 36445592
Change-Id: I50d1fbc62e057860f32838734333267419ea60ee

runtime/thread.cc

diff --git a/runtime/thread.cc b/runtime/thread.cc
index ee77945..008c388 100644
--- a/runtime/thread.cc
+++ b/runtime/thread.cc
@@ -16,8 +16,11 @@
 
 #include "thread.h"
 
-#include <pthread.h>
+#if !defined(__APPLE__)
 #include <sched.h>
+#endif
+
+#include <pthread.h>
 #include <signal.h>
 #include <sys/resource.h>
 #include <sys/time.h>
@@ -1590,17 +1593,23 @@
      << " nice=" << getpriority(PRIO_PROCESS, tid)
      << " cgrp=" << scheduler_group_name;
   if (thread != nullptr) {
+    int policy;
+    sched_param sp;
+#if !defined(__APPLE__)
     // b/36445592 Don't use pthread_getschedparam since pthread may have exited.
-    int policy = sched_getscheduler(tid);
+    policy = sched_getscheduler(tid);
     if (policy == -1) {
       PLOG(WARNING) << "sched_getscheduler(" << tid << ")";
     }
-    sched_param sp;
     int sched_getparam_result = sched_getparam(tid, &sp);
     if (sched_getparam_result == -1) {
       PLOG(WARNING) << "sched_getparam(" << tid << ", &sp)";
       sp.sched_priority = -1;
     }
+#else
+    CHECK_PTHREAD_CALL(pthread_getschedparam, (thread->tlsPtr_.pthread_self, &policy, &sp),
+                       __FUNCTION__);
+#endif
     os << " sched=" << policy << "/" << sp.sched_priority
        << " handle=" << reinterpret_cast<void*>(thread->tlsPtr_.pthread_self);
   }