head	1.3;
access;
symbols
	pkgsrc-2013Q2:1.3.0.24
	pkgsrc-2013Q2-base:1.3
	pkgsrc-2012Q4:1.3.0.22
	pkgsrc-2012Q4-base:1.3
	pkgsrc-2011Q4:1.3.0.20
	pkgsrc-2011Q4-base:1.3
	pkgsrc-2011Q2:1.3.0.18
	pkgsrc-2011Q2-base:1.3
	pkgsrc-2009Q4:1.3.0.16
	pkgsrc-2009Q4-base:1.3
	pkgsrc-2008Q4:1.3.0.14
	pkgsrc-2008Q4-base:1.3
	pkgsrc-2008Q3:1.3.0.12
	pkgsrc-2008Q3-base:1.3
	cube-native-xorg:1.3.0.10
	cube-native-xorg-base:1.3
	pkgsrc-2008Q2:1.3.0.8
	pkgsrc-2008Q2-base:1.3
	pkgsrc-2008Q1:1.3.0.6
	pkgsrc-2008Q1-base:1.3
	pkgsrc-2007Q4:1.3.0.4
	pkgsrc-2007Q4-base:1.3
	pkgsrc-2007Q3:1.3.0.2
	pkgsrc-2007Q3-base:1.3
	pkgsrc-2007Q2:1.2.0.2
	pkgsrc-2007Q2-base:1.2
	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.3
date	2007.09.20.21.12.22;	author wiz;	state dead;
branches;
next	1.2;

1.2
date	2007.06.25.21.18.52;	author joerg;	state Exp;
branches;
next	1.1;

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


desc
@@


1.3
log
@Rename libgtop2 to libgtop, to match upstream name.
@
text
@$NetBSD: patch-ak,v 1.2 2007/06/25 21:18:52 joerg Exp $

--- sysdeps/freebsd/procmap.c.orig	2005-12-12 10:09:39.000000000 +0000
+++ sysdeps/freebsd/procmap.c
@@@@ -21,6 +21,10 @@@@
    Boston, MA 02111-1307, USA.
 */
 
+#ifdef __DragonFly__
+#define _KERNEL_STRUCTURES
+#endif
+
 #include <config.h>
 #include <glibtop.h>
 #include <glibtop/error.h>
@@@@ -41,7 +45,7 @@@@
 #else
 #include <vm/vm_object.h>
 #include <vm/vm_map.h>
-#if (__FreeBSD_version >= 400011)
+#if defined(__DragonFly__) || (defined(__FreeBSD__) && __FreeBSD_version >= 400011)
 #include <vm/vm.h>
 #else
 #include <vm/vm_prot.h>
@@@@ -109,9 +113,9 @@@@ glibtop_get_proc_map_p (glibtop *server,
 	struct vm_object object;
 #endif
 	glibtop_map_entry *maps;
-#if defined __FreeBSD__
+#if defined(__FreeBSD__) || defined(__DragonFly__)
 	struct vnode vnode;
-#if __FreeBSD_version < 500039
+#if (defined(__FreeBSD__) && __FreeBSD_version < 500039) || defined(__DragonFly__)
 	struct inode inode;
 #endif
 #endif
@@@@ -130,7 +134,7 @@@@ glibtop_get_proc_map_p (glibtop *server,
 	/* Get the process data */
 	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);
+		glibtop_warn_io_r (server, "kvm_getprocs (%d)", pid);
 		return NULL;
 	}
 
@@@@ -178,9 +182,12 @@@@ glibtop_get_proc_map_p (glibtop *server,
 		} else {
 			update = 1;
 		}
-
-#ifdef __FreeBSD__
-#if __FreeBSD__ >= 4
+#if defined(__FreeBSD__) || defined(__DragonFly__)
+#if defined(__DragonFly__) && __DragonFly_version >= 180000
+		if (entry.eflags != VM_MAPTYPE_NORMAL &&
+		    entry.eflags != VM_MAPTYPE_VPAGETABLE)
+			continue;
+#elif (defined(__FreeBSD__) && __FreeBSD__ >= 4) || defined(__DragonFly__)
 		if (entry.eflags & (MAP_ENTRY_IS_SUB_MAP))
 			continue;
 #else
@@@@ -256,7 +263,7 @@@@ glibtop_get_proc_map_p (glibtop *server,
 #endif
 
 
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) || defined(__DragonFly__)
 		/* If the object is of type vnode, add its size */
 
 		if (object.type != OBJT_VNODE)
@


1.2
log
@Fix build on DragonFly 1.8+.
@
text
@d1 1
a1 1
$NetBSD$
@


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
@d3 1
a3 1
--- sysdeps/freebsd/procmap.c.orig	2005-02-23 08:20:45.000000000 +0000
d5 12
a16 1
@@@@ -40,7 +40,7 @@@@
d25 1
a25 1
@@@@ -108,9 +108,9 @@@@ glibtop_get_proc_map_p (glibtop *server,
d37 11
a47 1
@@@@ -178,8 +178,8 @@@@ glibtop_get_proc_map_p (glibtop *server,
d50 1
a50 1
 
d54 5
a58 1
+#if (defined(__FreeBSD__) && __FreeBSD__ >= 4) || defined(__DragonFly__)
d62 1
a62 1
@@@@ -255,7 +255,7 @@@@ glibtop_get_proc_map_p (glibtop *server,
@