]> arthur.barton.de Git - netdata.git/blobdiff - src/sys_fs_cgroup.c
Merge pull request #643 from paulfantom/master
[netdata.git] / src / sys_fs_cgroup.c
index 904b8a15133345c72687922e543a0d26c8f41c58..5f139c891ee824b220f96b12bbd6ac96a501b1cc 100644 (file)
@@ -48,21 +48,30 @@ void read_cgroup_plugin_configuration() {
 
        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";
+       if(!mi) {
+               error("Cannot find cgroup cpuacct mountinfo. Assuming default: /sys/fs/cgroup/cpuacct");
+               s = "/sys/fs/cgroup/cpuacct";
+       }
        else s = mi->mount_point;
        snprintfz(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";
+       if(!mi) {
+               error("Cannot find cgroup blkio mountinfo. Assuming default: /sys/fs/cgroup/blkio");
+               s = "/sys/fs/cgroup/blkio";
+       }
        else s = mi->mount_point;
        snprintfz(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";
+       if(!mi) {
+               error("Cannot find cgroup memory mountinfo. Assuming default: /sys/fs/cgroup/memory");
+               s = "/sys/fs/cgroup/memory";
+       }
        else s = mi->mount_point;
        snprintfz(filename, FILENAME_MAX, "%s%s", global_host_prefix, s);
        cgroup_memory_base = config_get("plugin:cgroups", "path to /sys/fs/cgroup/memory", filename);
@@ -243,7 +252,7 @@ void cgroup_read_cpuacct_usage(struct cpuacct_usage *ca) {
                if(!ff) return;
 
                if(procfile_lines(ff) < 1) {
-                       error("File '%s' should have 1+ lines but has %d.", ca->filename, procfile_lines(ff));
+                       error("File '%s' should have 1+ lines but has %u.", ca->filename, procfile_lines(ff));
                        return;
                }
 
@@ -659,6 +668,7 @@ struct cgroup *cgroup_add(const char *id) {
                                !strcmp(chart_id, "systemd") ||
                                !strcmp(chart_id, "system.slice") ||
                                !strcmp(chart_id, "machine.slice") ||
+                               !strcmp(chart_id, "init.scope") ||
                                !strcmp(chart_id, "user") ||
                                !strcmp(chart_id, "system") ||
                                !strcmp(chart_id, "machine") ||
@@ -1009,14 +1019,14 @@ void update_cgroup_charts(int update_every) {
                                st = rrdset_create(type, "cpu_per_core", NULL, "cpu", "cgroup.cpu_per_core", title, "%", 40100, update_every, RRDSET_TYPE_STACKED);
 
                                for(i = 0; i < cg->cpuacct_usage.cpus ;i++) {
-                                       snprintfz(id, CHART_TITLE_MAX, "cpu%d", i);
+                                       snprintfz(id, CHART_TITLE_MAX, "cpu%u", i);
                                        rrddim_add(st, id, NULL, 100, 1000000, RRDDIM_INCREMENTAL);
                                }
                        }
                        else rrdset_next(st);
 
                        for(i = 0; i < cg->cpuacct_usage.cpus ;i++) {
-                               snprintfz(id, CHART_TITLE_MAX, "cpu%d", i);
+                               snprintfz(id, CHART_TITLE_MAX, "cpu%u", i);
                                rrddim_set(st, id, cg->cpuacct_usage.cpu_percpu[i]);
                        }
                        rrdset_done(st);
@@ -1265,7 +1275,7 @@ void *cgroups_main(void *ptr)
 
                // delay until it is our time to run
                while((sunow = timems()) < sunext)
-                       usleep((useconds_t)(sunext - sunow));
+                       usecsleep(sunext - sunow);
 
                // find the next time we need to run
                while(timems() > sunext)