support for newer kernels that show cgroups mountinfo at super_options

diff --git a/src/proc_self_mountinfo.c b/src/proc_self_mountinfo.c
index fa4079671612456f91af2739939bd71f514f7027..a2a9e09a979c55e2ae171e121adbc11aca44ecee 100644 (file)
--- a/src/proc_self_mountinfo.c
+++ b/src/proc_self_mountinfo.c
@@ -33,13 +33,48 @@ struct mountinfo *mountinfo_find_by_filesystem_mount_source(struct mountinfo *ro
        uint32_t filesystem_hash = simple_hash(filesystem), mount_source_hash = simple_hash(mount_source);
 
        for(mi = root; mi ; mi = mi->next)
-               if(mi->filesystem_hash == filesystem_hash && mi->mount_source_hash == mount_source_hash
-                               && !strcmp(mi->filesystem, filesystem) && !strcmp(mi->mount_source, mount_source))
+               if(mi->filesystem
+                               && mi->mount_source
+                               && mi->filesystem_hash == filesystem_hash
+                               && mi->mount_source_hash == mount_source_hash
+                               && !strcmp(mi->filesystem, filesystem)
+                               && !strcmp(mi->mount_source, mount_source))
                        return mi;
 
        return NULL;
 }
 
+struct mountinfo *mountinfo_find_by_filesystem_super_option(struct mountinfo *root, const char *filesystem, const char *super_options) {
+       struct mountinfo *mi;
+       uint32_t filesystem_hash = simple_hash(filesystem);
+
+       size_t solen = strlen(super_options);
+
+       for(mi = root; mi ; mi = mi->next)
+               if(mi->filesystem
+                               && mi->super_options
+                               && mi->filesystem_hash == filesystem_hash
+                               && !strcmp(mi->filesystem, filesystem)) {
+
+                       // super_options is a comma separated list
+                       char *s = mi->super_options, *e;
+                       while(*s) {
+                               e = ++s;
+                               while(*e && *e != ',') e++;
+
+                               size_t len = e - s;
+                               if(len == solen && !strncmp(s, super_options, len))
+                                       return mi;
+
+                               if(*e == ',') s = ++e;
+                               else s = e;
+                       }
+               }
+
+       return NULL;
+}
+
+
 // free a linked list of mountinfo structures
 void mountinfo_free(struct mountinfo *mi) {
        if(unlikely(!mi))

diff --git a/src/proc_self_mountinfo.h b/src/proc_self_mountinfo.h
index 8c21274969c5885f698de7438c7925e7f025e012..51712a58aa792dfc92ef981b1ef6390af54fc379 100644 (file)
--- a/src/proc_self_mountinfo.h
+++ b/src/proc_self_mountinfo.h
@@ -34,6 +34,7 @@ struct mountinfo {
 
 extern struct mountinfo *mountinfo_find(struct mountinfo *root, unsigned long major, unsigned long minor);
 extern struct mountinfo *mountinfo_find_by_filesystem_mount_source(struct mountinfo *root, const char *filesystem, const char *mount_source);
+extern struct mountinfo *mountinfo_find_by_filesystem_super_option(struct mountinfo *root, const char *filesystem, const char *super_options);
 
 extern void mountinfo_free(struct mountinfo *mi);
 extern struct mountinfo *mountinfo_read();

diff --git a/src/sys_fs_cgroup.c b/src/sys_fs_cgroup.c
index fbaf13186676e992ab17adee03d1be3668958759..6c2fdb030c358cbb8889c4ccf4307535ceaf8a09 100644 (file)
--- a/src/sys_fs_cgroup.c
+++ b/src/sys_fs_cgroup.c
@@ -47,18 +47,21 @@ void read_cgroup_plugin_configuration() {
        struct mountinfo *mi, *root = mountinfo_read();
 
        mi = mountinfo_find_by_filesystem_mount_source(root, "cgroup", "cpuacct");
+       if(!mi) mi = mountinfo_find_by_filesystem_super_option(root, "cgroup", "cpuacct");
        if(!mi) s = "/sys/fs/cgroup/cpuacct";
        else s = mi->mount_point;
        snprintf(filename, FILENAME_MAX, "%s%s", global_host_prefix, s);
        cgroup_cpuacct_base = config_get("plugin:cgroups", "path to /sys/fs/cgroup/cpuacct", filename);
 
        mi = mountinfo_find_by_filesystem_mount_source(root, "cgroup", "blkio");
+       if(!mi) mi = mountinfo_find_by_filesystem_super_option(root, "cgroup", "blkio");
        if(!mi) s = "/sys/fs/cgroup/blkio";
        else s = mi->mount_point;
        snprintf(filename, FILENAME_MAX, "%s%s", global_host_prefix, s);
        cgroup_blkio_base = config_get("plugin:cgroups", "path to /sys/fs/cgroup/blkio", filename);
 
        mi = mountinfo_find_by_filesystem_mount_source(root, "cgroup", "memory");
+       if(!mi) mi = mountinfo_find_by_filesystem_super_option(root, "cgroup", "memory");
        if(!mi) s = "/sys/fs/cgroup/memory";
        else s = mi->mount_point;
        snprintf(filename, FILENAME_MAX, "%s%s", global_host_prefix, s);