am 47dc4d43: Merge "Make pthread_create more forgiving of invalid sched_policy. Bug: 7005326"

* commit '47dc4d431017e701239dd7d9a16333e0ad56a0ac':
  Make pthread_create more forgiving of invalid sched_policy. Bug: 7005326
This commit is contained in:
Elliott Hughes 2012-09-18 17:13:15 -07:00 committed by Android Git Automerger
commit 30289f0dd6

View File

@ -205,6 +205,8 @@ void __thread_entry(int (*func)(void*), void *arg, void **tls)
pthread_exit((void*) result);
}
#include <private/logd.h>
__LIBC_ABI_PRIVATE__
int _init_thread(pthread_internal_t* thread, pid_t kernel_id, pthread_attr_t* attr,
void* stack_base, bool add_to_thread_list)
@ -229,7 +231,9 @@ int _init_thread(pthread_internal_t* thread, pid_t kernel_id, pthread_attr_t* at
struct sched_param param;
param.sched_priority = thread->attr.sched_priority;
if (sched_setscheduler(kernel_id, thread->attr.sched_policy, &param) == -1) {
error = errno;
// For back compat reasons, we just warn about possible invalid sched_policy
const char* msg = "pthread_create sched_setscheduler call failed: %s\n";
__libc_android_log_print(ANDROID_LOG_WARN, "libc", msg, strerror(errno));
}
}