oxmc/libgtop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge a bunch of trivial OpenBSD patchs. To *BSD maintainers : please

Browse Source 
* mem.c: (glibtop_get_mem_p):
	* ppp.c:
	* swap.c: (glibtop_init_swap_p), (glibtop_get_swap_p):
	* uptime.c: (glibtop_get_uptime_p): Merge a bunch of trivial OpenBSD
	patchs. To *BSD maintainers : please report bugs ! don't be selfish, share
	your patchs.
This commit is contained in:
Benoît Dejean
2004-08-28 20:55:37 +00:00
parent 28a5db91d2
commit 60c8aae6d9
5 changed files with 29 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sysdeps/freebsd/ChangeLog
View File

@@ -1,3 +1,12 @@
2004-08-28 Benoît Dejean <tazforever@dlfp.org>
* mem.c: (glibtop_get_mem_p):
* ppp.c:
* swap.c: (glibtop_init_swap_p), (glibtop_get_swap_p):
* uptime.c: (glibtop_get_uptime_p): Merge a bunch of trivial OpenBSD
patchs. To *BSD maintainers : please report bugs ! don't be selfish, share
your patchs.
2004-08-22 Benoît Dejean <tazforever@dlfp.org>
* procstate.c:

16
sysdeps/freebsd/mem.c
View File

