 @@ -1,38 +1,46 @@
-$NetBSD: patch-src_task-manager-bsd.c,v 1.1 2015/04/21 08:56:41 jperkin Exp $
+$NetBSD: patch-src_task-manager-bsd.c,v 1.2 2016/01/28 12:47:00 martin Exp $
 Attempt to bring netbsd, DragonFly while keeping OpenBSD support.
---- src/task-manager-bsd.c.orig	2014-12-23 20:40:14.000000000 +0000
+--- src/task-manager-bsd.c.orig	2014-12-23 21:40:14.000000000 +0100
-+++ src/task-manager-bsd.c
++++ src/task-manager-bsd.c	2016-01-28 13:44:44.128899084 +0100
-@@ -25,8 +25,18 @@
+@@ -16,6 +16,7 @@
   * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
   */
 +#define _KMEMUSER	/* NetBSD hides many types for regular userland */
  #include <stdlib.h>
  #include <err.h>
  /* for getpwuid() */
@@ -25,8 +26,18 @@
  #include <sys/param.h>
  #include <sys/sched.h>
  #include <sys/sysctl.h>
++
 +#ifdef __DragonFly__
 +#include <sys/kinfo.h>
 +#include <sys/resource.h>
 +#include <vm/vm_param.h>
 +#else
  /* for swapctl() */
  #include <sys/swap.h>
 +#include <uvm/uvm_extern.h>
 +#endif
++
 +#include <kvm.h>
  /* for strlcpy() */
  #include <string.h>
  /* for getpagesize() */
-@@ -46,108 +56,107 @@ char	*state_abbrev[] = {
+@@ -46,108 +57,107 @@ char	*state_abbrev[] = {
  gboolean get_task_list (GArray *task_list)
+ {
 -	int mib[6];
 -	size_t size;
 -#ifdef __OpenBSD__
 -	struct kinfo_proc *kp;
 -#else
 -	struct kinfo_proc2 *kp;
 -#endif
 -	Task t;
 -	struct passwd *passwdp;
 -	char **args;
 @@ -219,27 +227,27 @@ Attempt to bring netbsd, DragonFly while
 +                        passwdp = getpwuid(t.uid);
 +                        if (passwdp != NULL && passwdp->pw_name != NULL)
 +                                g_strlcpy(t.uid_name, passwdp->pw_name,
 +                                    sizeof(t.uid_name));
 +                        g_array_append_val(task_list, t);
 +                }
 +        }
 +	g_free(args);
 +        g_free(buf);
 +        g_free(kp);
  	return TRUE;
+ }
-@@ -156,26 +165,26 @@ gboolean
+@@ -156,26 +166,26 @@ gboolean
  pid_is_sleeping (guint pid)
+ {
  	int mib[6];
 -#ifdef __OpenBSD__
 -	struct kinfo_proc kp;
 -	size_t size = sizeof(struct kinfo_proc);
 -#else
 +#ifdef __NetBSD__
  	struct kinfo_proc2 kp;
  	size_t size = sizeof(struct kinfo_proc2);
 +#else
 +	struct kinfo_proc kp;
 +	size_t size = sizeof(struct kinfo_proc);
 @@ -256,39 +264,39 @@ Attempt to bring netbsd, DragonFly while
  #endif
  	mib[2] = KERN_PROC_PID;
  	mib[3] = pid;
 -#ifdef __OpenBSD__
 -	mib[4] = sizeof(struct kinfo_proc);
 -#else
 +#ifdef __NetBSD__
  	mib[4] = sizeof(struct kinfo_proc2);
 +#else
 +	mib[4] = sizeof(struct kinfo_proc);
  #endif
  	mib[5] = 1;
  	if (sysctl(mib, 6, &kp, &size, NULL, 0) < 0)
-@@ -184,7 +193,11 @@ pid_is_sleeping (guint pid)
+@@ -184,7 +194,11 @@ pid_is_sleeping (guint pid)
  #else
  		errx(1, "could not read kern.proc2 for pid %d", pid);
  #endif
 +#ifdef __DragonFly__
 +	return (kp.kp_stat == SSTOP ? TRUE : FALSE);
 +#else
  	return (kp.p_stat == SSTOP ? TRUE : FALSE);
 +#endif
+ }
  gboolean get_cpu_usage (gushort *cpu_count, gfloat *cpu_user, gfloat *cpu_system)
