[pkgsrc/trunk]: pkgsrc/sysutils/libgtop2 Add support for DragonFly. There are...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/sysutils/libgtop2 Add support for DragonFly. There are...
From: joerg <joerg%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 03:08:00 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/c763e5847e7b
branches:  trunk
changeset: 508954:c763e5847e7b
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Feb 28 23:48:11 2006 +0000

description:
Add support for DragonFly. There are some minor issues left, e.g.
installing of the backend daemon as kmem, but I don't want to make
it the default, since almost all operations work without it.

diffstat:

 sysutils/libgtop2/distinfo         |   23 ++++-
 sysutils/libgtop2/patches/patch-aa |   96 ++++++++++++++++--------
 sysutils/libgtop2/patches/patch-ab |   84 +++++++++++++++++++++-
 sysutils/libgtop2/patches/patch-ac |   24 +++++-
 sysutils/libgtop2/patches/patch-ad |    4 +-
 sysutils/libgtop2/patches/patch-ae |   87 ++++++++++++++++++++++
 sysutils/libgtop2/patches/patch-af |   14 +++
 sysutils/libgtop2/patches/patch-ag |  141 +++++++++++++++++++++++++++++++++++++
 sysutils/libgtop2/patches/patch-ah |   12 +++
 sysutils/libgtop2/patches/patch-ai |   46 ++++++++++++
 sysutils/libgtop2/patches/patch-aj |   16 ++++
 sysutils/libgtop2/patches/patch-ak |   45 +++++++++++
 sysutils/libgtop2/patches/patch-al |   15 +++
 sysutils/libgtop2/patches/patch-am |   44 +++++++++++
 sysutils/libgtop2/patches/patch-an |   19 ++++
 sysutils/libgtop2/patches/patch-ao |   32 ++++++++
 sysutils/libgtop2/patches/patch-ap |   69 ++++++++++++++++++
 sysutils/libgtop2/patches/patch-bi |   35 ---------
 18 files changed, 725 insertions(+), 81 deletions(-)

diffs (truncated from 967 to 300 lines):

diff -r ceb68b0a2a8c -r c763e5847e7b sysutils/libgtop2/distinfo
--- a/sysutils/libgtop2/distinfo        Tue Feb 28 23:43:38 2006 +0000
+++ b/sysutils/libgtop2/distinfo        Tue Feb 28 23:48:11 2006 +0000
@@ -1,12 +1,24 @@
-$NetBSD: distinfo,v 1.17 2006/02/08 18:36:41 drochner Exp $
+$NetBSD: distinfo,v 1.18 2006/02/28 23:48:11 joerg Exp $
 
 SHA1 (libgtop-2.12.2.tar.bz2) = b8dc4c1abf3771ea3a088c1216530bb66b002242
 RMD160 (libgtop-2.12.2.tar.bz2) = b58186960bd1bca014b3e886105dd22f8c8add4d
 Size (libgtop-2.12.2.tar.bz2) = 623479 bytes
