On 2014/09/06 16:15, Mark Kettenis wrote:
> > Date: Sat, 6 Sep 2014 10:04:08 +0000
> > From: Miod Vallat <m...@online.fr>
> >
> > <sys/dkstat.h> has not contained disk statistics since 17 years. The
> > remaining defines from this file can already be found in <sys/sched.h>,
> > and the variable declarations would better be in <sys/tty.h>.
> >
> > The following diff thus gets rid of this file and adjusts userland to
> > use <sys/sched.h> when applicable.
>
> In principle ok kettenis@, but there might be some ports that attempt
> to include <sys/dkstat.h>.
Yes, there are a few instances - some of them are behind autoconf checks
or #ifdef FreeBSD though there will be some fallout. libgtop2 and the
kde ports probably want fixing before commit, the others are probably
going to cause few enough problems to pick up afterwards.
$ ag sys/dkstat.h
lcdproc-0.5.5/lcdproc-0.5.5/configure.in
174:AC_CHECK_HEADERS(limits.h kvm.h sys/param.h sys/dkstat.h)
lcdproc-0.5.5/lcdproc-0.5.5/config.h.in
212:/* Define to 1 if you have the <sys/dkstat.h> header file. */
lcdproc-0.5.5/lcdproc-0.5.5/configure
5762:for ac_header in limits.h kvm.h sys/param.h sys/dkstat.h
lcdproc-0.5.5/lcdproc-0.5.5/clients/lcdproc/machine_OpenBSD.c
47:#include <sys/dkstat.h>
lcdproc-0.5.5/lcdproc-0.5.5/clients/lcdproc/machine_FreeBSD.c
46:#include <sys/dkstat.h>
lcdproc-0.5.5/lcdproc-0.5.5/clients/lcdproc/machine_NetBSD.c
53:#include <sys/dkstat.h>
lcdproc-0.5.5/lcdproc-0.5.5/clients/lcdproc/machine_Darwin.c
47:#include <sys/dkstat.h>
bwm-ng-0.6/bwm-ng-0.6/configure.in
402: AC_CHECK_HEADERS([sys/dkstat.h],[
417: ],,[#include <sys/dkstat.h>])
421:AC_CHECK_HEADERS([sys/dkstat.h],[
436: ],,[#include <sys/dkstat.h>])
bwm-ng-0.6/bwm-ng-0.6/config.h.in
139:/* Define to 1 if you have the <sys/dkstat.h> header file. */
bwm-ng-0.6/bwm-ng-0.6/configure
10030:for ac_header in sys/dkstat.h
10185:#include <sys/dkstat.h>
10390:for ac_header in sys/dkstat.h
10545:#include <sys/dkstat.h>
bwm-ng-0.6/bwm-ng-0.6/src/input/devstat.h
31:#include <sys/dkstat.h>
ede-2.0/ede-2.0/ede-panel/applets/cpu-monitor/CpuMonitor.cpp
37:# include <sys/dkstat.h>
libgtop2-2.30.0/libgtop-2.30.0/sysdeps/freebsd/glibtop_machine.h
29:#include <sys/dkstat.h>
libgtop2-2.30.0/libgtop-2.30.0/sysdeps/openbsd/glibtop_machine.h
28:#include <sys/dkstat.h>
libgtop2-2.30.0/libgtop-2.30.0/sysdeps/bsd/glibtop_machine.h
28:#include <sys/dkstat.h>
bubblemon-dockapp-1.46/bubblemon-dockapp-1.46/sys_freebsd.c
23:#include <sys/dkstat.h>
bubblemon-dockapp-1.46/bubblemon-dockapp-1.46/sys_openbsd.c
22:#include <sys/dkstat.h>
bubblemon-dockapp-1.46/bubblemon-dockapp-1.46/sys_netbsd.c
22:#include <sys/dkstat.h>
collectd-4.10.2/collectd-4.10.2/src/config.h.in
1082:/* Define to 1 if you have the <sys/dkstat.h> header file. */
collectd-4.10.2/collectd-4.10.2/src/swap.c
52:# include <sys/dkstat.h>
collectd-4.10.2/collectd-4.10.2/src/cpu.c
65:# include <sys/dkstat.h>
collectd-4.10.2/collectd-4.10.2/configure.in
262:AC_CHECK_HEADERS(sys/dkstat.h)
collectd-4.10.2/collectd-4.10.2/configure
14622:for ac_header in sys/dkstat.h
14624: ac_fn_c_check_header_mongrel "$LINENO" "sys/dkstat.h"
"ac_cv_header_sys_dkstat_h" "$ac_includes_default"
conky-1.9.0/conky-1.9.0/src/openbsd.c
31:#include <sys/dkstat.h>
conky-1.9.0/conky-1.9.0/src/freebsd.c
31:#include <sys/dkstat.h>
conky-1.9.0-audacious/conky-1.9.0/src/openbsd.c
31:#include <sys/dkstat.h>
conky-1.9.0-audacious/conky-1.9.0/src/freebsd.c
31:#include <sys/dkstat.h>
conky-1.9.0-audacious-xmms2/conky-1.9.0/src/openbsd.c
31:#include <sys/dkstat.h>
conky-1.9.0-audacious-xmms2/conky-1.9.0/src/freebsd.c
31:#include <sys/dkstat.h>
conky-1.9.0-no_x11/conky-1.9.0/src/openbsd.c
31:#include <sys/dkstat.h>
conky-1.9.0-no_x11/conky-1.9.0/src/freebsd.c
31:#include <sys/dkstat.h>
conky-1.9.0-xmms2/conky-1.9.0/src/openbsd.c
31:#include <sys/dkstat.h>
conky-1.9.0-xmms2/conky-1.9.0/src/freebsd.c
31:#include <sys/dkstat.h>
gkrellm-2.3.5/gkrellm-2.3.5/src/sysdeps/openbsd.c
65:#include <sys/dkstat.h>
360:#include <sys/dkstat.h>
gkrellm-2.3.5/gkrellm-2.3.5/src/sysdeps/netbsd.c
665:#include <sys/dkstat.h>
gkrellm-2.3.5/gkrellm-2.3.5/src/sysdeps/freebsd.c
101:#include <sys/dkstat.h>
hot-babe-0.2.2/hot-babe-0.2.2/hot-babe.c
28:#include <sys/dkstat.h>
libstatgrab-0.17/libstatgrab-0.17/src/libstatgrab/cpu_stats.c
40:#include <sys/dkstat.h>
51:#include <sys/dkstat.h>
libstatgrab-0.17/libstatgrab-0.17/src/libstatgrab/disk_stats.c
67:#include <sys/dkstat.h>
monit-5.8/monit-5.8/src/config.h.in
262:/* Define to 1 if you have the <sys/dkstat.h> header file. */
monit-5.8/monit-5.8/src/process/sysdep_NETBSD.c
61:#include <sys/dkstat.h>
monit-5.8/monit-5.8/src/process/sysdep_OPENBSD.c
61:#include <sys/dkstat.h>
monit-5.8/monit-5.8/src/process/sysdep_FREEBSD.c
69:#include <sys/dkstat.h>
monit-5.8/monit-5.8/configure.ac
158: sys/dkstat.h \
monit-5.8/monit-5.8/configure
12236: sys/dkstat.h \
symon-2.86/symon/CHANGELOG
220: - FreeBSD/platform.h now also includes sys/socket.h and sys/dkstat.h,
symon-2.86/symon/platform/FreeBSD/platform.h
8:#include <sys/dkstat.h>
symon-2.86/symon/platform/FreeBSD/sm_cpu.c
45:#include <sys/dkstat.h>
symon-2.86/symon/platform/FreeBSD/sm_io.c
50:#include <sys/dkstat.h>
symon-2.86/symon/platform/NetBSD/sm_cpu.c
42:#include <sys/dkstat.h>
symon-2.86/symon/platform/OpenBSD/platform.h
6:#include <sys/dkstat.h>
symon-2.86/symon/platform/OpenBSD/sm_cpu.c
42:#include <sys/dkstat.h>
toprump-0.14.8/toprump-0.14.8/machine.c
43:#include <sys/dkstat.h>
net-snmp-5.7.2.1/net-snmp-5.7.2.1/agent/mibgroup/hardware/cpu/cpu_sysctl.c
18:#include <sys/dkstat.h>
net-snmp-5.7.2.1/net-snmp-5.7.2.1/agent/mibgroup/hardware/cpu/cpu_nlist.c
17:#include <sys/dkstat.h>
net-snmp-5.7.2.1/net-snmp-5.7.2.1/agent/mibgroup/ucd-snmp/vmstat_freebsd2.c
22:#include <sys/dkstat.h>
net-snmp-5.7.2.1/net-snmp-5.7.2.1/agent/mibgroup/ucd-snmp/vmstat_netbsd1.c
13:#include <sys/dkstat.h>
net-snmp-5.7.2.1/net-snmp-5.7.2.1/agent/mibgroup/ucd-snmp/memory_netbsd1.c
13:#include <sys/dkstat.h>
net-snmp-5.7.2.1/net-snmp-5.7.2.1/agent/mibgroup/ucd-snmp/memory_darwin7.c
14:#include <sys/dkstat.h>
net-snmp-5.7.2.1/net-snmp-5.7.2.1/agent/mibgroup/ucd-snmp/memory_freebsd2.c
17:#include <sys/dkstat.h>
net-snmp-5.7.2.1/net-snmp-5.7.2.1/agent/mibgroup/ucd-snmp/vmstat_darwin7.c
13:#include <sys/dkstat.h>
net-snmp-5.7.2.1/net-snmp-5.7.2.1/agent/mibgroup/ucd-snmp/diskio.c
78:#include <sys/dkstat.h>
net-snmp-5.7.2.1/net-snmp-5.7.2.1/agent/mibgroup/ucd-snmp/vmstat_bsdi4.c
13:#include <sys/dkstat.h>
net-snmp-5.7.2.1/net-snmp-5.7.2.1/ChangeLog
94562: apply patch 979436 to make sys/dkstat.h obsolete when building recent
FreeBSD5
net-snmp-5.7.2.1/net-snmp-5.7.2.1/configure.d/config_os_headers
151: [sys/dkstat.h sys/conf.h sys/mbuf.h ] dnl
net-snmp-5.7.2.1/net-snmp-5.7.2.1/include/net-snmp/net-snmp-config.h.in
1027:/* Define to 1 if you have the <sys/dkstat.h> header file. */
net-snmp-5.7.2.1/net-snmp-5.7.2.1/configure
16465:for ac_header in malloc.h osreldate.h
machine/types.h net/if_dl.h net/if_types.h
sys/dkstat.h sys/conf.h sys/mbuf.h sys/mount.h
sys/proc.h sys/queue.h sys/sysctl.h sys/user.h
wmcube-0.98/wmcube/wmcube/wmcube.c
1226:#include <sys/dkstat.h>
zabbix-2.2.3-no_server/zabbix-2.2.3/configure
4509: sys/var.h arpa/nameser.h assert.h sys/dkstat.h sys/disk.h \
4647:# include <sys/dkstat.h>
6732:#include <sys/dkstat.h>
zabbix-2.2.3-no_server/zabbix-2.2.3/configure.ac
59: sys/var.h arpa/nameser.h assert.h sys/dkstat.h sys/disk.h \
121:# include <sys/dkstat.h>
656:#include <sys/dkstat.h>
zabbix-2.2.3-no_server/zabbix-2.2.3/include/sysinc.h
145:# include <sys/dkstat.h>
zabbix-2.2.3-no_server/zabbix-2.2.3/include/config.h.in
348:/* Define to 1 if you have the <sys/dkstat.h> header file. */
zabbix-2.2.3-mysql/zabbix-2.2.3/configure
4509: sys/var.h arpa/nameser.h assert.h sys/dkstat.h sys/disk.h \
4647:# include <sys/dkstat.h>
6732:#include <sys/dkstat.h>
zabbix-2.2.3-mysql/zabbix-2.2.3/configure.ac
59: sys/var.h arpa/nameser.h assert.h sys/dkstat.h sys/disk.h \
121:# include <sys/dkstat.h>
656:#include <sys/dkstat.h>
zabbix-2.2.3-mysql/zabbix-2.2.3/include/sysinc.h
145:# include <sys/dkstat.h>
zabbix-2.2.3-mysql/zabbix-2.2.3/include/config.h.in
348:/* Define to 1 if you have the <sys/dkstat.h> header file. */
zabbix-2.2.3-pgsql/zabbix-2.2.3/configure
4509: sys/var.h arpa/nameser.h assert.h sys/dkstat.h sys/disk.h \
4647:# include <sys/dkstat.h>
6732:#include <sys/dkstat.h>
zabbix-2.2.3-pgsql/zabbix-2.2.3/configure.ac
59: sys/var.h arpa/nameser.h assert.h sys/dkstat.h sys/disk.h \
121:# include <sys/dkstat.h>
656:#include <sys/dkstat.h>
zabbix-2.2.3-pgsql/zabbix-2.2.3/include/sysinc.h
145:# include <sys/dkstat.h>
zabbix-2.2.3-pgsql/zabbix-2.2.3/include/config.h.in
348:/* Define to 1 if you have the <sys/dkstat.h> header file. */
zabbix-2.2.3-sqlite3/zabbix-2.2.3/configure
4509: sys/var.h arpa/nameser.h assert.h sys/dkstat.h sys/disk.h \
4647:# include <sys/dkstat.h>
6732:#include <sys/dkstat.h>
zabbix-2.2.3-sqlite3/zabbix-2.2.3/configure.ac
59: sys/var.h arpa/nameser.h assert.h sys/dkstat.h sys/disk.h \
121:# include <sys/dkstat.h>
656:#include <sys/dkstat.h>
zabbix-2.2.3-sqlite3/zabbix-2.2.3/include/sysinc.h
145:# include <sys/dkstat.h>
zabbix-2.2.3-sqlite3/zabbix-2.2.3/include/config.h.in
348:/* Define to 1 if you have the <sys/dkstat.h> header file. */
plan9port-20140306/plan9port/src/cmd/auxstats/Darwin.c
7:#include <sys/dkstat.h>
plan9port-20140306/plan9port/src/cmd/auxstats/FreeBSD.c
9:#include <sys/dkstat.h>
plan9port-20140306/plan9port/src/cmd/auxstats/OpenBSD.c
9:#include <sys/dkstat.h>
i3status-2.8/i3status-2.8/src/print_cpu_usage.c
13:#include <sys/dkstat.h>
icewm-1.3.8/icewm-1.3.8/src/config.h
219:/* Define to 1 if you have the <sys/dkstat.h> header file. */
icewm-1.3.8/icewm-1.3.8/src/config.h.in
218:/* Define to 1 if you have the <sys/dkstat.h> header file. */
icewm-1.3.8/icewm-1.3.8/src/acpustatus.cc
51:#include <sys/dkstat.h>
icewm-1.3.8/icewm-1.3.8/configure.in
111:AC_CHECK_HEADERS(sched.h sys/dkstat.h sys/param.h sys/sysctl.h
uvm/uvm_param.h)
kdebase-3.5.10/kdebase-3.5.10/ksysguard/ksysguardd/OpenBSD/cpu.c
23:#include <sys/dkstat.h>
kdebase-3.5.10/kdebase-3.5.10/ksysguard/ksysguardd/OpenBSD/memory.c
25:#include <sys/dkstat.h>
kdebase-3.5.10/kdebase-3.5.10/ksysguard/ksysguardd/NetBSD/CPU.c
22:#include <sys/dkstat.h>
kdebase-3.5.10/kdebase-3.5.10/ksysguard/ksysguardd/FreeBSD/CPU.c
29: #include <sys/dkstat.h>
kdebase-3.5.10/kdebase-3.5.10/kicker/applets/naughty/NaughtyProcessMonitor.cpp
28:#include <sys/dkstat.h>
kdeutils-3.5.10/kdeutils-3.5.10/ksim/monitors/cpu/ksimcpu.cpp
55:#include <sys/dkstat.h>
60:#include <sys/dkstat.h>
kdeutils-3.5.10/kdeutils-3.5.10/ksim/monitors/disk/ksimdisk.cpp
53:#include <sys/dkstat.h>
kdeutils-3.5.10/kdeutils-3.5.10/superkaramba/src/cpusensor.cpp
15:#include <sys/dkstat.h>
kde-workspace-4.11.9/kde-workspace-4.11.9/ksysguard/ksysguardd/NetBSD/CPU.c
24:#include <sys/dkstat.h>
kde-workspace-4.11.9/kde-workspace-4.11.9/ksysguard/ksysguardd/OpenBSD/cpu.c
23:#include <sys/dkstat.h>
kde-workspace-4.11.9/kde-workspace-4.11.9/ksysguard/ksysguardd/OpenBSD/memory.c
25:#include <sys/dkstat.h>
superkaramba-4.11.5/superkaramba-4.11.5/src/sensors/cpu.cpp
18:#include <sys/dkstat.h>
xfce4-cpugraph-1.0.5/xfce4-cpugraph-plugin-1.0.5/panel-plugin/os.c
43:#include <sys/dkstat.h>
xfce4-systemload-1.1.1/xfce4-systemload-plugin-1.1.1/panel-plugin/cpu.c
105:#include <sys/dkstat.h>
216:#include <sys/dkstat.h>