@@ -33,7 +33,7 @@
#include <vm/vm_param.h>
#endif
#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)
#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) || defined(__OpenBSD__)
#include <uvm/uvm_extern.h>
#endif
@@ -59,7 +59,7 @@ static int pageshift; /* log base 2 of the pagesize */
/* nlist structure for kernel access */
static struct nlist nlst [] = {
#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)
#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) || defined(__OpenBSD__)
{ "_bufpages" },
{ 0 }
#else
@@ -82,7 +82,7 @@ static int mib [] = { CTL_VM, VM_TOTAL };
static int mib [] = { CTL_VM, VM_METER };
#endif
#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)
#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) || defined(__OpenBSD__)
static int mib_uvmexp [] = { CTL_VM, VM_UVMEXP };
#endif
@@ -118,7 +118,7 @@ glibtop_get_mem_p (glibtop *server, glibtop_mem *buf)
{
struct vmtotal vmt;
size_t length_vmt;
#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)
#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) || defined(__OpenBSD__)
struct uvmexp uvmexp;
size_t length_uvmexp;
#else
@@ -147,7 +147,7 @@ glibtop_get_mem_p (glibtop *server, glibtop_mem *buf)
return;
}
#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)
#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) || defined(__OpenBSD__)
length_uvmexp = sizeof (uvmexp);
if (sysctl (mib_uvmexp, 2, &uvmexp, &length_uvmexp, NULL, 0)) {
glibtop_warn_io_r (server, "sysctl (uvmexp)");
@@ -173,7 +173,7 @@ glibtop_get_mem_p (glibtop *server, glibtop_mem *buf)
#if defined(__FreeBSD__)
v_total_count = vmm.v_page_count;
#else
#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)
#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) || defined(__OpenBSD__)
v_total_count = uvmexp.reserve_kernel +
uvmexp.reserve_pagedaemon +
uvmexp.free + uvmexp.wired + uvmexp.active +
@@ -185,7 +185,7 @@ glibtop_get_mem_p (glibtop *server, glibtop_mem *buf)
#endif
#endif
#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)
#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) || defined(__OpenBSD__)
v_used_count = uvmexp.active + uvmexp.inactive;
v_free_count = uvmexp.free;
#else
@@ -201,7 +201,7 @@ glibtop_get_mem_p (glibtop *server, glibtop_mem *buf)
buf->cached = (guint64) pagetok (vmm.v_cache_count) << LOG1024;
#endif
#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)
#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) || defined(__OpenBSD__)
buf->locked = (guint64) pagetok (uvmexp.wired) << LOG1024;
#else
buf->locked = (guint64) pagetok (vmm.v_wire_count) << LOG1024;

2
sysdeps/freebsd/ppp.c
View File

@@ -39,7 +39,7 @@
#include <net/netisr.h>
#include <net/route.h>
#if defined(__FreeBSD__) || defined(__NetBSD__)
#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
#include <net/if_sppp.h>
#else
#include <i4b/sppp/if_sppp.h>

20
sysdeps/freebsd/swap.c
View File

@@ -67,9 +67,9 @@ static struct nlist nlst [] = {
};
#endif
#elif defined(__NetBSD__)
#elif defined(__NetBSD__) || defined(__OpenBSD__)
#if (__NetBSD_Version__ >= 104000000)
#if (__NetBSD_Version__ >= 104000000) || defined(__OpenBSD__)
#include <uvm/uvm_extern.h>
#include <sys/swap.h>
#else
@@ -78,7 +78,7 @@ static struct nlist nlst [] = {
#endif
#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)
#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) || defined(__OpenBSD__)
static int mib_uvmexp [] = { CTL_VM, VM_UVMEXP };
#else
/* nlist structure for kernel access */
@@ -109,7 +109,7 @@ glibtop_init_swap_p (glibtop *server)
#endif
#endif
#if !(defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000))
#if !(defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)) && !defined(__OpenBSD__)
if (kvm_nlist (server->machine.kd, nlst2) < 0) {
glibtop_warn_io_r (server, "kvm_nlist (cnt)");
return;
@@ -149,14 +149,14 @@ glibtop_get_swap_p (glibtop *server, glibtop_swap *buf)
#elif defined(__bsdi__)
struct swapstats swap;
#elif defined(__NetBSD__)
#elif defined(__NetBSD__) || defined(__OpenBSD__)
struct swapent *swaplist;
#endif
int nswap, i;
int avail = 0, inuse = 0;
#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)
#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) || defined(__OpenBSD__)
struct uvmexp uvmexp;
size_t length_uvmexp;
#else
@@ -173,7 +173,7 @@ glibtop_get_swap_p (glibtop *server, glibtop_swap *buf)
if (server->sysdeps.swap == 0)
return;
#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)
#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) || defined(__OpenBSD__)
length_uvmexp = sizeof (uvmexp);
if (sysctl (mib_uvmexp, 2, &uvmexp, &length_uvmexp, NULL, 0)) {
glibtop_warn_io_r (server, "sysctl (uvmexp)");
@@ -197,7 +197,7 @@ glibtop_get_swap_p (glibtop *server, glibtop_swap *buf)
buf->pagein = vmm.v_swappgsin - swappgsin;
buf->pageout = vmm.v_swappgsout - swappgsout;
#else
#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)
#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) || defined(__OpenBSD__)
buf->pagein = uvmexp.swapins - swappgsin;
buf->pageout = uvmexp.swapouts - swappgsout;
#else
@@ -211,7 +211,7 @@ glibtop_get_swap_p (glibtop *server, glibtop_swap *buf)
swappgsin = vmm.v_swappgsin;
swappgsout = vmm.v_swappgsout;
#else
#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)
#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) || defined(__OpenBSD__)
swappgsin = uvmexp.swapins;
swappgsout = uvmexp.swapouts;
#else
@@ -391,7 +391,7 @@ glibtop_get_swap_p (glibtop *server, glibtop_swap *buf)
buf->total = swap.swap_total;
#elif defined(__NetBSD__)
#elif defined(__NetBSD__) || defined(__OpenBSD__)
nswap = swapctl (SWAP_NSWAP, NULL, 0);
if (nswap < 0) {

2
sysdeps/freebsd/uptime.c
View File

@@ -49,7 +49,7 @@ glibtop_init_uptime_p (glibtop *server)
void
glibtop_get_uptime_p (glibtop *server, glibtop_uptime *buf)
{
#ifdef __NetBSD__
#if defined(__NetBSD__) || defined(__OpenBSD__)
time_t now;
time_t uptime;
int mib[2];