Move MSHash to lsof_ctx_dialect for thread safety

Author: jiegec

lib/dialects/linux/dlsof.c

@@ -115,4 +115,17 @@ void lsof_dialect_destroy(struct lsof_context *ctx) {
         CLEAN(Path);
         Pathl = 0;
     }
+#if defined(HASMNTSUP)
+    if (MSHash) {
+        for (int h = 0; h < HASHMNT; h++) {
+            mntsup_t *mp, *mpn;
+            for (mp = MSHash[h]; mp; mp = mpn) {
+                mpn = mp->next;
+                CLEAN(mp->dir_name);
+                CLEAN(mp);
+            }
+        }
+        CLEAN(MSHash);
+    }
+#endif
 }

lib/dialects/linux/dlsof.h

@@ -209,6 +209,21 @@ struct llock {
     struct llock *next;
 };
 
+#    if defined(HASMNTSUP)
+typedef struct mntsup {
+    char *dir_name;      /* mounted directory name */
+    size_t dir_name_len; /* strlen(dir_name) */
+    dev_t dev;           /* device number */
+    int ln;              /* line on which defined */
+    struct mntsup *next; /* next entry */
+} mntsup_t;
+
+#        define HASHMNT                                                        \
+            128 /* mount supplement hash bucket count                          \
+                 * !!!MUST BE A POWER OF 2!!! */
+
+#    endif /* defined(HASMNTSUP) */
+
 struct lsof_context_dialect {
     /* dnode.c - lock hash table */
     struct llock **lock_hash;
@@ -238,6 +253,10 @@ struct lsof_context_dialect {
     /* dproc.c - /proc/FD temp buffer */
     char *temp_path_buf;
     int temp_path_buf_sz;
+#    if defined(HASMNTSUP)
+    mntsup_t **mntsup_hash; /* mount supplement
+                             * hash buckets */
+#    endif                  /* defined(HASMNTSUP) */
 };
 
 /* Dialect-specific cleanup function */
@@ -278,4 +297,7 @@ void lsof_dialect_destroy(struct lsof_context *ctx);
 #    define Path (ctx->dialect.temp_path_buf)
 #    define Pathl (ctx->dialect.temp_path_buf_sz)
 
+/* mount supplement hash buckets */
+#    define MSHash (ctx->dialect.mntsup_hash)
+
 #endif /* LINUX_LSOF_H	*/

lib/dialects/linux/dmnt.c

@@ -34,12 +34,6 @@
  * Local definitions
  */
 
-#if defined(HASMNTSUP)
-#    define HASHMNT                                                            \
-        128 /* mount supplement hash bucket count                              \
-             * !!!MUST BE A POWER OF 2!!! */
-#endif      /* defined(HASMNTSUP) */
-
 /*
  * Local function prototypes
  */
@@ -56,23 +50,10 @@ static int hash_mnt(char *dir_name);
  * Local structure definitions.
  */
 
-#if defined(HASMNTSUP)
-typedef struct mntsup {
-    char *dir_name;      /* mounted directory name */
-    size_t dir_name_len; /* strlen(dir_name) */
-    dev_t dev;           /* device number */
-    int ln;              /* line on which defined */
-    struct mntsup *next; /* next entry */
-} mntsup_t;
-#endif /* defined(HASMNTSUP) */
-
 /*
  * Local static definitions
  */
 
-static mntsup_t **MSHash = (mntsup_t **)NULL; /* mount supplement
-                                               * hash buckets */
-
 /*
  * convert_octal_escaped() -- convert octal-escaped characters in string
  */