*/
pid_t systemServerPid;
+ int kernelGroupScheduling;
+
//#define COUNT_PRECISE_METHODS
#ifdef COUNT_PRECISE_METHODS
PointerSet* preciseMethods;
}
#endif
+ /* Configure group scheduling capabilities */
+ if (!access("/dev/cpuctl/tasks", F_OK)) {
+ LOGV("Using kernel group scheduling");
+ gDvm.kernelGroupScheduling = 1;
+ } else {
+ LOGV("Using kernel scheduler policies");
+ }
+
/* configure signal handling */
if (!gDvm.reduceSignals)
blockSignals();
*
* Returns 0 on success.
*/
-int dvmChangeThreadSchedulerGroup(const char *cgroup)
+static int dvmChangeThreadSchedulerGroup(const char *cgroup)
{
#ifdef HAVE_ANDROID_OS
int fd;
}
/*
+ * Change the scheduling policy of the current thread
+ */
+void dvmChangeThreadSchedulerPolicy(SchedPolicy policy)
+{
+ if (gDvm.kernelGroupScheduling) {
+ const char *grp = NULL;
+
+ if (policy == SCHED_BACKGROUND) {
+ grp = "bg_non_interactive";
+ }
+
+ dvmChangeThreadSchedulerGroup(grp);
+ } else {
+ struct sched_param param;
+
+ param.sched_priority = 0;
+ sched_setscheduler(getpid(),
+ (policy == SCHED_BACKGROUND) ? 5 : 0,
+ ¶m);
+ }
+}
+
+/*
* Change the priority of a system thread to match that of the Thread object.
*
* We map a priority value from 1-10 to Linux "nice" values, where lower
newNice = kNiceValues[newPriority-1];
if (newNice >= ANDROID_PRIORITY_BACKGROUND) {
- dvmChangeThreadSchedulerGroup("bg_non_interactive");
+ dvmChangeThreadSchedulerPolicy(SCHED_BACKGROUND);
} else if (getpriority(PRIO_PROCESS, pid) >= ANDROID_PRIORITY_BACKGROUND) {
- dvmChangeThreadSchedulerGroup(NULL);
+ dvmChangeThreadSchedulerPolicy(SCHED_FOREGROUND);
}
if (setpriority(PRIO_PROCESS, pid, newNice) != 0) {
INLINE JNIEnv* dvmGetThreadJNIEnv(Thread* self) { return self->jniEnv; }
INLINE void dvmSetThreadJNIEnv(Thread* self, JNIEnv* env) { self->jniEnv = env;}
+typedef enum SchedPolicy {
+ SCHED_BACKGROUND = 0,
+ SCHED_FOREGROUND = 1,
+} SchedPolicy;
+
/*
- * Change the scheduler group of the current process
+ * Change the scheduling policy of the current process.
+ * This is mapped onto whatever underlying scheme the kernel
+ * supports (cgroups/scheduler policies/wombats/etc)
*/
-int dvmChangeThreadSchedulerGroup(const char *group);
+void dvmChangeThreadSchedulerPolicy(SchedPolicy policy);
/*
* Update the priority value of the underlying pthread.
*/
if (priorityResult >= ANDROID_PRIORITY_BACKGROUND) {
- dvmChangeThreadSchedulerGroup(NULL);
+ dvmChangeThreadSchedulerPolicy(SCHED_FOREGROUND);
}
if (setpriority(PRIO_PROCESS, 0, ANDROID_PRIORITY_NORMAL) != 0) {
}
if (oldThreadPriority >= ANDROID_PRIORITY_BACKGROUND) {
- dvmChangeThreadSchedulerGroup("bg_non_interactive");
+ dvmChangeThreadSchedulerPolicy(SCHED_BACKGROUND);
}
}
gcElapsedTime = (dvmGetRelativeTimeUsec() - gcHeap->gcStartTime) / 1000;