 @@ -1,53 +1,69 @@
-$NetBSD: patch-src_netbsd.c,v 1.4 2020/08/27 11:25:29 nia Exp $
+$NetBSD: patch-src_netbsd.c,v 1.5 2020/08/30 11:04:48 nia Exp $
 Many fixes and addons for conky to work on NetBSD.
 --- src/netbsd.c.orig	2012-05-03 21:08:27.000000000 +0000
 +++ src/netbsd.c
-@@ -30,337 +30,803 @@
+@@ -30,337 +30,815 @@
  #include "netbsd.h"
  #include "net_stat.h"
 +#include "top.h"
 +#include <sys/types.h>
 +#include <sys/statvfs.h>
 +#include <ifaddrs.h>
++
 -static kvm_t *kd = NULL;
 -int kd_init = 0, nkd_init = 0;
 -u_int32_t sensvalue;
 -char errbuf[_POSIX2_LINE_MAX];
 +#define P_BOOL		0
 +#define P_UINT8		1
 +#define P_INT64		2
 +#define P_STRING	3
++
--static int init_kvm(void)
++static char const *freq_sysctls[] = {
 +#if defined(__powerpc__)
 +	"machdep.intrepid.frequency.current",
 +#endif
 +#if defined(__mips__)
 +	"machdep.loongson.frequency.current",
 +#endif
 +#if defined(__i386__) || defined(__x86_64__)
 +	"machdep.est.frequency.current",
 +	"machdep.powernow.frequency.current",
 +#endif
 +	"machdep.cpu.frequency.current",
 +	"machdep.frequency.current",
 +	NULL
 +};
++
 +typedef struct Devquery {
 +	int			type;
 +	char		*dev;
 +	char		*key;
 +	char		*row;
 +} Devquery;
++
 +u_int32_t		sensvalue;
 +char			errbuf[_POSIX2_LINE_MAX];
 +static short	cpu_setup = 0;
++
 +int				sysmon_fd;
 -static kvm_t *kd = NULL;
 -int kd_init = 0, nkd_init = 0;
 -u_int32_t sensvalue;
 -char errbuf[_POSIX2_LINE_MAX];
 +static inline void proc_find_top(struct process **cpu, struct process **mem);
 -static int init_kvm(void)
 +int8_t envsys_get_val(Devquery, void *);
++
 +void
 +prepare_update(void)
