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

Commit 06c725e5 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am a8512a71: Always set the scheduling group when starting a new thread. 

Merge commit 'a8512a71d3c2e3e67bbccf11251ed594d66f1f25' into gingerbread-plus-aosp

* commit 'a8512a71d3c2e3e67bbccf11251ed594d66f1f25':
  Always set the scheduling group when starting a new thread.
parents 87005bc5 9c82c48d

libs/utils/Threads.cpp

+23 −16
Original line number Diff line number Diff line
@@ -65,6 +65,20 @@ using namespace android; 


typedef void* (*android_pthread_entry)(void*);



static pthread_once_t gDoSchedulingGroupOnce = PTHREAD_ONCE_INIT;

static bool gDoSchedulingGroup = true;



static void checkDoSchedulingGroup(void) {

    char buf[PROPERTY_VALUE_MAX];

    int len = property_get("debug.sys.noschedgroups", buf, "");

    if (len > 0) {

        int temp;

        if (sscanf(buf, "%d", &temp) == 1) {

            gDoSchedulingGroup = temp == 0;

        }

    }

}



struct thread_data_t {

    thread_func_t   entryFunction;

    void*           userData;
@@ -80,6 +94,15 @@ struct thread_data_t { 
        char * name = t->threadName;

        delete t;

        setpriority(PRIO_PROCESS, 0, prio);

        pthread_once(&gDoSchedulingGroupOnce, checkDoSchedulingGroup);

        if (gDoSchedulingGroup) {

            if (prio >= ANDROID_PRIORITY_BACKGROUND) {

                set_sched_policy(androidGetTid(), SP_BACKGROUND);

            } else {

                set_sched_policy(androidGetTid(), SP_FOREGROUND);

            }

        }

        

        if (name) {

#if defined(HAVE_PRCTL)

            // Mac OS doesn't have this, and we build libutil for the host too
@@ -281,22 +304,6 @@ pid_t androidGetTid() 
#endif

}



#if defined(HAVE_PTHREADS)

static pthread_once_t gDoSchedulingGroupOnce = PTHREAD_ONCE_INIT;

static bool gDoSchedulingGroup = true;



static void checkDoSchedulingGroup(void) {

    char buf[PROPERTY_VALUE_MAX];

    int len = property_get("debug.sys.noschedgroups", buf, "");

    if (len > 0) {

        int temp;

        if (sscanf(buf, "%d", &temp) == 1) {

            gDoSchedulingGroup = temp == 0;

        }

    }

}

#endif



int androidSetThreadSchedulingGroup(pid_t tid, int grp)

{

    if (grp > ANDROID_TGROUP_MAX || grp < 0) {