Merge pull request #179 from ginkoid/master

write CPU CFS period before quota in cgroup1
This commit is contained in:
happyCoder92 2021-07-22 15:47:09 +02:00 committed by GitHub
commit 4f50821655
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -134,13 +134,13 @@ static bool initNsFromParentCpu(nsjconf_t* nsjconf, pid_t pid) {
"/NSJAIL." + std::to_string(pid); "/NSJAIL." + std::to_string(pid);
RETURN_ON_FAILURE(createCgroup(cpu_cgroup_path, pid)); RETURN_ON_FAILURE(createCgroup(cpu_cgroup_path, pid));
RETURN_ON_FAILURE(
writeToCgroup(cpu_cgroup_path + "/cpu.cfs_period_us", "1000000", "cpu period"));
std::string cpu_ms_per_sec_str = std::to_string(nsjconf->cgroup_cpu_ms_per_sec * 1000U); std::string cpu_ms_per_sec_str = std::to_string(nsjconf->cgroup_cpu_ms_per_sec * 1000U);
RETURN_ON_FAILURE( RETURN_ON_FAILURE(
writeToCgroup(cpu_cgroup_path + "/cpu.cfs_quota_us", cpu_ms_per_sec_str, "cpu quota")); writeToCgroup(cpu_cgroup_path + "/cpu.cfs_quota_us", cpu_ms_per_sec_str, "cpu quota"));
RETURN_ON_FAILURE(
writeToCgroup(cpu_cgroup_path + "/cpu.cfs_period_us", "1000000", "cpu period"));
return addPidToTaskList(cpu_cgroup_path, pid); return addPidToTaskList(cpu_cgroup_path, pid);
} }