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

Commit 7fb0ee0c authored by Elliott Hughes's avatar Elliott Hughes Committed by Gerrit Code Review
Browse files

Merge "Remove androidGetTid."

parents 5f231a43 b7659613

include/utils/AndroidThreads.h

+0 −3
Original line number Diff line number Diff line
@@ -73,9 +73,6 @@ extern void androidSetCreateThreadFunc(android_create_thread_fn func); 
// ------------------------------------------------------------------

// Extra functions working with raw pids.



// Get pid for the current thread.

extern pid_t androidGetTid();



#ifdef HAVE_ANDROID_OS

// Change the priority AND scheduling group of a particular thread.  The priority

// should be one of the ANDROID_PRIORITY constants.  Returns INVALID_OPERATION

include/utils/Thread.h

+2 −2
Original line number Diff line number Diff line
@@ -71,8 +71,8 @@ public: 
            bool        isRunning() const;



#ifdef HAVE_ANDROID_OS

    // Return the thread's kernel ID, same as the thread itself calling gettid() or

    // androidGetTid(), or -1 if the thread is not running.

    // Return the thread's kernel ID, same as the thread itself calling gettid(),

    // or -1 if the thread is not running.

            pid_t       getTid() const;

#endif

libcutils/sched_policy.c

+0 −4
Original line number Diff line number Diff line
@@ -222,11 +222,9 @@ static int getSchedulerGroup(int tid, char* buf, size_t bufLen) 


int get_sched_policy(int tid, SchedPolicy *policy)

{

#ifdef HAVE_GETTID

    if (tid == 0) {

        tid = gettid();

    }

#endif

    pthread_once(&the_once, __initialize);



    if (__sys_supports_schedgroups) {
@@ -261,11 +259,9 @@ int get_sched_policy(int tid, SchedPolicy *policy) 


int set_sched_policy(int tid, SchedPolicy policy)

{

#ifdef HAVE_GETTID

    if (tid == 0) {

        tid = gettid();

    }

#endif

    policy = _policy(policy);

    pthread_once(&the_once, __initialize);

libutils/Threads.cpp

+0 −9
Original line number Diff line number Diff line
@@ -306,15 +306,6 @@ void androidSetCreateThreadFunc(android_create_thread_fn func) 
    gCreateThreadFn = func;

}



pid_t androidGetTid()

{

#ifdef HAVE_GETTID

    return gettid();

#else

    return getpid();

#endif

}



#ifdef HAVE_ANDROID_OS

int androidSetThreadPriority(pid_t tid, int pri)

{