-@@ -192,12 +205,31 @@ gboolean get_cpu_usage (gushort *cpu_cou
+@@ -192,12 +206,31 @@ gboolean get_cpu_usage (gushort *cpu_cou
  	static gulong cur_user = 0, cur_system = 0, cur_total = 0;
  	static gulong old_user = 0, old_system = 0, old_total = 0;
 -	int mib[] = {CTL_KERN, KERN_CPTIME};
 - 	glong cp_time[CPUSTATES];
 - 	gsize size = sizeof( cp_time );
 +#if defined(__DragonFly__)
 +	int mib[2];
 +	struct kinfo_cputime percpu;
 +	size_t size = sizeof(percpu);
 +	uint64_t cp_time[CPUSTATES];
++
 +	if (sysctlbyname("kern.cputime", &percpu, &size, NULL, 0) < 0)
 @@ -304,27 +312,27 @@ Attempt to bring netbsd, DragonFly while
 +	int mib[] = {CTL_KERN, KERN_CP_TIME};
 +#else
 +        int mib[] = {CTL_KERN, KERN_CPTIME};
 +#endif
 +	glong cp_time[CPUSTATES];
 +	gsize size = sizeof( cp_time );
  	if (sysctl(mib, 2, &cp_time, &size, NULL, 0) < 0)
  		errx(1,"failed to get kern.cptime");
+-
 +#endif
  	old_user = cur_user;
  	old_system = cur_system;
  	old_total = cur_total;
-@@ -217,65 +249,72 @@ gboolean get_cpu_usage (gushort *cpu_cou
+@@ -217,65 +250,72 @@ gboolean get_cpu_usage (gushort *cpu_cou
  		errx(1,"failed to get cpu count");
  	return TRUE;
+ }
+-
  /* vmtotal values in #pg */
  #define pagetok(nb) ((nb) * (getpagesize()))
  gboolean get_memory_usage (guint64 *memory_total, guint64 *memory_free, guint64 *memory_cache, guint64 *memory_buffers, guint64 *swap_total, guint64 *swap_free)
+ {
  #ifdef __OpenBSD__
 -	int mib[] = {CTL_VM, VM_UVMEXP};
 -	struct uvmexp  uvmexp;
 +        int mib[] = {CTL_VM, VM_UVMEXP};

 @@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2015/11/04 01:32:41 agc Exp $
+$NetBSD: distinfo,v 1.3 2016/01/28 12:47:00 martin Exp $
 SHA1 (xfce4-taskmanager-1.1.0.tar.bz2) = 4a45d19169fab4270250633a46cfb5be536c3cd7
 RMD160 (xfce4-taskmanager-1.1.0.tar.bz2) = 4c22f73fbafa40674281a4719ac71de1a591d210
 SHA512 (xfce4-taskmanager-1.1.0.tar.bz2) = a7b1d1a6836f89747c873c87e495830438cf3093fd044c43c951abca6a82ab2c0ae9a41eba89d570a83f41fb6ad447c9c4fc578930684c981fbe45de19e1d7f8
 Size (xfce4-taskmanager-1.1.0.tar.bz2) = 365866 bytes
-SHA1 (patch-src_task-manager-bsd.c) = 0b93dccd43d56b36da951710e39c0da426933b19
+SHA1 (patch-src_task-manager-bsd.c) = 5cc8bb3c949512c543eaf461fb78af573b639de9