X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=src%2Fproc_self_mountinfo.c;h=bb031a9ab40e808b0c8f26082806ac48cd5e6b9c;hb=090e36e79457e84b67d5af860da1d614133db2de;hp=3c3e5af8922d98c8ebcbba4b7445826fa05daaef;hpb=25ffc015051f98268d4cd406dea3b1f7d6ec4160;p=netdata.git

diff --git a/src/proc_self_mountinfo.c b/src/proc_self_mountinfo.c
index 3c3e5af8..bb031a9a 100644
--- a/src/proc_self_mountinfo.c
+++ b/src/proc_self_mountinfo.c
@@ -49,7 +49,7 @@ struct mountinfo *mountinfo_find(struct mountinfo *root, unsigned long major, un
     struct mountinfo *mi;
 
     for(mi = root; mi ; mi = mi->next)
-        if(mi->major == major && mi->minor == minor)
+        if(unlikely(mi->major == major && mi->minor == minor))
             return mi;
 
     return NULL;
@@ -62,12 +62,12 @@ 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
+        if(unlikely(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))
+                && !strcmp(mi->mount_source, mount_source)))
             return mi;
 
     return NULL;
@@ -80,10 +80,10 @@ struct mountinfo *mountinfo_find_by_filesystem_super_option(struct mountinfo *ro
     size_t solen = strlen(super_options);
 
     for(mi = root; mi ; mi = mi->next)
-        if(mi->filesystem
+        if(unlikely(mi->filesystem
                 && mi->super_options
                 && mi->filesystem_hash == filesystem_hash
-                && !strcmp(mi->filesystem, filesystem)) {
+                && !strcmp(mi->filesystem, filesystem))) {
 
             // super_options is a comma separated list
             char *s = mi->super_options, *e;
@@ -92,7 +92,7 @@ struct mountinfo *mountinfo_find_by_filesystem_super_option(struct mountinfo *ro
                 while(*e && *e != ',') e++;
 
                 size_t len = e - s;
-                if(len == solen && !strncmp(s, super_options, len))
+                if(unlikely(len == solen && !strncmp(s, super_options, len)))
                     return mi;
 
                 if(*e == ',') s = ++e;
@@ -157,39 +157,53 @@ static char *strdupz_decoding_octal(const char *string) {
     return buffer;
 }
 
-// read the whole mountinfo into a linked list
-struct mountinfo *mountinfo_read() {
-    procfile *ff = NULL;
+static inline int is_read_only(const char *s) {
+    if(!s) return 0;
 
+    size_t len = strlen(s);
+    if(len < 2) return 0;
+    if(len == 2) {
+        if(!strcmp(s, "ro")) return 1;
+        return 0;
+    }
+    if(!strncmp(s, "ro,", 3)) return 1;
+    if(!strncmp(&s[len - 3], ",ro", 3)) return 1;
+    if(strstr(s, ",ro,")) return 1;
+    return 0;
+}
+
+// read the whole mountinfo into a linked list
+struct mountinfo *mountinfo_read(int do_statvfs) {
     char filename[FILENAME_MAX + 1];
-    snprintfz(filename, FILENAME_MAX, "%s/proc/self/mountinfo", global_host_prefix);
-    ff = procfile_open(filename, " \t", PROCFILE_FLAG_DEFAULT);
-    if(!ff) {
-        snprintfz(filename, FILENAME_MAX, "%s/proc/1/mountinfo", global_host_prefix);
+    snprintfz(filename, FILENAME_MAX, "%s/proc/self/mountinfo", netdata_configured_host_prefix);
+    procfile *ff = procfile_open(filename, " \t", PROCFILE_FLAG_DEFAULT);
+    if(unlikely(!ff)) {
+        snprintfz(filename, FILENAME_MAX, "%s/proc/1/mountinfo", netdata_configured_host_prefix);
         ff = procfile_open(filename, " \t", PROCFILE_FLAG_DEFAULT);
-        if(!ff) return NULL;
+        if(unlikely(!ff)) return NULL;
     }
 
     ff = procfile_readall(ff);
-    if(!ff) return NULL;
+    if(unlikely(!ff))
+        return NULL;
 
     struct mountinfo *root = NULL, *last = NULL, *mi = NULL;
 
     unsigned long l, lines = procfile_lines(ff);
     for(l = 0; l < lines ;l++) {
-        if(procfile_linewords(ff, l) < 5)
+        if(unlikely(procfile_linewords(ff, l) < 5))
             continue;
 
         mi = mallocz(sizeof(struct mountinfo));
 
         unsigned long w = 0;
-        mi->id = strtoul(procfile_lineword(ff, l, w), NULL, 10); w++;
-        mi->parentid = strtoul(procfile_lineword(ff, l, w), NULL, 10); w++;
+        mi->id = str2ul(procfile_lineword(ff, l, w)); w++;
+        mi->parentid = str2ul(procfile_lineword(ff, l, w)); w++;
 
         char *major = procfile_lineword(ff, l, w), *minor; w++;
         for(minor = major; *minor && *minor != ':' ;minor++) ;
 
-        if(!*minor) {
+        if(unlikely(!*minor)) {
             error("Cannot parse major:minor on '%s' at line %lu of '%s'", major, l + 1, filename);
             freez(mi);
             continue;
@@ -200,8 +214,8 @@ struct mountinfo *mountinfo_read() {
 
         mi->flags = 0;
 
-        mi->major = strtoul(major, NULL, 10);
-        mi->minor = strtoul(minor, NULL, 10);
+        mi->major = str2ul(major);
+        mi->minor = str2ul(minor);
 
         mi->root = strdupz(procfile_lineword(ff, l, w)); w++;
         mi->root_hash = simple_hash(mi->root);
@@ -215,6 +229,9 @@ struct mountinfo *mountinfo_read() {
 
         mi->mount_options = strdupz(procfile_lineword(ff, l, w)); w++;
 
+        if(unlikely(is_read_only(mi->mount_options)))
+            mi->flags |= MOUNTINFO_READONLY;
+
         // count the optional fields
 /*
         unsigned long wo = w;
@@ -232,14 +249,11 @@ struct mountinfo *mountinfo_read() {
             // we have some optional fields
             // read them into a new array of pointers;
 
-            mi->optional_fields = malloc(mi->optional_fields_count * sizeof(char *));
-            if(unlikely(!mi->optional_fields))
-                fatal("Cannot allocate memory for %d mountinfo optional fields", mi->optional_fields_count);
+            mi->optional_fields = mallocz(mi->optional_fields_count * sizeof(char *));
 
             int i;
             for(i = 0; i < mi->optional_fields_count ; i++) {
-                *mi->optional_fields[wo] = strdup(procfile_lineword(ff, l, w));
-                if(!mi->optional_fields[wo]) fatal("Cannot allocate memory");
+                *mi->optional_fields[wo] = strdupz(procfile_lineword(ff, l, w));
                 wo++;
             }
         }
@@ -253,19 +267,22 @@ struct mountinfo *mountinfo_read() {
             mi->filesystem = strdupz(procfile_lineword(ff, l, w)); w++;
             mi->filesystem_hash = simple_hash(mi->filesystem);
 
-            mi->mount_source = strdupz(procfile_lineword(ff, l, w)); w++;
+            mi->mount_source = strdupz_decoding_octal(procfile_lineword(ff, l, w)); w++;
             mi->mount_source_hash = simple_hash(mi->mount_source);
 
             mi->super_options = strdupz(procfile_lineword(ff, l, w)); w++;
 
-            if(ME_DUMMY(mi->mount_source, mi->filesystem))
+            if(unlikely(is_read_only(mi->super_options)))
+                mi->flags |= MOUNTINFO_READONLY;
+
+            if(unlikely(ME_DUMMY(mi->mount_source, mi->filesystem)))
                 mi->flags |= MOUNTINFO_IS_DUMMY;
 
-            if(ME_REMOTE(mi->mount_source, mi->filesystem))
+            if(unlikely(ME_REMOTE(mi->mount_source, mi->filesystem)))
                 mi->flags |= MOUNTINFO_IS_REMOTE;
 
             // mark as BIND the duplicates (i.e. same filesystem + same source)
-            {
+            if(do_statvfs) {
                 struct stat buf;
                 if(unlikely(stat(mi->mount_point, &buf) == -1)) {
                     mi->st_dev = 0;
@@ -276,7 +293,7 @@ struct mountinfo *mountinfo_read() {
 
                     struct mountinfo *mt;
                     for(mt = root; mt; mt = mt->next) {
-                        if(unlikely(mt->st_dev == mi->st_dev && !(mi->flags & MOUNTINFO_NO_STAT))) {
+                        if(unlikely(mt->st_dev == mi->st_dev && !(mt->flags & MOUNTINFO_IS_SAME_DEV))) {
                             if(strlen(mi->mount_point) < strlen(mt->mount_point))
                                 mt->flags |= MOUNTINFO_IS_SAME_DEV;
                             else
@@ -285,6 +302,9 @@ struct mountinfo *mountinfo_read() {
                     }
                 }
             }
+            else {
+                mi->st_dev = 0;
+            }
         }
         else {
             mi->filesystem = NULL;
@@ -299,12 +319,12 @@ struct mountinfo *mountinfo_read() {
         }
 
         // check if it has size
-        {
+        if(do_statvfs && !(mi->flags & MOUNTINFO_IS_DUMMY)) {
             struct statvfs buff_statvfs;
-            if(statvfs(mi->mount_point, &buff_statvfs) < 0) {
+            if(unlikely(statvfs(mi->mount_point, &buff_statvfs) < 0)) {
                 mi->flags |= MOUNTINFO_NO_STAT;
             }
-            else if(!buff_statvfs.f_blocks /* || !buff_statvfs.f_files */) {
+            else if(unlikely(!buff_statvfs.f_blocks /* || !buff_statvfs.f_files */)) {
                 mi->flags |= MOUNTINFO_NO_SIZE;
             }
         }
@@ -343,7 +363,7 @@ struct mountinfo *mountinfo_read() {
 */
     }
 
-/*
+/* find if the mount options have "bind" in them
     {
         FILE *fp = setmntent(MOUNTED, "r");
         if (fp != NULL) {
@@ -353,10 +373,10 @@ struct mountinfo *mountinfo_read() {
 
             while ((mnt = getmntent_r(fp, &mntbuf, buf, 4096))) {
                 char *bind = hasmntopt(mnt, "bind");
-                if(bind) {
+                if(unlikely(bind)) {
                     struct mountinfo *mi;
                     for(mi = root; mi ; mi = mi->next) {
-                        if(strcmp(mnt->mnt_dir, mi->mount_point) == 0) {
+                        if(unlikely(strcmp(mnt->mnt_dir, mi->mount_point) == 0)) {
                             fprintf(stderr, "Mount point '%s' is BIND\n", mi->mount_point);
                             mi->flags |= MOUNTINFO_IS_BIND;
                             break;
@@ -364,7 +384,7 @@ struct mountinfo *mountinfo_read() {
                     }
 
 #ifdef NETDATA_INTERNAL_CHECKS
-                    if(!mi) {
+                    if(unlikely(!mi)) {
                         error("Mount point '%s' not found in /proc/self/mountinfo", mnt->mnt_dir);
                     }
 #endif