+ {
 -	if (kd_init) {
 -		return 0;
 -	}
 +}
 -	kd = kvm_openfiles(NULL, NULL, NULL, KVM_NO_FILES, errbuf);
 -	if (kd == NULL) {
 -		warnx("cannot kvm_openfiles: %s", errbuf);
 @@ -136,41 +152,41 @@ Many fixes and addons for conky to work
 +	info.mem = info.memmax - info.memfree;
 +	info.bufmem = info.cached + info.buffers;
 +	info.swap = info.swapmax - info.swapfree;
++
 +	/*
 +	 * Counter-adjust for the adjustment in update_stuff in common.c so
 +	 * that memeasyfree is the inactive memory.  Since inactive memory
 +	 * partially overlaps with buffer memory, but the size of the
 +	 * overlap is not measured, attempting to split it into non-bufmem
 +	 * and bufmem parts, as common.c does, can't work.  So instead we
 +	 * report inactive memory as memeasyfree.
 +	 */
 +	info.memeasyfree -= info.bufmem;
 -	if (sep == NULL) {
 -		warn("memory allocation failed");
 +	return 0;
 +}
++
 +int
 +update_net_stats(void)
 +{
 +	struct net_stat *ns;
 +	double delta;
 +	long long r, t, last_recv, last_trans;
 +	struct ifaddrs *ifap, *ifa;
 +	struct if_data *ifd;
++
 -	if (sep == NULL) {
 -		warn("memory allocation failed");
 +	/* get delta */
 +	delta = current_update_time - last_update_time;
 +	if (delta <= 0.0001) {
  		return 0;
+ 	}
 -	if (swapctl(SWAP_STATS, (void *) sep, n) < n) {
 -		warn("could not get swap stats");
 +	if (getifaddrs(&ifap) < 0) {
  		return 0;
+ 	}
 -	for (; n > 0; n--) {
 -		*retavail += (int) dbtob(sep[n - 1].se_nblks);
 @@ -424,27 +440,28 @@ Many fixes and addons for conky to work
 -		last_trans = ns->trans;
+-
 -		if (ifnet.if_ibytes < ns->last_read_recv) {
 -			ns->recv += ((long long) 4294967295U - ns->last_read_recv) +
 -				ifnet.if_ibytes;
 -		} else {
 -			ns->recv += (ifnet.if_ibytes - ns->last_read_recv);
 -		}
 +	total = 0;
 +	for (j = 0; j < CPUSTATES; j++)
 +		total += cp_time[j];
++
 +	used = total - cp_time[CP_IDLE];
 -		ns->last_read_recv = ifnet.if_ibytes;
 +	if ((total - cpu[0].oldtotal) != 0) {
 +		info.cpu_usage[0] = ((double) (used - cpu[0].oldused)) /
 +		(double) (total - cpu[0].oldtotal);
 +	} else {
 +		info.cpu_usage[0] = 0;
 +	}
++
 +	cpu[0].oldused = used;
 +	cpu[0].oldtotal = total;
++
 +	free(cp_time);
++
 +	/* per-core stats */
 @@ -452,176 +469,185 @@ Many fixes and addons for conky to work
 +	cp_time = malloc(cp_len);
++
 +	/* on e.g. i386 SMP we may have more values than actual cpus; this will just drop extra values */
 +	if (sysctlbyname("kern.cp_time", cp_time, &cp_len, NULL, 0) < 0 && errno != ENOMEM) {
 +		fprintf(stderr, "Cannot get kern.cp_time SMP\n");
 +	}
++
 +	for (i = 0; i < info.cpu_count; i++)
 +	{
 +		total = 0;
 +		for (j = 0; j < CPUSTATES; j++)
 +			total += cp_time[i*CPUSTATES + j];
 -		ns->last_read_recv = ifnet.if_ibytes;
 +		used = total - cp_time[i*CPUSTATES + CP_IDLE];
 -		if (ifnet.if_obytes < ns->last_read_trans) {
 -			ns->trans += ((long long) 4294967295U - ns->last_read_trans) +
 -				ifnet.if_obytes;
 +		used = total - cp_time[i*CPUSTATES + CP_IDLE];
++
 +		if ((total - cpu[i+1].oldtotal) != 0) {
 +			info.cpu_usage[i+1] = ((double) (used - cpu[i+1].oldused)) /
 +			(double) (total - cpu[i+1].oldtotal);
  		} else {
 -			ns->trans += (ifnet.if_obytes - ns->last_read_trans);
 +			info.cpu_usage[i+1] = 0;
+ 		}
 -		ns->last_read_trans = ifnet.if_obytes;
 +		cpu[i+1].oldused = used;
 +		cpu[i+1].oldtotal = total;
 +	}
++
 +	free(cp_time);
 +	return 0;
 +}
 -		ns->recv += (ifnet.if_ibytes - ns->last_read_recv);
 -		ns->last_read_recv = ifnet.if_ibytes;
 -		ns->trans += (ifnet.if_obytes - ns->last_read_trans);
 -		ns->last_read_trans = ifnet.if_obytes;
 +int update_load_average(void)
 +{
 +	double v[3];
 +	getloadavg(v, 3);
 -		ns->recv_speed = (ns->recv - last_recv) / delta;
 -		ns->trans_speed = (ns->trans - last_trans) / delta;
 -	}
 +	getloadavg(v, 3);
++
 +	info.loadavg[0] = (float) v[0];
 +	info.loadavg[1] = (float) v[1];
 +	info.loadavg[2] = (float) v[2];
++
 +	return 0;
 +}
 -void update_total_processes()
 +int open_acpi_temperature(const char *name)
 +{
 -	/* It's easier to use kvm here than sysctl */
 +	(void)name; /* useless on NetBSD */
 +	return -1;
 +}
 -	int n_processes;
 +int get_entropy_avail(unsigned int *val)
 +{
 +	return 1;
 +}
 -	info.procs = 0;
 +int get_entropy_poolsize(unsigned int *val)
 +{
 +	return 1;
 +}
-+/* void */
+-	if (init_kvm() < 0) {
 -		return;
 +char
 +get_freq(char *p_client_buffer, size_t client_buffer_size,
-+	const char *p_format, int divisor, unsigned int cpu)
++		const char *p_format, int divisor, unsigned int cpu) {
-+{
++	const char **s;
-+	int freq = cpu;
++	char name[64];
 +	int freq = 0;
-+	if (!p_client_buffer || client_buffer_size <= 0 || !p_format
++	size_t freq_size = sizeof(freq);
 +		|| divisor <= 0) {
-+		return 0;
++	snprintf(name, sizeof(name), "machdep.cpufreq.cpu%u.current", cpu - 1);
 +	if (sysctlbyname(name, &freq, &freq_size, NULL, 0) == -1) {
 +		for (s = freq_sysctls; *s != NULL; ++s) {
-+	size_t size = sizeof(freq);
++			if (sysctlbyname(*s, &freq, &freq_size, NULL, 0) != -1)
 +				break;
-+	if (sysctlbyname("machdep.est.frequency.current",
++		}
-+			NULL, &size, NULL, 0) == 0) {
++	}
-+		sysctlbyname("machdep.est.frequency.current", &freq, &size, NULL, 0);
++	if (freq > 0) {
 +		snprintf(p_client_buffer, client_buffer_size, p_format,
 +			(float) freq / divisor);
 +	} else if (sysctlbyname("machdep.tsc_freq", NULL, &size, NULL, 0) == 0) {
 +		sysctlbyname("machdep.tsc_freq", &freq, &size, NULL, 0);
 +		snprintf(p_client_buffer, client_buffer_size, p_format,
-+			(float) freq / (1000000 * divisor));
++			 (float)freq / divisor);
-+	} else
+ 	} else {
 -		kvm_getproc2(kd, KERN_PROC_ALL, 0, sizeof(struct kinfo_proc2),
 -			&n_processes);
 +		snprintf(p_client_buffer, client_buffer_size, p_format, 0.0f);
+ 	}
 +	return 1;
 +}
--void update_total_processes()
+-	info.procs = n_processes;
++
 +void update_diskio()
 +{
 -	/* It's easier to use kvm here than sysctl */
 +	return; /* XXX: implement? hifi: not sure how */
 +}
--	int n_processes;
+-void update_running_processes()
 +int update_top()
 +{
 -	struct kinfo_proc2 *p;
 -	int n_processes;
 -	int i, cnt = 0;
 +	proc_find_top(info.cpu, info.memu);
--	info.procs = 0;
+-	info.run_procs = 0;
 +	return 0;
 +}
 -	if (init_kvm() < 0) {
 -		return;
 -	} else {
--		kvm_getproc2(kd, KERN_PROC_ALL, 0, sizeof(struct kinfo_proc2),
+-		p = kvm_getproc2(kd, KERN_PROC_ALL, 0, sizeof(struct kinfo_proc2),
 -			&n_processes);
 -		for (i = 0; i < n_processes; i++) {
 -			if (p[i].p_stat == LSRUN || p[i].p_stat == LSIDL
 -					|| p[i].p_stat == LSONPROC) {
 -				cnt++;
 -			}
 -		}
 +int comparecpu(const void *a, const void *b)
 +{
 +	if (((struct process *) a)->amount > ((struct process *) b)->amount) {
 +		return -1;
 +	}
 +	if (((struct process *) a)->amount < ((struct process *) b)->amount) {
 +		return 1;
+ 	}
--	info.procs = n_processes;
+-	info.run_procs = cnt;
 +	return 0;
+ }
--void update_running_processes()
+-struct cpu_load_struct {
 -	unsigned long load[5];
 -};
 +int comparemem(const void *a, const void *b)
 +{
 -	struct kinfo_proc2 *p;
 -	int n_processes;
 -	int i, cnt = 0;
 +    if (((struct process *) a)->rss > ((struct process *) b)->rss) {
 +		return -1;
 +	}
--	info.run_procs = 0;
+-struct cpu_load_struct fresh = {
 -	{0, 0, 0, 0, 0}
 -};
 +	if (((struct process *) a)->rss < ((struct process *) b)->rss) {
 +		return 1;
 +	}
--	if (init_kvm() < 0) {
+-long cpu_used, oldtotal, oldused;
 -		return;
 -	} else {
 -		p = kvm_getproc2(kd, KERN_PROC_ALL, 0, sizeof(struct kinfo_proc2),
 -			&n_processes);
 -		for (i = 0; i < n_processes; i++) {
 -			if (p[i].p_stat == LSRUN || p[i].p_stat == LSIDL
 -					|| p[i].p_stat == LSONPROC) {
 -				cnt++;
 +	return 0;
 +}
 -void update_cpu_usage()
 +inline void proc_find_top(struct process **cpu, struct process **mem)
 +{
 -	long used, total;
 -	static u_int64_t cp_time[CPUSTATES];
 -	size_t len = sizeof(cp_time);
 +        struct kinfo_proc2 *p;
 +        int n_processes;
 +        int i, j = 0;
 +        struct process *processes;
 +        int mib[2];
++
 +        u_int total_pages;
 +        int64_t usermem;
 +        int pagesize = getpagesize();
++
 +        /* we get total pages count again to be sure it is up to date */
 +        mib[0] = CTL_HW;
 +        mib[1] = HW_USERMEM64;
 @@ -637,130 +663,116 @@ Many fixes and addons for conky to work
 +        int max_size = sizeof(struct kinfo_proc2);
++
 +        p = kvm_getproc2(kd, KERN_PROC_ALL, 0, max_size, &n_processes);
 +        processes = malloc(n_processes * sizeof(struct process));
++
 +        for (i = 0; i < n_processes; i++) {
 +			if (!((p[i].p_flag & P_SYSTEM)) && p[i].p_comm != NULL) {
 +				processes[j].pid = p[i].p_pid;
 +				processes[j].name = strndup(p[i].p_comm, text_buffer_size);
 +				processes[j].amount = 100.0 * p[i].p_pctcpu / FSCALE;
 +				processes[j].rss = p[i].p_vm_rssize * pagesize;
 +				processes[j].vsize = p[i].p_vm_vsize;
 +				j++;
 +			}
 -		}
 -	}
 +        }
--	info.run_procs = cnt;
+-	info.cpu_usage = 0;
 +        qsort(processes, j - 1, sizeof(struct process), comparemem);
 +        for (i = 0; i < 10; i++) {
 +			struct process *tmp, *ttmp;
++
 +			tmp = malloc(sizeof(struct process));
 +			memcpy(tmp, &processes[i], sizeof(struct process));
 +			tmp->name = strndup(processes[i].name, text_buffer_size);
++
 +			ttmp = mem[i];
 +			mem[i] = tmp;
 +			if (ttmp != NULL) {
 +				free(ttmp->name);
 +				free(ttmp);
 +			}
 +        }
 -	if (sysctlbyname("kern.cp_time", &cp_time, &len, NULL, 0) < 0) {
 -		warn("cannot get kern.cp_time");
 -	}
 +        qsort(processes, j - 1, sizeof(struct process), comparecpu);
 +        for (i = 0; i < 10; i++) {
 +			struct process *tmp, *ttmp;
++
 +			tmp = malloc(sizeof(struct process));
 +			memcpy(tmp, &processes[i], sizeof(struct process));
 +			tmp->name = strndup(processes[i].name, text_buffer_size);
++
 +			ttmp = cpu[i];
 +			cpu[i] = tmp;
 +			if (ttmp != NULL) {
 +				free(ttmp->name);
 +				free(ttmp);
 +			}
 +        }
++
 +        for (i = 0; i < j; i++) {
 +			free(processes[i].name);
 +        }
 +        free(processes);
 +}
++
 -struct cpu_load_struct {
 -	unsigned long load[5];
 -};
 +double
 +get_acpi_temperature(int fd)
 +{
 +	Devquery dq_tz = { P_INT64, "acpitz0", "temperature", "cur-value" };
 +	int64_t temp;
--struct cpu_load_struct fresh = {
+-	fresh.load[0] = cp_time[CP_USER];
--	{0, 0, 0, 0, 0}
+-	fresh.load[1] = cp_time[CP_NICE];
--};
+-	fresh.load[2] = cp_time[CP_SYS];
 -	fresh.load[3] = cp_time[CP_IDLE];
 -	fresh.load[4] = cp_time[CP_IDLE];
 +	(void)fd;
 -	used = fresh.load[0] + fresh.load[1] + fresh.load[2];
 -	total = fresh.load[0] + fresh.load[1] + fresh.load[2] + fresh.load[3];
 +	if (envsys_get_val(dq_tz, (void *)&temp) < 0)
 +		return 0.0;
--long cpu_used, oldtotal, oldused;
+-	if ((total - oldtotal) != 0) {
 -		info.cpu_usage = ((double) (used - oldused)) /
 -			(double) (total - oldtotal);
 -	} else {
 -		info.cpu_usage = 0;
 +	return (temp / 1000000.0) - 273.15;
 +}
++
 -void update_cpu_usage()
 +void
 +get_bat_life(char *bat, char *buf)
 +{
 -	long used, total;
 -	static u_int64_t cp_time[CPUSTATES];
 -	size_t len = sizeof(cp_time);
 +	char row[32];
 +	int64_t cur_charge, max_charge;
 +	Devquery dq_charge = { P_INT64, bat, "charge", NULL};
++
 -	info.cpu_usage = 0;
 +	strcpy(row, "max-value");
 +	dq_charge.row = &row[0];
++
 -	if (sysctlbyname("kern.cp_time", &cp_time, &len, NULL, 0) < 0) {
 -		warn("cannot get kern.cp_time");
 +	if (envsys_get_val(dq_charge, (void *)&max_charge) < 0) {
 +		/* did not get any information from envsys */
 +		strcpy(buf, "N/A");
 +		return;
 +	}
++
 -	fresh.load[0] = cp_time[CP_USER];
 -	fresh.load[1] = cp_time[CP_NICE];
 -	fresh.load[2] = cp_time[CP_SYS];
 -	fresh.load[3] = cp_time[CP_IDLE];
 -	fresh.load[4] = cp_time[CP_IDLE];
 +	strcpy(row, "cur-value");
 +	dq_charge.row = &row[0];
++
 -	used = fresh.load[0] + fresh.load[1] + fresh.load[2];
 -	total = fresh.load[0] + fresh.load[1] + fresh.load[2] + fresh.load[3];
 -	if ((total - oldtotal) != 0) {
 -		info.cpu_usage = ((double) (used - oldused)) /
 -			(double) (total - oldtotal);
 -	} else {
 -		info.cpu_usage = 0;
 +	if (envsys_get_val(dq_charge, (void *)&cur_charge) < 0) {
 +		/* did not get any information from envsys */
 +		strcpy(buf, "N/A");
 +		return;
+ 	}
 -	oldused = used;
 -	oldtotal = total;
 +	snprintf(buf, 8, "%d%%", (int)(((float) cur_charge / max_charge) * 100));
+ }
 -void update_load_average()
 +int

 @@ -1,18 +1,18 @@
-# $NetBSD: Makefile,v 1.50 2020/08/27 11:25:29 nia Exp $
+# $NetBSD: Makefile,v 1.51 2020/08/30 11:04:48 nia Exp $
+#
 DISTNAME=	conky-1.9.0
-PKGREVISION=	43
+PKGREVISION=	44
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=conky/}
 EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	imil@NetBSD.org
 HOMEPAGE=	http://conky.sourceforge.net/
 COMMENT=	Free, light-weight system monitor for X
 LICENSE=	gnu-gpl-v3
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config aclocal autoconf autoheader automake

 @@ -1,17 +1,17 @@
-$NetBSD: distinfo,v 1.8 2020/08/27 11:25:29 nia Exp $
+$NetBSD: distinfo,v 1.9 2020/08/30 11:04:48 nia Exp $
 SHA1 (conky-1.9.0.tar.bz2) = 2069cbdb8e7224fcbf3c6b1ddebf64a51634b4cc
 RMD160 (conky-1.9.0.tar.bz2) = 2df0e60d4236ed667bdae876e11ba28d05914e25
 SHA512 (conky-1.9.0.tar.bz2) = 98c9f69fd8bee2062e3eddeb7a394cce932199ffd6c8664006d1222f0453569406613e63637848c77a455f7dae3f16be3079a2cab56ecafea51ec043de23c889
 Size (conky-1.9.0.tar.bz2) = 626555 bytes
 SHA1 (patch-configure.ac) = fab28e82ad01b2c346552af7537865e049098f2c
 SHA1 (patch-data_Makefile.am) = af8df32076b8a389ee98e2550342dbb343f7bff3
 SHA1 (patch-src_Makefile.am) = f4e79c0f08a0886a061449b9a8a578173cda90db
 SHA1 (patch-src_config.h.in) = 31aa9cd4bd4ab775e6da633f86415ee8f5383538
 SHA1 (patch-src_conky.c) = e4c9173661cca437af0febbcae94eec72dc0ea4a
 SHA1 (patch-src_core.c) = a64ff7cb05d7b6b62aea41e486c0a719e2c93faf
 SHA1 (patch-src_fs.c) = 104fd3788f319689026702d6a149410184072e24
-SHA1 (patch-src_netbsd.c) = 3cacc27e8ae6e20fe70385b764928767dab289d7
+SHA1 (patch-src_netbsd.c) = d9a23952c51eaa711b14c36f2b354972cd0b89bc
 SHA1 (patch-src_netbsd.h) = dee5c466ab5cc267f1da94848b0a8b598303dfe4
 SHA1 (patch-src_read__tcp.c) = 32fca1b7fdfdb2568b056705c7129807e281b0cc
 SHA1 (patch-src_text__object.h) = 7f7e3684e21f9618a8ede37525f4a48f47a92050