Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa86d0ae authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix API for C compatibility" am: 6f3e974a am: 909219cc 

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

Change-Id: I5c4a960756ba710fd1e70294f0f10414f87113bf
parents 8525d0ec 909219cc

libutils/Threads.cpp

+11 −1
Original line number Original line Diff line number Diff line
@@ -302,7 +302,8 @@ void androidSetCreateThreadFunc(android_create_thread_fn func) 
}

}





#if defined(__ANDROID__)

#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 rc = 0;

    int lasterr = 0;

    int lasterr = 0;

    int curr_pri = getpriority(PRIO_PROCESS, tid);

    int curr_pri = getpriority(PRIO_PROCESS, tid);
@@ -334,6 +335,15 @@ int androidSetThreadPriority(pid_t tid, int pri, bool change_policy) { 




    return rc;

    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) {

int androidGetThreadPriority(pid_t tid) {

    return getpriority(PRIO_PROCESS, tid);

    return getpriority(PRIO_PROCESS, tid);

libutils/include/utils/AndroidThreads.h

+4 −1
Original line number Original line Diff line number Diff line
@@ -78,9 +78,12 @@ extern void androidSetCreateThreadFunc(android_create_thread_fn func); 
// should be one of the ANDROID_PRIORITY constants.  Returns INVALID_OPERATION

// 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;

// 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.

// 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

// 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.

// 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

// Get the current priority of a particular thread. Returns one of the

// ANDROID_PRIORITY constants or a negative result in case of error.

// ANDROID_PRIORITY constants or a negative result in case of error.