ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Fix access check" am: 87ef739dba

Browse source 
am: 9cbbe2d9df

Change-Id: I988a5e71b02442a7509f9cfc7a1d17aa1b52571d
This commit is contained in:
John Reck 2016-08-30 01:24:37 +00:00 • committed by android-build-merger
commit cf2f39d7de
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
libcutils/sched_policy.c
View file

@ -52,6 +52,7 @@ static inline SchedPolicy _policy(SchedPolicy p)
static pthread_once_t the_once = PTHREAD_ONCE_INIT; static pthread_once_t the_once = PTHREAD_ONCE_INIT;
static int __sys_supports_schedgroups = -1; static int __sys_supports_schedgroups = -1;
static int __sys_supports_timerslack = -1;
// File descriptors open to /dev/cpuctl/../tasks, setup by initialize, or -1 on error. // File descriptors open to /dev/cpuctl/../tasks, setup by initialize, or -1 on error.
static int bg_cgroup_fd = -1; static int bg_cgroup_fd = -1;
@ -104,7 +105,7 @@ static int add_tid_to_cgroup(int tid, int fd)
static void __initialize(void) { static void __initialize(void) {
char* filename; char* filename;
if (!access("/dev/cpuctl/tasks", F_OK)) { if (!access("/dev/cpuctl/tasks", W_OK)) {
__sys_supports_schedgroups = 1; __sys_supports_schedgroups = 1;
filename = "/dev/cpuctl/tasks"; filename = "/dev/cpuctl/tasks";
@ -123,7 +124,7 @@ static void __initialize(void) {
} }
#ifdef USE_CPUSETS #ifdef USE_CPUSETS
if (!access("/dev/cpuset/tasks", F_OK)) { if (!access("/dev/cpuset/tasks", W_OK)) {
filename = "/dev/cpuset/foreground/tasks"; filename = "/dev/cpuset/foreground/tasks";
fg_cpuset_fd = open(filename, O_WRONLY | O_CLOEXEC); fg_cpuset_fd = open(filename, O_WRONLY | O_CLOEXEC);
@ -142,6 +143,10 @@ static void __initialize(void) {
#endif #endif
} }
#endif #endif
char buf[64];
snprintf(buf, sizeof(buf), "/proc/%d/timerslack_ns", getpid());
__sys_supports_timerslack = !access(buf, W_OK);
} }
/* /*
@ -417,8 +422,10 @@ int set_sched_policy(int tid, SchedPolicy policy)
&param); &param);
} }
set_timerslack_ns(tid, policy == SP_BACKGROUND ? if (__sys_supports_timerslack) {
set_timerslack_ns(tid, policy == SP_BACKGROUND ?
TIMER_SLACK_BG : TIMER_SLACK_FG); TIMER_SLACK_BG : TIMER_SLACK_FG);
}
return 0; return 0;
} }