Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/sysutils/lsof lsof: disable loading of kernel namecach...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/7b1b237bee76
branches:  trunk
changeset: 428799:7b1b237bee76
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Sat Apr 11 15:22:52 2020 +0000

description:
lsof: disable loading of kernel namecache on NetBSD after 9.99.54

lsof expects to be able to walk the namecache as a linked list using
kmem grovelling. The namecache on NetBSD now uses rbtree instead of
hash buckets + linked list. While it's certainly possible to iterate an
rbtree using kmem it's also more complicated and code doesn't exist yet.
Unfortunately this means lsof for now doesn't resolve pathnames for
type VREG.

diffstat:

 sysutils/lsof/distinfo         |   4 ++--
 sysutils/lsof/patches/patch-af |  11 ++++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diffs (43 lines):

diff -r 11573a390a7c -r 7b1b237bee76 sysutils/lsof/distinfo
--- a/sysutils/lsof/distinfo    Sat Apr 11 14:08:34 2020 +0000
+++ b/sysutils/lsof/distinfo    Sat Apr 11 15:22:52 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.92 2020/03/05 20:49:22 tnn Exp $
+$NetBSD: distinfo,v 1.93 2020/04/11 15:22:52 tnn Exp $
 
 SHA1 (lsof_4.91.tar.bz2) = da6f9883d00f200671f6e47cf838bb9b6b9c6f01
 RMD160 (lsof_4.91.tar.bz2) = 5f7be9a860f30b66e247e0405657a69dd044e245
@@ -9,7 +9,7 @@
 SHA1 (patch-ac) = dac0fcdfee97d42c8f23684a4321519b9f8698d9
 SHA1 (patch-ad) = 7f639e8832c2da8e498c33a38ecbc7b3d3a7430a
 SHA1 (patch-ae) = 3f4a7ce54c0646941fd86400f91a2d17e9d2354a
-SHA1 (patch-af) = 4106e4cdf01587d6f6a080ddb5bb0261729bcede
+SHA1 (patch-af) = 5e55aef8d1e65c289ce8f4c3c97ae6d2b676fd82
 SHA1 (patch-ag) = ced30f63961268a6c76bcc1d22a2eb9e1f750480
 SHA1 (patch-ah) = 2de22b9a3733f958298af5e33b66c0653c320f59
 SHA1 (patch-dialects_n+obsd_dnode1.c) = dc8c766760aca4eb2e7d7af3944260dd49795c09
diff -r 11573a390a7c -r 7b1b237bee76 sysutils/lsof/patches/patch-af
--- a/sysutils/lsof/patches/patch-af    Sat Apr 11 14:08:34 2020 +0000
+++ b/sysutils/lsof/patches/patch-af    Sat Apr 11 15:22:52 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.17 2020/03/05 20:49:22 tnn Exp $
+$NetBSD: patch-af,v 1.18 2020/04/11 15:22:52 tnn Exp $
 
 --- dialects/n+obsd/dlsof.h.orig       2006-03-28 21:54:15.000000000 +0000
 +++ dialects/n+obsd/dlsof.h
@@ -99,6 +99,15 @@
        char *dir;                      /* mounted directory */
        char *fsname;                   /* file system name */
        struct l_vfs *next;             /* forward link */
+@@ -565,7 +579,7 @@ struct sfile {
+ #define       NCACHE_NODEADDR nc_vp           /* node address in NCACHE */
+ #define       NCACHE_PARADDR  nc_dvp          /* parent node address in NCACHE */
+ 
+-#  if (defined(OPENBSDV) && OPENBSDV>=2010) || (defined(NETBSDV) && NETBSDV>=1002000)
++#  if (defined(OPENBSDV) && OPENBSDV>=2010) || (defined(NETBSDV) && NETBSDV>=1002000 && __NetBSD_Version__ < 999005400)
+ #define       NCACHE_NXT      nc_hash.le_next /* link in NCACHE */
+ #  else       /* (defined(OPENBSDV) && OPENBSDV>=2010) || (defined(NETBSDV) && NETBSDV>=1002000) */
+ #   if        defined(NetBSD1_0) && NetBSD<1994101
 @@ -581,4 +595,12 @@ struct sfile {
  #  endif      /* defined(HASNCVPID) */
  # endif  /* defined(HASNCACHE) */



Home | Main Index | Thread Index | Old Index