Merge "Fix API for C compatibility" am: 6f3e974ab5

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1408797

Change-Id: I0aaa7ab7ceb9e0397fdd18b4802d8239e39ad174
This commit is contained in:
Treehugger Robot 2020-08-24 20:27:10 +00:00 committed by Automerger Merge Worker
commit 909219ccc2
2 changed files with 15 additions and 2 deletions

View file

@ -302,7 +302,8 @@ void androidSetCreateThreadFunc(android_create_thread_fn func)
}
#if defined(__ANDROID__)
int androidSetThreadPriority(pid_t tid, int pri, bool change_policy) {
namespace {
int androidSetThreadPriorityInternal(pid_t tid, int pri, bool change_policy) {
int rc = 0;
int lasterr = 0;
int curr_pri = getpriority(PRIO_PROCESS, tid);
@ -334,6 +335,15 @@ int androidSetThreadPriority(pid_t tid, int pri, bool change_policy) {
return rc;
}
} // namespace
int androidSetThreadPriority(pid_t tid, int pri) {
return androidSetThreadPriorityInternal(tid, pri, true);
}
int androidSetThreadPriorityAndPolicy(pid_t tid, int pri, bool change_policy) {
return androidSetThreadPriorityInternal(tid, pri, change_policy);
}
int androidGetThreadPriority(pid_t tid) {
return getpriority(PRIO_PROCESS, tid);

View file

@ -78,9 +78,12 @@ extern void androidSetCreateThreadFunc(android_create_thread_fn func);
// should be one of the ANDROID_PRIORITY constants. Returns INVALID_OPERATION
// if the priority set failed, else another value if just the group set failed;
// in either case errno is set. Thread ID zero means current thread.
// This is equivalent to androidSetThreadPriorityAndPolicy(tid, prio, true);
extern int androidSetThreadPriority(pid_t tid, int prio);
// Parameter "change_policy" indicates if sched policy should be changed. It needs
// not be checked again if the change is done elsewhere like activity manager.
extern int androidSetThreadPriority(pid_t tid, int prio, bool change_policy = true);
extern int androidSetThreadPriorityAndPolicy(pid_t tid, int prio, bool change_policy);
// Get the current priority of a particular thread. Returns one of the
// ANDROID_PRIORITY constants or a negative result in case of error.