Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 4265 into donut

Browse Source 
* changes:
  process: Fix bug where if a thread exited while we were changing its control     group, we'd bail out and report an exception. This situation is *not*     an error.
This commit is contained in:
Android (Google) Code Review
2009-06-15 17:06:24 -07:00
parent b0d2493ac0 1fd0ec738b
commit 727f36c6a1
1 changed files with 16 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
core/jni/android_util_Process.cpp
View File

@@ -50,8 +50,6 @@ pid_t gettid() { return syscall(__NR_gettid);}
#undef __KERNEL__ #undef __KERNEL__
#endif #endif
#define ENABLE_CGROUP_DEBUG 0
/* /*
* List of cgroup names which map to ANDROID_TGROUP_ values in Thread.h * List of cgroup names which map to ANDROID_TGROUP_ values in Thread.h
* and Process.java * and Process.java
@@ -205,39 +203,31 @@ static int add_pid_to_cgroup(int pid, int grp)
sprintf(path, "/dev/cpuctl/%s/tasks", sprintf(path, "/dev/cpuctl/%s/tasks",
(cgroup_names[grp] ? cgroup_names[grp] : "")); (cgroup_names[grp] ? cgroup_names[grp] : ""));
if ((fd = open(path, O_WRONLY)) < 0) { if ((fd = open(path, O_WRONLY)) < 0)
LOGE("Error opening '%s' (%s)", path, strerror(errno));
return -1; return -1;
}
sprintf(text, "%d", pid); sprintf(text, "%d", pid);
if (write(fd, text, strlen(text)) < 0) { if (write(fd, text, strlen(text)) < 0) {
LOGE("Error writing to '%s' (%s)", path, strerror(errno));
close(fd); close(fd);
return -1; return -1;
} }
close(fd); close(fd);
#if ENABLE_CGROUP_DEBUG
LOGD("Pid %d sucessfully added to '%s'", pid, path);
#endif
return 0; return 0;
} }
void android_os_Process_setThreadGroup(JNIEnv* env, jobject clazz, int pid, jint grp) void android_os_Process_setThreadGroup(JNIEnv* env, jobject clazz, int pid, jint grp)
{ {
#if ENABLE_CGROUP_DEBUG
LOGD("android_os_Process_setThreadGroup(%d, %d)", pid, grp);
#endif
if (grp > ANDROID_TGROUP_MAX || grp < 0) { if (grp > ANDROID_TGROUP_MAX || grp < 0) {
signalExceptionForGroupError(env, clazz, EINVAL); signalExceptionForGroupError(env, clazz, EINVAL);
return; return;
} }
if (add_pid_to_cgroup(pid, grp)) if (add_pid_to_cgroup(pid, grp)) {
signalExceptionForGroupError(env, clazz, errno); // If the thread exited on us, don't generate an exception
if (errno != ESRCH && errno != ENOENT)
signalExceptionForGroupError(env, clazz, errno);
}
} }
void android_os_Process_setProcessGroup(JNIEnv* env, jobject clazz, int pid, jint grp) void android_os_Process_setProcessGroup(JNIEnv* env, jobject clazz, int pid, jint grp)
@@ -247,10 +237,6 @@ void android_os_Process_setProcessGroup(JNIEnv* env, jobject clazz, int pid, jin
char proc_path[255]; char proc_path[255];
struct dirent *de; struct dirent *de;
#if ENABLE_CGROUP_DEBUG
LOGD("android_os_Process_setProcessGroup(%d, %d)", pid, grp);
#endif
if (grp > ANDROID_TGROUP_MAX || grp < 0) { if (grp > ANDROID_TGROUP_MAX || grp < 0) {
signalExceptionForGroupError(env, clazz, EINVAL); signalExceptionForGroupError(env, clazz, EINVAL);
return; return;
@@ -258,17 +244,23 @@ void android_os_Process_setProcessGroup(JNIEnv* env, jobject clazz, int pid, jin
sprintf(proc_path, "/proc/%d/task", pid); sprintf(proc_path, "/proc/%d/task", pid);
if (!(d = opendir(proc_path))) { if (!(d = opendir(proc_path))) {
signalExceptionForGroupError(env, clazz, errno); // If the process exited on us, don't generate an exception
if (errno != ENOENT)
signalExceptionForGroupError(env, clazz, errno);
return; return;
} }
while ((de = readdir(d))) { while ((de = readdir(d))) {
if (de->d_name[0] == '.') if (de->d_name[0] == '.')
continue; continue;
if (add_pid_to_cgroup(atoi(de->d_name), grp)) { if (add_pid_to_cgroup(atoi(de->d_name), grp)) {
signalExceptionForGroupError(env, clazz, errno); // If the thread exited on us, ignore it and keep going
closedir(d); if (errno != ESRCH && errno != ENOENT) {
return; signalExceptionForGroupError(env, clazz, errno);
closedir(d);
return;
}
} }
} }
closedir(d); closedir(d);