Move static variables to lsof_context in Darwin dproc.c

- Move process information buffers (Fds, Pids, NbPids, NbFds) to ctx->dialect
- Move thread buffers (Threads, NbThreads) to ctx->dialect (DARWINV>=900)
- Move fileport buffers (Fps, NbFps) to ctx->dialect (PROC_PIDLISTFILEPORTS)
- Move vnode recording (Vips, NVips) to ctx->dialect
- Replace manual malloc/realloc with grow_array() helper for Vips
- Remove redundant NbVips field (bytes can be calculated from NVips)
- Add convenience macros in dlsof.h for accessing context fields
- Rename struct vips_info to struct darwin_vips_info for namespacing

All 14 test cases pass successfully.

Author: jiegec

lib/dialects/darwin/dlsof.h

@@ -128,6 +128,48 @@ struct sfile {
 #        define offsetof(type, member) ((size_t)(&((type *)0)->member))
 #    endif /* !defined(offsetof) */
 
-struct lsof_context_dialect {};
+struct lsof_context_dialect {
+    /* Process information buffers */
+    struct proc_fdinfo *fds; /* FD buffer */
+    int *pids;               /* PID buffer */
+    int nb_pids;             /* bytes allocated to Pids */
+    int nb_fds;              /* bytes allocated to FDs */
+
+#    if DARWINV >= 900
+    int nb_threads;    /* Threads bytes allocated */
+    uint64_t *threads; /* Thread buffer */
+#    endif             /* DARWINV>=900 */
+
+#    if defined(PROC_PIDLISTFILEPORTS)
+    struct proc_fileportinfo *fps; /* fileport buffer */
+    int nb_fps;                    /* bytes allocated to fileports */
+#    endif                         /* PROC_PIDLISTFILEPORTS */
+
+    /* Vnode info recording */
+    struct darwin_vips_info {
+        dev_t dev;
+        unsigned long ino;
+    } *vips;    /* recorded vnodes */
+    int n_vips; /* entries allocated to Vips (capacity) */
+};
+
+/* Macros to access dialect-specific context fields */
+#    define Fds (ctx->dialect.fds)
+#    define Pids (ctx->dialect.pids)
+#    define NbPids (ctx->dialect.nb_pids)
+#    define NbFds (ctx->dialect.nb_fds)
+
+#    if DARWINV >= 900
+#        define Threads (ctx->dialect.threads)
+#        define NbThreads (ctx->dialect.nb_threads)
+#    endif /* DARWINV>=900 */
+
+#    if defined(PROC_PIDLISTFILEPORTS)
+#        define Fps (ctx->dialect.fps)
+#        define NbFps (ctx->dialect.nb_fps)
+#    endif /* PROC_PIDLISTFILEPORTS */
+
+#    define Vips (ctx->dialect.vips)
+#    define NVips (ctx->dialect.n_vips)
 
 #endif /* DARWIN_LSOF_H */

lib/dialects/darwin/dproc.c

@@ -56,37 +56,6 @@ static char copyright[] = "@(#) Copyright 2005-2007 Apple Inc. and Purdue "
                                                  */
 #endif                                          /* PROC_PIDLISTFILEPORTS */
 
-/*
- * Local static variables
- */
-
-static struct proc_fdinfo *Fds = (struct proc_fdinfo *)NULL; /* FD buffer */
-static int NbPids = 0;          /* bytes allocated to Pids */
-static int NbFds = 0;           /* bytes allocated to FDs */
-static int *Pids = (int *)NULL; /* PID buffer */
-
-#if DARWINV >= 900
-static int NbThreads = 0;                    /* Threads bytes allocated */
-static uint64_t *Threads = (uint64_t *)NULL; /* Thread buffer */
-#endif                                       /* DARWINV>=900 */
-
-#if defined(PROC_PIDLISTFILEPORTS)
-static struct proc_fileportinfo *Fps =
-    (struct proc_fileportinfo *)NULL; /* fileport buffer */
-static int NbFps = 0;                 /* bytes allocated to fileports */
-#endif                                /* PROC_PIDLISTFILEPORTS */
-
-/*
- * Local structure definitions
- */
-
-static struct vips_info {
-    dev_t dev;
-    ino_t ino;
-} *Vips = (struct vips_info *)NULL; /* recorded vnodes */
-static int NbVips = 0;              /* bytes allocated to Vips */
-static int NVips = 0;               /* entries allocated to Vips */
-
 /*
  * Local function prototypes
  */
@@ -133,18 +102,11 @@ static void enter_vn_text(struct lsof_context *ctx,    /* context */
      * Record the entry of the vnode information.
      */
     if (i >= NVips) {
-
         /*
          * Allocate space for recording the vnode information.
          */
-        NVips += VIPS_INCR;
-        NbVips += (int)(VIPS_INCR * sizeof(struct vips_info));
-        if (!Vips)
-            Vips = (struct vips_info *)malloc((MALLOC_S)NbVips);
-        else
-            Vips =
-                (struct vips_info *)realloc((MALLOC_P *)Vips, (MALLOC_S)NbVips);
-        if (!Vips) {
+        if (grow_array((void **)&Vips, &NVips, sizeof(struct darwin_vips_info),
+                       VIPS_INCR)) {
             (void)fprintf(stderr, "%s: PID %d: no text recording space\n", Pn,
                           Lp->pid);
             Error(ctx);