-SHA1 (patch-aa) = 94c3affb12ad78aa5020d81963f7898b38e3ef72
-SHA1 (patch-ab) = 55f4c875e4886194cba25874ab042da8e17261c7
-SHA1 (patch-ac) = dea1b6fba42d77a4fe6b2e9269cdab0521d3a305
-SHA1 (patch-ad) = c707545313bd4382825cedde30032f9083003823
+SHA1 (patch-aa) = 21cb73dc166780ddbff4c1d67864b9514e5fbcff
+SHA1 (patch-ab) = ca996f46f79781ce5e8270526663689b137c039f
+SHA1 (patch-ac) = c645307376eddb5c469ab00bd7ec8217feb3e2d5
+SHA1 (patch-ad) = c693dda2eef870d625d78da8f4e977613358314e
+SHA1 (patch-ae) = 035419a4e8a505c672f727c843dbd977acd8ce35
+SHA1 (patch-af) = 520dbdec4a8cba6e82b08c169d97c3caebacd419
+SHA1 (patch-ag) = 74d20bdc56224ae553935cc81ce47504e98701fe
+SHA1 (patch-ah) = 496c67e6de00ec105cf292f5e44a244b852db51b
+SHA1 (patch-ai) = 57d891785a45ec532757a48e77adafec091f3953
+SHA1 (patch-aj) = c244b5c60e61594c3d2c0bc95e05e12ad68938db
+SHA1 (patch-ak) = 0a29c6b7daf1ae34b528dbb2535d05009ad61b84
+SHA1 (patch-al) = d214415937d2c227ad1bcb1c14b9ddc001ad7cb4
+SHA1 (patch-am) = 2e10fd8096449ebc3428ef493e1ae4fe61a98e00
+SHA1 (patch-an) = 57a79bddc3f0e8237b72486aa8f8906f318ca38d
+SHA1 (patch-ao) = 72aa455cbc10afc6a744fd0684ec2d7a2e2c19c7
+SHA1 (patch-ap) = 1b842a59b821b2703b68935f59a65ffb6db3a68f
 SHA1 (patch-ba) = ebe5f9a5148ff72ae978934b259e63ce15f2d4c8
 SHA1 (patch-bb) = 2e98f16668f74b64848f54db57037289623ed3f2
 SHA1 (patch-bc) = a48255606b5c340a20d01cc7f4e2c1e821d9d629
@@ -15,5 +27,4 @@
 SHA1 (patch-bf) = 1cf732d7ad22fbf34aa3511e77d17cacedbc810f
 SHA1 (patch-bg) = 330de57b732550a92b4e077ad8e850acf7e0e24d
 SHA1 (patch-bh) = afdf0dec92984528efd181a24d3ef8f3eb383173
-SHA1 (patch-bi) = 56ec02e230f0c4401b95ce728d63a3d0798971e8
 SHA1 (patch-bj) = 48c46dec8d1f8ed35e452b66f3a5283a6a8f521f
diff -r ceb68b0a2a8c -r c763e5847e7b sysutils/libgtop2/patches/patch-aa
--- a/sysutils/libgtop2/patches/patch-aa        Tue Feb 28 23:43:38 2006 +0000
+++ b/sysutils/libgtop2/patches/patch-aa        Tue Feb 28 23:48:11 2006 +0000
@@ -1,8 +1,13 @@
-$NetBSD: patch-aa,v 1.3 2005/10/12 21:49:39 jmmv Exp $
+$NetBSD: patch-aa,v 1.4 2006/02/28 23:48:11 joerg Exp $
 
---- configure.orig     2005-09-04 17:54:58.000000000 +0200
+--- configure.orig     2005-11-29 10:49:14.000000000 +0000
 +++ configure
-@@ -20141,13 +20141,13 @@ echo $ECHO_N "checking for libgtop sysde
+@@ -20691,17 +20691,17 @@ echo $ECHO_N "checking for libgtop sysde
+         libgtop_have_sysinfo=yes
+         libgtop_need_server=no
+         ;;
+-      freebsd*|netbsd*|openbsd*|bsdi*)
++      freebsd*|netbsd*|openbsd*|bsdi*|dragonfly*)
          libgtop_sysdeps_dir=freebsd
          libgtop_use_machine_h=yes
          libgtop_need_server=yes
@@ -18,17 +23,48 @@
          ;;
          aix*)
          libgtop_sysdeps_dir=aix
