Snap for 9853495 from 9cff13459f468876e3a3797262bd3ea781054f1d to udc-release (d35c7e94) · Commits · e / os / android_system_core

libprocessgroup/processgroup.cpp

+6 −9

Original line number	Original line	Diff line number	Diff line
	@@ -451,14 +451,9 @@ static int DoKillProcessGroupOnce(const char* cgroup, uid_t uid, int initialPid,

	static int KillProcessGroup(uid_t uid, int initialPid, int signal, int retries,		static int KillProcessGroup(uid_t uid, int initialPid, int signal, int retries,
	int* max_processes) {		int* max_processes) {
	if (uid < 0) {		CHECK_GE(uid, 0);
	LOG(ERROR) << __func__ << ": invalid UID " << uid;		CHECK_GT(initialPid, 0);
	return -1;
	}
	if (initialPid <= 0) {
	LOG(ERROR) << __func__ << ": invalid PID " << initialPid;
	return -1;
	}
	std::string hierarchy_root_path;		std::string hierarchy_root_path;
	if (CgroupsAvailable()) {		if (CgroupsAvailable()) {
	CgroupGetControllerPath(CGROUPV2_CONTROLLER_NAME, &hierarchy_root_path);		CgroupGetControllerPath(CGROUPV2_CONTROLLER_NAME, &hierarchy_root_path);
	@@ -595,7 +590,8 @@ static int createProcessGroupInternal(uid_t uid, int initialPid, std::string cgr
	}		}

	int createProcessGroup(uid_t uid, int initialPid, bool memControl) {		int createProcessGroup(uid_t uid, int initialPid, bool memControl) {
	std::string cgroup;		CHECK_GE(uid, 0);
			CHECK_GT(initialPid, 0);

	if (memControl && !UsePerAppMemcg()) {		if (memControl && !UsePerAppMemcg()) {
	PLOG(ERROR) << "service memory controls are used without per-process memory cgroup support";		PLOG(ERROR) << "service memory controls are used without per-process memory cgroup support";
	@@ -613,6 +609,7 @@ int createProcessGroup(uid_t uid, int initialPid, bool memControl) {
	}		}
	}		}

			std::string cgroup;
	CgroupGetControllerPath(CGROUPV2_CONTROLLER_NAME, &cgroup);		CgroupGetControllerPath(CGROUPV2_CONTROLLER_NAME, &cgroup);
	return createProcessGroupInternal(uid, initialPid, cgroup, true);		return createProcessGroupInternal(uid, initialPid, cgroup, true);
	}		}