Move hashSfile static state to lsof_context

jiegec · jiegec · commit dd692bdf360b · 2026-03-31T18:14:30.000+08:00
diff --git a/lib/common.h b/lib/common.h
@@ -1158,6 +1158,7 @@ struct lsof_context {
     /* hash by clone buckets */
     struct hsfile *sfile_hash_clone;
     int sfile_hash_clone_count;
+    int sfile_hash_done;
 
     /* zone arguments supplied with -z */
     znhash_t **sel_zone;
@@ -1516,6 +1517,7 @@ struct lsof_context {
 #    define HbyNmCt (ctx->sfile_hash_name_count)
 #    define HbyCd (ctx->sfile_hash_clone)
 #    define HbyCdCt (ctx->sfile_hash_clone_count)
+#    define Hs (ctx->sfile_hash_done)
 /* solaris zone */
 #    define ZoneArg (ctx->sel_zone)
 /* command name limit */
diff --git a/lib/dialects/aix/dfile.c b/lib/dialects/aix/dfile.c
@@ -85,15 +85,14 @@ static int HbyMPCCt = 0; /* HbyMPC entry count */
  */
 
 void hashSfile(struct lsof_context *ctx) {
-    static int hs = 0;
     int i;
     struct sfile *s;
     struct hsfile *sh, *sn;
     /*
      * Do nothing if there are no file search arguments cached or if the
      * hashes have already been constructed.
      */
-    if (!Sfile || hs)
+    if (!Sfile || Hs)
         return;
     /*
      * Allocate hash buckets by (device,inode), file system device, MPC device,
@@ -134,7 +133,7 @@ void hashSfile(struct lsof_context *ctx) {
                       SFNMHASH);
         Error(ctx);
     }
-    hs++;
+    Hs++;
     /*
      * Scan the Sfile chain, building file, file system, MPC file, and file
      * name hash bucket chains.
@@ -387,7 +386,7 @@ char *print_dev(struct lfile *lf, /* file whose device to be printed */
  */
 
 void process_file(struct lsof_context *ctx, /* context */
-                  KA_T fp) /* kernel file structure address */
+                  KA_T fp)                  /* kernel file structure address */
 {
     struct file f;
     int flag;
@@ -430,26 +429,26 @@ void process_file(struct lsof_context *ctx, /* context */
          * Save file structure values.
          */
 
-#if !defined(HASNOFSCOUNT)
+#    if !defined(HASNOFSCOUNT)
         Lf->fct = (long)f.f_count;
         Lf->fsv |= FSV_CT;
-#endif /* !defined(HASNOFSCOUNT) */
+#    endif /* !defined(HASNOFSCOUNT) */
 
-#if !defined(HASNOFSADDR)
+#    if !defined(HASNOFSADDR)
         Lf->fsa = fp;
         Lf->fsv |= FSV_FA;
-#endif /* !defined(HASNOFSADDR) */
+#    endif /* !defined(HASNOFSADDR) */
 
-#if !defined(HASNOFSFLAGS)
+#    if !defined(HASNOFSFLAGS)
         Lf->ffg = (long)f.f_flag;
         Lf->fsv |= FSV_FG;
-#endif /* !defined(HASNOFSFLAGS) */
+#    endif /* !defined(HASNOFSFLAGS) */
 
-#if !defined(HASNOFSNADDR)
+#    if !defined(HASNOFSNADDR)
         Lf->fna = (KA_T)f.f_data;
         Lf->fsv |= FSV_NI;
-#endif /* !defined(HASNOFSNADDR) */
-#endif /* defined(HASFSTRUCT) */
+#    endif /* !defined(HASNOFSNADDR) */
+#endif     /* defined(HASFSTRUCT) */
 
         /*
          * Process structure by its type.
@@ -458,18 +457,18 @@ void process_file(struct lsof_context *ctx, /* context */
 
 #if defined(DTYPE_PIPE)
         case DTYPE_PIPE:
-#if defined(HASPIPEFN)
+#    if defined(HASPIPEFN)
             if (!Selinet)
                 HASPIPEFN(ctx, (KA_T)f.f_data);
-#endif /* defined(HASPIPEFN) */
+#    endif /* defined(HASPIPEFN) */
             return;
 #endif /* defined(DTYPE_PIPE) */
 
 #if defined(DTYPE_PTS)
         case DTYPE_PTS:
-#if defined(HASPTSFN)
+#    if defined(HASPTSFN)
             HASPTSFN(ctx, (KA_T)f.f_data);
-#endif /* defined(HASPTSFN) */
+#    endif /* defined(HASPTSFN) */
             return;
 #endif /* defined(DTYPE_PTS) */
 
@@ -494,10 +493,10 @@ void process_file(struct lsof_context *ctx, /* context */
             /*
              * AIX-specific: Capture filename from file structure.
              *
-             * AIX limitation: The kernel doesn't provide an accessible name cache,
-             * so we can only obtain the leaf filename from f_fnamep. We'll combine
-             * this with the filesystem mount point (if available) after calling
-             * process_node() to provide partial path context.
+             * AIX limitation: The kernel doesn't provide an accessible name
+             * cache, so we can only obtain the leaf filename from f_fnamep.
+             * We'll combine this with the filesystem mount point (if available)
+             * after calling process_node() to provide partial path context.
              *
              * Full path reconstruction is not possible on AIX without expensive
              * userspace filesystem scanning.
@@ -507,12 +506,14 @@ void process_file(struct lsof_context *ctx, /* context */
                 int have_leaf = 0;
 
                 /* Try to read the leaf filename from the file structure */
-                if (f.f_vnode && f.f_fnamep
-                    && !kread(ctx, (KA_T)f.f_vnode, (char *)&v, sizeof(v))
-                    && v.v_gnode && !kread(ctx, (KA_T)v.v_gnode, (char *)&g, sizeof(g))
-                    && (g.gn_type == VREG || g.gn_type == VDIR)) {
-                    if (!kread(ctx, (KA_T)f.f_fnamep, leafname, sizeof(leafname)-1)) {
-                        leafname[sizeof(leafname)-1] = '\0';
+                if (f.f_vnode && f.f_fnamep &&
+                    !kread(ctx, (KA_T)f.f_vnode, (char *)&v, sizeof(v)) &&
+                    v.v_gnode &&
+                    !kread(ctx, (KA_T)v.v_gnode, (char *)&g, sizeof(g)) &&
+                    (g.gn_type == VREG || g.gn_type == VDIR)) {
+                    if (!kread(ctx, (KA_T)f.f_fnamep, leafname,
+                               sizeof(leafname) - 1)) {
+                        leafname[sizeof(leafname) - 1] = '\0';
                         /* Only use if we got a non-empty string */
                         if (leafname[0]) {
                             have_leaf = 1;
@@ -521,22 +522,25 @@ void process_file(struct lsof_context *ctx, /* context */
                 }
 
                 /* Process the node to get vfs/mount info and other metadata */
-#if defined(HASF_VNODE)
+#    if defined(HASF_VNODE)
                 process_node(ctx, (KA_T)f.f_vnode);
-#else  /* !defined(HASF_VNODE) */
+#    else  /* !defined(HASF_VNODE) */
                 process_node(ctx, (KA_T)f.f_data);
-#endif /* defined(HASF_VNODE) */
+#    endif /* defined(HASF_VNODE) */
 
                 /*
                  * If we have a leaf name, combine it with mount point info.
                  * This provides better context than just the leaf name alone.
-                 * Use ellipsis (...) to indicate missing path components between
-                 * the mount point and the leaf filename.
+                 * Use ellipsis (...) to indicate missing path components
+                 * between the mount point and the leaf filename.
                  */
                 if (have_leaf) {
-                    if (Lf->fsdir && Lf->fsdir[0] && strcmp(Lf->fsdir, "/") != 0) {
-                        /* We have a non-root mount point, show mount/.../leaf */
-                        (void)snpf(Namech, Namechl, "%s/.../%s", Lf->fsdir, leafname);
+                    if (Lf->fsdir && Lf->fsdir[0] &&
+                        strcmp(Lf->fsdir, "/") != 0) {
+                        /* We have a non-root mount point, show mount/.../leaf
+                         */
+                        (void)snpf(Namech, Namechl, "%s/.../%s", Lf->fsdir,
+                                   leafname);
                     } else if (Lf->fsdir && strcmp(Lf->fsdir, "/") == 0) {
                         /* Root filesystem, show /.../leaf */
                         (void)snpf(Namech, Namechl, "/.../%s", leafname);
diff --git a/lib/dialects/linux/dfile.c b/lib/dialects/linux/dfile.c
@@ -74,15 +74,14 @@
  * hashSfile() - hash Sfile entries for use in is_file_named() searches
  */
 void hashSfile(struct lsof_context *ctx) {
-    static int hs = 0;
     int i;
     struct sfile *s;
     struct hsfile *sh, *sn;
     /*
      * Do nothing if there are no file search arguments cached or if the
      * hashes have already been constructed.
      */
-    if (!Sfile || hs)
+    if (!Sfile || Hs)
         return;
     /*
      * Allocate hash buckets by (device,inode), file system device, and file
@@ -116,7 +115,7 @@ void hashSfile(struct lsof_context *ctx) {
                       SFNMHASH);
         Error(ctx);
     }
-    hs++;
+    Hs++;
     /*
      * Scan the Sfile chain, building file, file system, raw device, and file
      * name hash bucket chains.
diff --git a/lib/dialects/sun/dfile.c b/lib/dialects/sun/dfile.c
@@ -96,14 +96,13 @@ int get_max_fd() {
 
 void hashSfile(struct lsof_context *ctx) {
     int cmaj, hvc, i;
-    static int hs = 0;
     struct sfile *s;
     struct hsfile *sh, *sn;
     /*
      * Do nothing if there are no file search arguments cached or if the
      * hashes have already been constructed.
      */
-    if (!Sfile || hs)
+    if (!Sfile || Hs)
         return;
     /*
      * Preset the clone major device for Solaris.
@@ -154,7 +153,7 @@ void hashSfile(struct lsof_context *ctx) {
                       SFNMHASH);
         Error(ctx);
     }
-    hs++;
+    Hs++;
     /*
      * Scan the Sfile chain, building file, file system, and file name hash
      * bucket chains.
diff --git a/lib/isfn.c b/lib/isfn.c
@@ -108,7 +108,6 @@
  */
 
 void hashSfile(struct lsof_context *ctx) {
-    static int hs = 0;
     int i;
     int sfplm = 3;
     struct sfile *s;
@@ -117,7 +116,7 @@ void hashSfile(struct lsof_context *ctx) {
      * Do nothing if there are no file search arguments cached or if the
      * hashes have already been constructed.
      */
-    if (!Sfile || hs)
+    if (!Sfile || Hs)
         return;
     /*
      * Allocate hash buckets by (device,inode), file system device, and file
@@ -165,7 +164,7 @@ void hashSfile(struct lsof_context *ctx) {
                       SFNMHASH);
         Error(ctx);
     }
-    hs++;
+    Hs++;
     /*
      * Scan the Sfile chain, building file, file system, raw device, and file
      * name hash bucket chains.