-@@ -23761,6 +23761,78 @@ fi
- esac
+@@ -20749,7 +20749,7 @@ echo "${ECHO_T}$libgtop_sysdeps_dir" >&6
  
  
-+echo "$as_me:$LINENO: checking for kvm_open in -lkvm" >&5
-+echo $ECHO_N "checking for kvm_open in -lkvm... $ECHO_C" >&6
-+if test "${ac_cv_lib_mach_kvm_open+set}" = set; then
+       case "$host_os" in
+-      *bsd*)
++      *bsd*|dragonfly*)
+ 
+ for ac_header in net/if_var.h
+ do
+@@ -20921,7 +20921,9 @@ cat >>conftest.$ac_ext <<_ACEOF
+ #include <net/netisr.h>
+ #include <net/route.h>
+ 
+-#if defined(__FreeBSD__) || defined(__NetBSD__)
++#if defined(__DragonFly__)
++#include <net/sppp/if_sppp.h>
++#elif defined(__FreeBSD__) || defined(__NetBSD__)
+ #include <net/if_sppp.h>
+ #else
+ #include <i4b/sppp/if_sppp.h>
+@@ -20995,7 +20997,9 @@ cat >>conftest.$ac_ext <<_ACEOF
+ #include <net/netisr.h>
+ #include <net/route.h>
+ 
+-#if defined(__FreeBSD__) || defined(__NetBSD__)
++#if defined(__DragonFly__)
++#include <net/sppp/if_sppp.h>
++#elif defined(__FreeBSD__) || defined(__NetBSD__)
+ #include <net/if_sppp.h>
+ #else
+ #include <i4b/sppp/if_sppp.h>
+@@ -24342,6 +24346,73 @@ fi
+      ;;
+ esac
+ 
++echo "$as_me:$LINENO: checking for kinfo_get_sched_hz in -lkinfo" >&5
++echo $ECHO_N "checking for kinfo_get_sched_hz in -lkinfo... $ECHO_C" >&6
++if test "${ac_cv_lib_kinfo_kinfo_get_sched_gz+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
 +else
 +  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lkvm  $LIBS"
++LIBS="-lkinfo  $LIBS"
 +cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
@@ -42,11 +78,11 @@
 +#endif
 +/* We use char because int might match the return type of a gcc2
 +   builtin and then its argument prototype would still apply.  */
-+char kvm_open ();
++char kinfo_get_sched_hz ();
 +int
 +main ()
 +{
-+kvm_open ();
++kinfo_get_sched_hz ();
 +  ;
 +  return 0;
 +}
@@ -72,32 +108,36 @@
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
-+  ac_cv_lib_mach_kvm_open=yes
++  ac_cv_lib_kinfo_kinfo_get_sched_hz=yes
 +else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
-+ac_cv_lib_mach_kvm_open=no
++ac_cv_lib_kinfo_kinfo_get_sched_hz=no
 +fi
 +rm -f conftest.err conftest.$ac_objext \
 +      conftest$ac_exeext conftest.$ac_ext
 +LIBS=$ac_check_lib_save_LIBS
 +fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_mach_kvm_open" >&5
-+echo "${ECHO_T}$ac_cv_lib_mach_kvm_open" >&6
-+if test $ac_cv_lib_mach_kvm_open = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBMACH 1
-+_ACEOF
++echo "$as_me:$LINENO: result: $ac_cv_lib_kinfo_kinfo_get_sched_hz" >&5
++echo "${ECHO_T}$ac_cv_lib_kinfo_kinfo_get_sched_hz" >&6
++if test $ac_cv_lib_kinfo_kinfo_get_sched_hz = yes; then
 +
-+  KVM_LIBS="-lkvm $KVM_LIBS"
-+
++  LIBS="-lkinfo -lkvm $LIBS" # we need kvm as well
 +fi
-+
+ 
  echo "$as_me:$LINENO: checking for vm_statistics in -lmach" >&5
  echo $ECHO_N "checking for vm_statistics in -lmach... $ECHO_C" >&6
- if test "${ac_cv_lib_mach_vm_statistics+set}" = set; then
-@@ -30106,7 +30178,7 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -30043,7 +30114,7 @@ if test x$cross_compiling = xyes ; then
+         sunos*)
+           fu_cv_sys_stat_statfs4=yes
+           ;;
+-        freebsd*)
++        freebsd* | dragonfly*)
+           fu_cv_sys_stat_statfs2_bsize=yes
+           ;;
+         osf*)
+@@ -30688,7 +30759,7 @@ cat >>conftest.$ac_ext <<_ACEOF
  
  _ACEOF
  if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
