cmdline: clarify cgroup_cpu_ms_per_sec

diff --git a/cmdline.cc b/cmdline.cc
index ac22106cb0aeec1d431f549724e8f3a438e67826..b1cb147b7038f3a8307a25d05a0ee63880f1f301 100644 (file)
--- a/cmdline.cc
+++ b/cmdline.cc
@@ -142,7 +142,7 @@ struct custom_option custom_opts[] = {
     { { "cgroup_net_cls_classid", required_argument, NULL, 0x0821 }, "Class identifier of network packets in the group (default: '0' - disabled)" },
     { { "cgroup_net_cls_mount", required_argument, NULL, 0x0822 }, "Location of net_cls cgroup FS (default: '/sys/fs/cgroup/net_cls')" },
     { { "cgroup_net_cls_parent", required_argument, NULL, 0x0823 }, "Which pre-existing net_cls cgroup to use as a parent (default: 'NSJAIL')" },
-    { { "cgroup_cpu_ms_per_sec", required_argument, NULL, 0x0831 }, "Number of us that the process group can use per second (default: '0' - disabled)" },
+    { { "cgroup_cpu_ms_per_sec", required_argument, NULL, 0x0831 }, "Number of milliseconds of CPU time per second that the process group can use (default: '0' - no limit)" },
     { { "cgroup_cpu_mount", required_argument, NULL, 0x0822 }, "Location of cpu cgroup FS (default: '/sys/fs/cgroup/net_cls')" },
     { { "cgroup_cpu_parent", required_argument, NULL, 0x0833 }, "Which pre-existing cpu cgroup to use as a parent (default: 'NSJAIL')" },
     { { "iface_no_lo", no_argument, NULL, 0x700 }, "Don't bring the 'lo' interface up" },

diff --git a/config.proto b/config.proto
index 4e0253702c7051e21afba45c8892a46417981698..3988543700c5b5deb176b5d671333c22de672ca7 100644 (file)
--- a/config.proto
+++ b/config.proto
@@ -217,7 +217,7 @@ message NsJailConfig {
     /* Writeable directory (for the nsjail user) under cgroup_net_mount */
     optional string cgroup_net_cls_parent = 69 [default = "NSJAIL"];
 
-    /* If > 0 number of milliseconds of CPU that jail processes can use per each second */
+    /* If > 0, number of milliseconds of CPU time per second that jailed processes can use */
     optional uint32 cgroup_cpu_ms_per_sec = 70 [default = 0];
     /* Mount point for cgroups-cpu in your system */
     optional string cgroup_cpu_mount = 71 [default = "/sys/fs/cgroup/cpu"];

diff --git a/nsjail.1 b/nsjail.1
index c1c32aa8490365ea3db2a7f274dbe66efb009f05..07c537d09501bbd3111b26f187dca895d21a99c8 100644 (file)
--- a/nsjail.1
+++ b/nsjail.1
@@ -239,7 +239,7 @@ Location of net_cls cgroup FS (default: '/sys/fs/cgroup/net_cls')
 Which pre\-existing net_cls cgroup to use as a parent (default: 'NSJAIL')
 .TP
 \fB\-\-cgroup_cpu_ms_per_sec\fR VALUE
-Number of us that the process group can use per second (default: '0' - disabled)
+Number of milliseconds of CPU time per second that the process group can use (default: '0' - no limit)
 .TP
 \fB\-\-cgroup_cpu_mount\fR VALUE
 Location of cpu cgroup FS (default: '/sys/fs/cgroup/net_cls')