head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.24
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.22
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.20
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.18
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2009Q4:1.2.0.16
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2008Q4:1.2.0.14
	pkgsrc-2008Q4-base:1.2
	pkgsrc-2008Q3:1.2.0.12
	pkgsrc-2008Q3-base:1.2
	cube-native-xorg:1.2.0.10
	cube-native-xorg-base:1.2
	pkgsrc-2008Q2:1.2.0.8
	pkgsrc-2008Q2-base:1.2
	pkgsrc-2008Q1:1.2.0.6
	pkgsrc-2008Q1-base:1.2
	pkgsrc-2007Q4:1.2.0.4
	pkgsrc-2007Q4-base:1.2
	pkgsrc-2007Q3:1.2.0.2
	pkgsrc-2007Q3-base:1.2
	pkgsrc-2007Q2:1.1.0.12
	pkgsrc-2007Q2-base:1.1
	pkgsrc-2007Q1:1.1.0.10
	pkgsrc-2007Q1-base:1.1
	pkgsrc-2006Q4:1.1.0.8
	pkgsrc-2006Q4-base:1.1
	pkgsrc-2006Q3:1.1.0.6
	pkgsrc-2006Q3-base:1.1
	pkgsrc-2006Q2:1.1.0.4
	pkgsrc-2006Q2-base:1.1
	pkgsrc-2006Q1:1.1.0.2
	pkgsrc-2006Q1-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2007.09.20.21.12.25;	author wiz;	state dead;
branches;
next	1.1;

1.1
date	2006.02.28.23.48.12;	author joerg;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Rename libgtop2 to libgtop, to match upstream name.
@
text
@$NetBSD: patch-ap,v 1.1 2006/02/28 23:48:12 joerg Exp $

--- sysdeps/freebsd/swap.c.orig	2004-09-24 22:49:06.000000000 +0000
+++ sysdeps/freebsd/swap.c
@@@@ -32,7 +32,10 @@@@ static const unsigned long _glibtop_sysd
 (1L << GLIBTOP_SWAP_FREE) + (1L << GLIBTOP_SWAP_PAGEIN) +
 (1L << GLIBTOP_SWAP_PAGEOUT);
 
-#if defined(__FreeBSD__) || defined(__bsdi__)
+#if defined(__DragonFly__)
+#include <sys/vmmeter.h>
+
+#elif defined(__FreeBSD__) || defined(__bsdi__)
 
 #include <sys/conf.h>
 #ifdef __bsdi__
@@@@ -93,8 +96,8 @@@@ static struct nlist nlst2 [] = {
 void
 glibtop_init_swap_p (glibtop *server)
 {
-#if defined(__FreeBSD__) || defined(__bsdi__)
-#if __FreeBSD__ < 4 || defined(__bsdi__)
+#if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__bsdi__)
+#if !defined(__DragonFly__) && (__FreeBSD__ < 4 || defined(__bsdi__))
 	if (kvm_nlist (server->machine.kd, nlst) < 0) {
 		glibtop_warn_io_r (server, "kvm_nlist (swap)");
 		return;
@@@@ -129,9 +132,9 @@@@ glibtop_init_swap_p (glibtop *server)
 void
 glibtop_get_swap_p (glibtop *server, glibtop_swap *buf)
 {
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__DragonFly__)
 
-# if __FreeBSD__ < 4
+# if defined(__FreeBSD__) && __FreeBSD__ < 4
 	char *header;
 	int hlen, nswdev, dmmax;
 	int div, nfree, npfree;
@@@@ -193,7 +196,7 @@@@ glibtop_get_swap_p (glibtop *server, gli
 		buf->pagein = 0;
 		buf->pageout = 0;
 	} else {
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__DragonFly__)
 		buf->pagein = vmm.v_swappgsin - swappgsin;
 		buf->pageout = vmm.v_swappgsout - swappgsout;
 #else
@@@@ -207,7 +210,7 @@@@ glibtop_get_swap_p (glibtop *server, gli
 #endif
 	}
 
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__DragonFly__)
         swappgsin = vmm.v_swappgsin;
 	swappgsout = vmm.v_swappgsout;
 #else
@@@@ -220,9 +223,9 @@@@ glibtop_get_swap_p (glibtop *server, gli
 #endif
 #endif
 
-#if defined(__FreeBSD__)
+#if defined(__FreeBSD__) || defined(__DragonFly__)
 
-#if __FreeBSD__ < 4
+#if defined(__FreeBSD__) && __FreeBSD__ < 4
 
 	/* Size of largest swap device. */
 
@


1.1
log
@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.
@
text
@d1 1
a1 1
$NetBSD$
@