@@ -106,11 +146,3 @@
    ok=yes
  fi
  rm -f conftest*
-@@ -31512,6 +31584,7 @@ s,@ECHO_C@,$ECHO_C,;t t
- s,@ECHO_N@,$ECHO_N,;t t
- s,@ECHO_T@,$ECHO_T,;t t
- s,@LIBS@,$LIBS,;t t
-+s,@KVM_LIBS@,$KVM_LIBS,;t t
- s,@build@,$build,;t t
- s,@build_cpu@,$build_cpu,;t t
- s,@build_vendor@,$build_vendor,;t t
diff -r ceb68b0a2a8c -r c763e5847e7b sysutils/libgtop2/patches/patch-ab
--- a/sysutils/libgtop2/patches/patch-ab        Tue Feb 28 23:43:38 2006 +0000
+++ b/sysutils/libgtop2/patches/patch-ab        Tue Feb 28 23:48:11 2006 +0000
@@ -1,8 +1,17 @@
-$NetBSD: patch-ab,v 1.2 2005/03/22 16:03:37 jmmv Exp $
+$NetBSD: patch-ab,v 1.3 2006/02/28 23:48:11 joerg Exp $
 
---- sysdeps/freebsd/proctime.c.orig    2005-02-23 09:20:45.000000000 +0100
+--- sysdeps/freebsd/proctime.c.orig    2005-02-23 08:20:45.000000000 +0000
 +++ sysdeps/freebsd/proctime.c
