@@ -18,15 +18,15 @@ macro_rules! debug {
1818}
1919
2020macro_rules! some {
21- ( $e: expr) => ( {
21+ ( $e: expr) => { {
2222 match $e {
2323 Some ( v) => v,
2424 None => {
2525 debug!( "NONE: {:?}" , stringify!( $e) ) ;
2626 return None ;
2727 }
2828 }
29- } )
29+ } } ;
3030}
3131
3232pub fn get_num_cpus ( ) -> usize {
@@ -126,18 +126,15 @@ fn init_cgroups() {
126126 // Should only be called once
127127 debug_assert ! ( CGROUPS_CPUS . load( Ordering :: SeqCst ) == 0 ) ;
128128
129- match load_cgroups ( "/proc/self/cgroup" , "/proc/self/mountinfo" ) {
130- Some ( quota) => {
131- if quota == 0 {
132- return ;
133- }
129+ if let Some ( quota) = load_cgroups ( "/proc/self/cgroup" , "/proc/self/mountinfo" ) {
130+ if quota == 0 {
131+ return ;
132+ }
134133
135- let logical = logical_cpus ( ) ;
136- let count = :: std:: cmp:: min ( quota, logical) ;
134+ let logical = logical_cpus ( ) ;
135+ let count = :: std:: cmp:: min ( quota, logical) ;
137136
138- CGROUPS_CPUS . store ( count, Ordering :: SeqCst ) ;
139- }
140- None => return ,
137+ CGROUPS_CPUS . store ( count, Ordering :: SeqCst ) ;
141138 }
142139}
143140
@@ -167,18 +164,14 @@ struct Subsys {
167164
168165impl Cgroup {
169166 fn new ( dir : PathBuf ) -> Cgroup {
170- Cgroup {
171- base : dir,
172- }
167+ Cgroup { base : dir }
173168 }
174169
175170 fn translate ( mntinfo : MountInfo , subsys : Subsys ) -> Option < Cgroup > {
176171 // Translate the subsystem directory via the host paths.
177172 debug ! (
178173 "subsys = {:?}; root = {:?}; mount_point = {:?}" ,
179- subsys. base,
180- mntinfo. root,
181- mntinfo. mount_point
174+ subsys. base, mntinfo. root, mntinfo. mount_point
182175 ) ;
183176
184177 let rel_from_root = some ! ( Path :: new( & subsys. base) . strip_prefix( & mntinfo. root) . ok( ) ) ;
@@ -238,13 +231,27 @@ impl MountInfo {
238231 fn parse_line ( line : String ) -> Option < MountInfo > {
239232 let mut fields = line. split ( ' ' ) ;
240233
234+ // 7 5 0:6 </> /sys/fs/cgroup/cpu,cpuacct rw,nosuid,nodev,noexec,relatime shared:7 - cgroup cgroup rw,cpu,cpuacct
241235 let mnt_root = some ! ( fields. nth( 3 ) ) ;
242- let mnt_point = some ! ( fields. nth( 0 ) ) ;
236+ // 7 5 0:6 / </sys/fs/cgroup/cpu,cpuacct> rw,nosuid,nodev,noexec,relatime shared:7 - cgroup cgroup rw,cpu,cpuacct
237+ let mnt_point = some ! ( fields. next( ) ) ;
238+
239+ // Ignore all fields until the separator(-).
240+ // Note: there could be zero or more optional fields before hyphen.
241+ // See: https://man7.org/linux/man-pages/man5/proc.5.html
242+ // 7 5 0:6 / /sys/fs/cgroup/cpu,cpuacct rw,nosuid,nodev,noexec,relatime shared:7 <-> cgroup cgroup rw,cpu,cpuacct
243+ // Note: we cannot use `?` here because we need to support Rust 1.13.
244+ match fields. find ( |& s| s == "-" ) {
245+ Some ( _) => { }
246+ None => return None ,
247+ } ;
243248
244- if fields. nth ( 3 ) != Some ( "cgroup" ) {
249+ // 7 5 0:6 / /sys/fs/cgroup/cpu,cpuacct rw,nosuid,nodev,noexec,relatime shared:7 - <cgroup> cgroup rw,cpu,cpuacct
250+ if fields. next ( ) != Some ( "cgroup" ) {
245251 return None ;
246252 }
247253
254+ // 7 5 0:6 / /sys/fs/cgroup/cpu,cpuacct rw,nosuid,nodev,noexec,relatime shared:7 - cgroup cgroup <rw,cpu,cpuacct>
248255 let super_opts = some ! ( fields. nth( 1 ) ) ;
249256
250257 // We only care about the 'cpu' option
@@ -281,16 +288,18 @@ impl Subsys {
281288 return None ;
282289 }
283290
284- fields. next ( ) . map ( |path| Subsys { base : path. to_owned ( ) } )
291+ fields. next ( ) . map ( |path| Subsys {
292+ base : path. to_owned ( ) ,
293+ } )
285294 }
286295}
287296
288297#[ cfg( test) ]
289298mod tests {
290- use std:: path:: { Path , PathBuf } ;
291299 use super :: { Cgroup , MountInfo , Subsys } ;
300+ use std:: path:: { Path , PathBuf } ;
292301
293-
302+ // `static_in_const` feature is not stable in Rust 1.13.
294303 static FIXTURES_PROC : & ' static str = "fixtures/cgroups/proc/cgroups" ;
295304
296305 static FIXTURES_CGROUPS : & ' static str = "fixtures/cgroups/cgroups" ;
@@ -304,12 +313,29 @@ mod tests {
304313
305314 #[ test]
306315 fn test_load_mountinfo ( ) {
316+ // test only one optional fields
307317 let path = join ! ( FIXTURES_PROC , "mountinfo" ) ;
308318
309319 let mnt_info = MountInfo :: load_cpu ( path) . unwrap ( ) ;
310320
311321 assert_eq ! ( mnt_info. root, "/" ) ;
312322 assert_eq ! ( mnt_info. mount_point, "/sys/fs/cgroup/cpu,cpuacct" ) ;
323+
324+ // test zero optional field
325+ let path = join ! ( FIXTURES_PROC , "mountinfo_zero_opt" ) ;
326+
327+ let mnt_info = MountInfo :: load_cpu ( path) . unwrap ( ) ;
328+
329+ assert_eq ! ( mnt_info. root, "/" ) ;
330+ assert_eq ! ( mnt_info. mount_point, "/sys/fs/cgroup/cpu,cpuacct" ) ;
331+
332+ // test multi optional fields
333+ let path = join ! ( FIXTURES_PROC , "mountinfo_multi_opt" ) ;
334+
335+ let mnt_info = MountInfo :: load_cpu ( path) . unwrap ( ) ;
336+
337+ assert_eq ! ( mnt_info. root, "/" ) ;
338+ assert_eq ! ( mnt_info. mount_point, "/sys/fs/cgroup/cpu,cpuacct" ) ;
313339 }
314340
315341 #[ test]
@@ -324,12 +350,7 @@ mod tests {
324350 #[ test]
325351 fn test_cgroup_mount ( ) {
326352 let cases = & [
327- (
328- "/" ,
329- "/sys/fs/cgroup/cpu" ,
330- "/" ,
331- Some ( "/sys/fs/cgroup/cpu" ) ,
332- ) ,
353+ ( "/" , "/sys/fs/cgroup/cpu" , "/" , Some ( "/sys/fs/cgroup/cpu" ) ) ,
333354 (
334355 "/docker/01abcd" ,
335356 "/sys/fs/cgroup/cpu" ,
@@ -348,27 +369,10 @@ mod tests {
348369 "/docker/01abcd/large" ,
349370 Some ( "/sys/fs/cgroup/cpu/large" ) ,
350371 ) ,
351-
352372 // fails
353-
354- (
355- "/docker/01abcd" ,
356- "/sys/fs/cgroup/cpu" ,
357- "/" ,
358- None ,
359- ) ,
360- (
361- "/docker/01abcd" ,
362- "/sys/fs/cgroup/cpu" ,
363- "/docker" ,
364- None ,
365- ) ,
366- (
367- "/docker/01abcd" ,
368- "/sys/fs/cgroup/cpu" ,
369- "/elsewhere" ,
370- None ,
371- ) ,
373+ ( "/docker/01abcd" , "/sys/fs/cgroup/cpu" , "/" , None ) ,
374+ ( "/docker/01abcd" , "/sys/fs/cgroup/cpu" , "/docker" , None ) ,
375+ ( "/docker/01abcd" , "/sys/fs/cgroup/cpu" , "/elsewhere" , None ) ,
372376 (
373377 "/docker/01abcd" ,
374378 "/sys/fs/cgroup/cpu" ,
@@ -387,7 +391,7 @@ mod tests {
387391 } ;
388392
389393 let actual = Cgroup :: translate ( mnt_info, subsys) . map ( |c| c. base ) ;
390- let expected = expected. map ( |s| PathBuf :: from ( s ) ) ;
394+ let expected = expected. map ( PathBuf :: from) ;
391395 assert_eq ! ( actual, expected) ;
392396 }
393397 }
0 commit comments