-@@ -137,11 +137,6 @@ glibtop_get_proc_time_p (glibtop *server
+@@ -57,7 +57,7 @@ glibtop_init_proc_time_p (glibtop *serve
+  * system, and interrupt time usage.
+  */
+ 
+-#ifndef __FreeBSD__
++#if !defined(__FreeBSD__) && !defined(__DragonFly__)
+ 
+ #ifndef __FreeBSD__
+ static void
+@@ -137,21 +137,20 @@ glibtop_get_proc_time_p (glibtop *server
  #if (defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000))
        if (server->sysdeps.proc_time == 0)
                return;
@@ -14,3 +23,72 @@
  #endif
  
        /* Get the process information */
+       pinfo = kvm_getprocs (server->machine.kd, KERN_PROC_PID, pid, &count);
+-      if ((pinfo == NULL) || (count != 1))
+-              glibtop_error_io_r (server, "kvm_getprocs (%d)", pid);
++      if ((pinfo == NULL) || (count != 1)) {
++              glibtop_warn_io_r (server, "kvm_getprocs (%d)", pid);
++              return;
++      }
+ 
+ #if defined(__FreeBSD__) && (__FreeBSD_version >= 500013)
+       buf->rtime = pinfo [0].ki_runtime;
+-#elif (defined __FreeBSD__) && (__FreeBSD_version <= 500013)
++#elif defined(__DragonFly__)
++      buf->rtime = pinfo[0].kp_eproc.e_uticks / 100000;
++#elif (defined __FreeBSD__) && (__FreeBSD_version <= 500013))
+       buf->rtime = pinfo [0].kp_proc.p_runtime;
+ #else
+       buf->rtime = tv2sec (pinfo [0].kp_proc.p_rtime);
+@@ -193,18 +192,26 @@ glibtop_get_proc_time_p (glibtop *server
+        if ((pinfo [0].ki_flag & P_INMEM)) {
+ #endif
+            buf->utime = pinfo [0].ki_runtime;
+-           buf->stime = 0; /* XXX */
++                 buf->stime = tv2sec (pinfo [0].ki_rusage.ru_stime);
+            buf->cutime = tv2sec (pinfo [0].ki_childtime);
+-           buf->cstime = 0; /* XXX */
++#if __FreeBSD_version >= 600000
++                 buf->cstime = tv2sec (pinfo [0].ki_rusage_ch.ru_stime);
++#else
++                 buf->cstime = 0;
++#endif
+            buf->start_time = tv2sec (pinfo [0].ki_start);
+            buf->flags = _glibtop_sysdeps_proc_time_user;
+        }
+ 
+       glibtop_suid_enter (server);
+ 
+-#elif (__FreeBSD_version <= 500013)
++#elif defined(__DragonFly__) || (defined(__FreeBSD__) || (__FreeBSD_version <= 500013))
+ 
++#if defined(__DragonFly__)
++        if ((pinfo [0].kp_proc.p_flag & P_SWAPPEDOUT) == 0 &&
++#else
+         if ((pinfo [0].kp_proc.p_flag & P_INMEM) &&
++#endif
+             kvm_uread (server->machine.kd, &(pinfo [0]).kp_proc,
+                        (unsigned long) &u_addr->u_stats,
+                        (char *) &pstats, sizeof (pstats)) == sizeof (pstats))
+@@ -214,13 +221,21 @@ glibtop_get_proc_time_p (glibtop *server
+                        buf->stime = tv2sec (pinfo[0].kp_eproc.e_stats.p_ru.ru_stime);
+                        buf->cutime = tv2sec (pinfo[0].kp_eproc.e_stats.p_cru.ru_utime);
+                        buf->cstime = tv2sec (pinfo[0].kp_eproc.e_stats.p_cru.ru_stime);
++#if defined(__DragonFly__)
++                       buf->start_time = tv2sec (pinfo[0].kp_thread.td_start);
++#else
+                        buf->start_time = tv2sec (pinfo[0].kp_eproc.e_stats.p_start);
++#endif
+                        buf->flags = _glibtop_sysdeps_proc_time_user;
+                        glibtop_suid_leave (server);
+               }
+ #else
+ 
++#if defined(__DragonFly__)
++        if ((pinfo [0].kp_proc.p_flag & P_SWAPPEDOUT) == 0 &&
++#else
+       if ((pinfo [0].kp_proc.p_flag & P_INMEM) &&
++#endif
+           kvm_uread (server->machine.kd, &(pinfo [0]).kp_proc,
+                      (unsigned long) &u_addr->u_stats,
+                      (char *) &pstats, sizeof (pstats)) == sizeof (pstats))
diff -r ceb68b0a2a8c -r c763e5847e7b sysutils/libgtop2/patches/patch-ac
--- a/sysutils/libgtop2/patches/patch-ac        Tue Feb 28 23:43:38 2006 +0000
+++ b/sysutils/libgtop2/patches/patch-ac        Tue Feb 28 23:48:11 2006 +0000
@@ -1,12 +1,21 @@
-$NetBSD: patch-ac,v 1.1 2004/05/04 23:36:16 minskim Exp $
+$NetBSD: patch-ac,v 1.2 2006/02/28 23:48:11 joerg Exp $
 
 --- sysdeps/common/mountlist.c.orig    2003-10-20 09:29:03.000000000 -0500
 +++ sysdeps/common/mountlist.c
-@@ -334,7 +334,11 @@ read_filesystem_list (need_fs_type, all_
+@@ -106,7 +106,7 @@ static struct mount_entry *read_filesyst
+ #endif
+
Prev by Date: [pkgsrc/trunk]: pkgsrc/pkgtools/pkglint The rant on Perl has moved to the pkg...
Next by Date: [pkgsrc/trunk]: pkgsrc/doc/guide/files Space between DragonFlY and BSD.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/pkgtools/pkglint The rant on Perl has moved to the pkg...
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc/guide/files Space between DragonFlY and BSD.
Indexes:
Home | Main Index | Thread Index | Old Index