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

Added initial port for BSD/OS (aka BSDI) 2.x and 3.x. 4.x should also(?)

Browse Source 
Thu Apr  8 23:47:29 1999  Timur Bakeyev  <timur@gnu.org>

 	* cpu.c, mem.c, netload.c, procargs.c, procstate.c, proctime.c,
 	sem_limits.c, shm_limits.c, swap.c: Added initial port for BSD/OS
	(aka BSDI) 2.x and 3.x. 4.x should also(?) work.

	Still, this port require more close look and extended check.
This commit is contained in:
Timur Bakeyev
1999-04-08 20:21:38 +00:00
committed by Timur I. Bakeyev
parent 5967e6c3e4
commit fac354623b
14 changed files with 113 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.cvsignore
View File

@@ -21,6 +21,7 @@ ltconfig
ltmain.sh ltmain.sh
macros macros
stamp-h stamp-h
stamp-h.in
sun4 sun4
sun4sol2 sun4sol2
support support

8
ChangeLog
View File

@@ -1,3 +1,11 @@
Thu Apr 8 23:47:29 1999 Timur Bakeyev <timur@gnu.org>
* cpu.c, mem.c, netload.c, procargs.c, procstate.c, proctime.c,
sem_limits.c, shm_limits.c, swap.c: Added initial port for BSD/OS
(aka BSDI) 2.x and 3.x. 4.x should also(?) work.
Still, this port require more close look and extended check.
1999-03-30 Martin Baulig <martin@home-of-linux.org> 1999-03-30 Martin Baulig <martin@home-of-linux.org>
Added some new features. Added some new features.

5
examples/ChangeLog
View File

@@ -1,3 +1,8 @@
Fri Apr 9 00:14:52 1999 Timur Bakeyev <timur@gnu.org>
* timings.c: Added timersub defenition, to make code compilable on
BSDI.
1999-03-24 Martin Baulig <martin@home-of-linux.org> 1999-03-24 Martin Baulig <martin@home-of-linux.org>
* timings.c: New example. * timings.c: New example.

21
examples/timings.c
View File

@@ -47,6 +47,27 @@
#define ELAPSED_UTIME ((unsigned long) elapsed_utime.tv_sec * 1000000 + (unsigned long) elapsed_utime.tv_usec) #define ELAPSED_UTIME ((unsigned long) elapsed_utime.tv_sec * 1000000 + (unsigned long) elapsed_utime.tv_usec)
#define ELAPSED_STIME ((unsigned long) elapsed_stime.tv_sec * 1000000 + (unsigned long) elapsed_stime.tv_usec) #define ELAPSED_STIME ((unsigned long) elapsed_stime.tv_sec * 1000000 + (unsigned long) elapsed_stime.tv_usec)
#if defined(__bsdi__)
#define timeradd(tvp, uvp, vvp) \
do { \
(vvp)->tv_sec = (tvp)->tv_sec + (uvp)->tv_sec; \
(vvp)->tv_usec = (tvp)->tv_usec + (uvp)->tv_usec; \
if ((vvp)->tv_usec >= 1000000) { \
(vvp)->tv_sec++; \
(vvp)->tv_usec -= 1000000; \
} \
} while (0)
#define timersub(tvp, uvp, vvp) \
do { \
(vvp)->tv_sec = (tvp)->tv_sec - (uvp)->tv_sec; \
(vvp)->tv_usec = (tvp)->tv_usec - (uvp)->tv_usec; \
if ((vvp)->tv_usec < 0) { \
(vvp)->tv_sec--; \
(vvp)->tv_usec += 1000000; \
} \
} while (0)
#endif
int int
main (int argc, char *argv []) main (int argc, char *argv [])
{ {

1
stamp-h.in
View File

@@ -1 +0,0 @@
timestamp

4
sysdeps/freebsd/cpu.c
View File

@@ -34,7 +34,11 @@ static const unsigned long _glibtop_sysdeps_cpu =
/* nlist structure for kernel access */ /* nlist structure for kernel access */
static struct nlist nlst [] = { static struct nlist nlst [] = {
#ifdef __bsdi__
{ "_cpustats" },
#else
{ "_cp_time" }, { "_cp_time" },
#endif
{ 0 } { 0 }
}; };

24
sysdeps/freebsd/mem.c
View File

@@ -28,17 +28,13 @@
#include <glibtop_suid.h> #include <glibtop_suid.h>
#include <sys/sysctl.h> #include <sys/sysctl.h>
#ifndef __bsdi__
#include <sys/vmmeter.h> #include <sys/vmmeter.h>
#endif
#include <vm/vm_param.h> #include <vm/vm_param.h>
static const unsigned long _glibtop_sysdeps_mem = static const unsigned long _glibtop_sysdeps_mem =
(1 << GLIBTOP_MEM_TOTAL) + (1 << GLIBTOP_MEM_USED) + (1 << GLIBTOP_MEM_TOTAL) + (1 << GLIBTOP_MEM_USED) +
(1 << GLIBTOP_MEM_FREE) + (1 << GLIBTOP_MEM_FREE) +
#ifndef __bsdi__
(1 << GLIBTOP_MEM_SHARED) + (1 << GLIBTOP_MEM_SHARED) +
#endif
(1 << GLIBTOP_MEM_BUFFER) + (1 << GLIBTOP_MEM_BUFFER) +
#ifdef __FreeBSD__ #ifdef __FreeBSD__
(1 << GLIBTOP_MEM_CACHED) + (1 << GLIBTOP_MEM_CACHED) +
@@ -58,7 +54,9 @@ static int pageshift; /* log base 2 of the pagesize */
/* nlist structure for kernel access */ /* nlist structure for kernel access */
static struct nlist nlst [] = { static struct nlist nlst [] = {
{ "_cnt" }, { "_cnt" },
#ifdef __FreeBSD__ #if defined(__bsdi__)
{ "_bufcachemem" },
#elif defined(__FreeBSD__)
{ "_bufspace" }, { "_bufspace" },
#else #else
{ "_bufpages" }, { "_bufpages" },
@@ -66,11 +64,13 @@ static struct nlist nlst [] = {
{ 0 } { 0 }
}; };
#ifndef __bsdi__
/* MIB array for sysctl */ /* MIB array for sysctl */
/* static int mib_length=2; */ static int mib_length=2;
#ifdef __bsdi__
static int mib [] = { CTL_VM, VM_TOTAL };
#else
static int mib [] = { CTL_VM, VM_METER }; static int mib [] = { CTL_VM, VM_METER };
#endif /* __bsdi__ */ #endif
/* Init function. */ /* Init function. */
@@ -102,10 +102,8 @@ glibtop_init_mem_p (glibtop *server)
void void
glibtop_get_mem_p (glibtop *server, glibtop_mem *buf) glibtop_get_mem_p (glibtop *server, glibtop_mem *buf)
{ {
#ifndef __bsdi__
struct vmtotal vmt; struct vmtotal vmt;
size_t length_vmt; size_t length_vmt;
#endif
struct vmmeter vmm; struct vmmeter vmm;
u_int v_used_count; u_int v_used_count;
u_int v_total_count; u_int v_total_count;
@@ -118,7 +116,6 @@ glibtop_get_mem_p (glibtop *server, glibtop_mem *buf)
if (server->sysdeps.mem == 0) if (server->sysdeps.mem == 0)
return; return;
#ifndef __bsdi__
/* [FIXME: On FreeBSD 2.2.6, sysctl () returns an incorrect /* [FIXME: On FreeBSD 2.2.6, sysctl () returns an incorrect
* value for `vmt.vm'. We use some code from Unix top * value for `vmt.vm'. We use some code from Unix top
* here.] */ * here.] */
@@ -129,7 +126,6 @@ glibtop_get_mem_p (glibtop *server, glibtop_mem *buf)
glibtop_warn_io_r (server, "sysctl"); glibtop_warn_io_r (server, "sysctl");
return; return;
} }
#endif
/* Get the data from kvm_* */ /* Get the data from kvm_* */
if (kvm_read (server->machine.kd, nlst[0].n_value, if (kvm_read (server->machine.kd, nlst[0].n_value,
@@ -146,7 +142,7 @@ glibtop_get_mem_p (glibtop *server, glibtop_mem *buf)
/* convert memory stats to Kbytes */ /* convert memory stats to Kbytes */
#ifdef __FreeBSD__ #if defined(__FreeBSD__)
v_total_count = vmm.v_page_count; v_total_count = vmm.v_page_count;
#else #else
v_total_count = vmm.v_kernel_pages + v_total_count = vmm.v_kernel_pages +
@@ -165,9 +161,7 @@ glibtop_get_mem_p (glibtop *server, glibtop_mem *buf)
#endif #endif
buf->locked = (u_int64_t) pagetok (vmm.v_wire_count) << LOG1024; buf->locked = (u_int64_t) pagetok (vmm.v_wire_count) << LOG1024;
#ifndef __bsdi__
buf->shared = (u_int64_t) pagetok (vmt.t_rmshr) << LOG1024; buf->shared = (u_int64_t) pagetok (vmt.t_rmshr) << LOG1024;
#endif
#if __FreeBSD__ #if __FreeBSD__
buf->buffer = (u_int64_t) bufspace; buf->buffer = (u_int64_t) bufspace;

14
sysdeps/freebsd/netload.c
View File

@@ -107,7 +107,7 @@ glibtop_get_netload_p (glibtop *server, glibtop_netload *buf,
sizeof (ifnet)) != sizeof (ifnet)) sizeof (ifnet)) != sizeof (ifnet))
glibtop_error_io_r (server, "kvm_read (ifnetaddr)"); glibtop_error_io_r (server, "kvm_read (ifnetaddr)");
#if (defined __FreeBSD__) || (defined __bsdi__) #if defined(__FreeBSD__) || defined(__bsdi__)
if (kvm_read (server->machine.kd, (u_long) ifnet.if_name, if (kvm_read (server->machine.kd, (u_long) ifnet.if_name,
tname, 16) != 16) tname, 16) != 16)
glibtop_error_io_r (server, "kvm_read (if_name)"); glibtop_error_io_r (server, "kvm_read (if_name)");
@@ -116,9 +116,9 @@ glibtop_get_netload_p (glibtop *server, glibtop_netload *buf,
tname [15] = 0; tname [15] = 0;
#endif #endif
#if (defined __FreeBSD__) && (__FreeBSD_version >= 300000) #if defined(__FreeBSD__) && (__FreeBSD_version >= 300000)
ifaddraddr = (u_long) ifnet.if_addrhead.tqh_first; ifaddraddr = (u_long) ifnet.if_addrhead.tqh_first;
#elif (defined __FreeBSD__) || (defined __bsdi__) #elif defined(__FreeBSD__) || defined(__bsdi__)
ifaddraddr = (u_long) ifnet.if_addrlist; ifaddraddr = (u_long) ifnet.if_addrlist;
#else #else
ifaddraddr = (u_long) ifnet.if_addrlist.tqh_first; ifaddraddr = (u_long) ifnet.if_addrlist.tqh_first;
@@ -194,18 +194,18 @@ glibtop_get_netload_p (glibtop *server, glibtop_netload *buf,
return; return;
} }
#if (defined __FreeBSD__) && (__FreeBSD_version >= 300000) #if defined(__FreeBSD__) && (__FreeBSD_version >= 300000)
ifaddraddr = (u_long)ifaddr.ifa.ifa_link.tqe_next; ifaddraddr = (u_long)ifaddr.ifa.ifa_link.tqe_next;
#elif (defined __FreeBSD__) || (defined __bsdi__) #elif defined(__FreeBSD__) || defined(__bsdi__)
ifaddraddr = (u_long)ifaddr.ifa.ifa_next; ifaddraddr = (u_long)ifaddr.ifa.ifa_next;
#else #else
ifaddraddr = (u_long)ifaddr.ifa.ifa_list.tqe_next; ifaddraddr = (u_long)ifaddr.ifa.ifa_list.tqe_next;
#endif #endif
} }
#if (defined __FreeBSD__) && (__FreeBSD_version >= 300000) #if defined(__FreeBSD__) && (__FreeBSD_version >= 300000)
ifnetaddr = (u_long) ifnet.if_link.tqe_next; ifnetaddr = (u_long) ifnet.if_link.tqe_next;
#elif (defined __FreeBSD__) || (defined __bsdi__) #elif defined(__FreeBSD__) || defined(__bsdi__)
ifnetaddr = (u_long) ifnet.if_next; ifnetaddr = (u_long) ifnet.if_next;
#else #else
ifnetaddr = (u_long) ifnet.if_list.tqe_next; ifnetaddr = (u_long) ifnet.if_list.tqe_next;

4
sysdeps/freebsd/procargs.c
View File

@@ -54,8 +54,10 @@ glibtop_get_proc_args_p (glibtop *server, glibtop_proc_args *buf,
unsigned size = 0, pos = 0; unsigned size = 0, pos = 0;
int count; int count;
#ifndef __bsdi__
char filename [BUFSIZ]; char filename [BUFSIZ];
struct stat statb; struct stat statb;
#endif
glibtop_init_p (server, (1 << GLIBTOP_SYSDEPS_PROC_ARGS), 0); glibtop_init_p (server, (1 << GLIBTOP_SYSDEPS_PROC_ARGS), 0);
@@ -64,8 +66,10 @@ glibtop_get_proc_args_p (glibtop *server, glibtop_proc_args *buf,
/* swapper, init, pagedaemon, vmdaemon, update - this doen't work. */ /* swapper, init, pagedaemon, vmdaemon, update - this doen't work. */
if (pid < 5) return NULL; if (pid < 5) return NULL;
#ifndef __bsdi__
sprintf (filename, "/proc/%d/mem", pid); sprintf (filename, "/proc/%d/mem", pid);
if (stat (filename, &statb)) return NULL; if (stat (filename, &statb)) return NULL;
#endif
glibtop_suid_enter (server); glibtop_suid_enter (server);

3
sysdeps/freebsd/procstate.c
View File

@@ -27,7 +27,8 @@
#include <glibtop_suid.h> #include <glibtop_suid.h>
#if (!defined __OpenBSD__) && (!defined __bsdi__) #if !defined(__OpenBSD__)
//&& (!defined __bsdi__)
#include <sys/user.h> #include <sys/user.h>
#endif #endif

2
sysdeps/freebsd/proctime.c
View File

@@ -140,8 +140,10 @@ glibtop_get_proc_time_p (glibtop *server, glibtop_proc_time *buf,
/* It does not work for the swapper task. */ /* It does not work for the swapper task. */
if (pid == 0) return; if (pid == 0) return;
#ifndef __bsdi__
sprintf (filename, "/proc/%d/mem", (int) pid); sprintf (filename, "/proc/%d/mem", (int) pid);
if (stat (filename, &statb)) return; if (stat (filename, &statb)) return;
#endif
/* Get the process information */ /* Get the process information */
pinfo = kvm_getprocs (server->machine.kd, KERN_PROC_PID, pid, &count); pinfo = kvm_getprocs (server->machine.kd, KERN_PROC_PID, pid, &count);

4
sysdeps/freebsd/sem_limits.c
View File

@@ -27,7 +27,7 @@
#include <glibtop_suid.h> #include <glibtop_suid.h>
#if (defined __bsdi__) && (_BSDI_VERSION < 199700) #if defined(__bsdi__) && (_BSDI_VERSION < 199700)
/* Older versions of BSDI don't seem to have this. */ /* Older versions of BSDI don't seem to have this. */
void void
@@ -46,7 +46,7 @@ glibtop_get_sem_limits_p (glibtop *server, glibtop_sem_limits *buf)
/* #define KERNEL to get declaration of `struct seminfo'. */ /* #define KERNEL to get declaration of `struct seminfo'. */
#if (defined __FreeBSD__) || (defined __bsdi__) #if defined(__FreeBSD__) || defined(__bsdi__)
#define KERNEL 1 #define KERNEL 1
#else #else
#define _KERNEL 1 #define _KERNEL 1

4
sysdeps/freebsd/shm_limits.c
View File

@@ -27,7 +27,7 @@
#include <glibtop_suid.h> #include <glibtop_suid.h>
#if (defined __bsdi__) && (_BSDI_VERSION < 199700) #if defined(__bsdi__) && (_BSDI_VERSION < 199700)
/* Older versions of BSDI don't seem to have this. */ /* Older versions of BSDI don't seem to have this. */
void void
@@ -46,7 +46,7 @@ glibtop_get_shm_limits_p (glibtop *server, glibtop_shm_limits *buf)
/* #define KERNEL to get declaration of `struct shminfo'. */ /* #define KERNEL to get declaration of `struct shminfo'. */
#if (defined __FreeBSD__) || (defined __bsdi__) #if defined(__FreeBSD__) || defined(__bsdi__)
#define KERNEL 1 #define KERNEL 1
#else #else
#define _KERNEL 1 #define _KERNEL 1

63
sysdeps/freebsd/swap.c
View File

@@ -34,15 +34,24 @@ static const unsigned long _glibtop_sysdeps_swap =
(1 << GLIBTOP_SWAP_FREE) + (1 << GLIBTOP_SWAP_PAGEIN) + (1 << GLIBTOP_SWAP_FREE) + (1 << GLIBTOP_SWAP_PAGEIN) +
(1 << GLIBTOP_SWAP_PAGEOUT); (1 << GLIBTOP_SWAP_PAGEOUT);
#ifdef __FreeBSD__ #if defined(__FreeBSD__) || defined(__bsdi__)
#include <sys/conf.h> #include <sys/conf.h>
#ifdef __bsdi__
#include <vm/swap_pager.h>
#else
#include <sys/rlist.h> #include <sys/rlist.h>
#endif
#include <sys/vmmeter.h> #include <sys/vmmeter.h>
#if __FreeBSD__ < 4
/* nlist structure for kernel access */ /* nlist structure for kernel access */
#if defined(__bsdi__)
static struct nlist nlst [] = {
{ "_swapstats" }, /* general swap info */
{ 0 }
};
#elif __FreeBSD__ < 4
static struct nlist nlst [] = { static struct nlist nlst [] = {
#define VM_SWAPLIST 0 #define VM_SWAPLIST 0
{ "_swaplist" },/* list of free swap areas */ { "_swaplist" },/* list of free swap areas */
@@ -56,10 +65,9 @@ static struct nlist nlst [] = {
{ "_dmmax" }, /* maximum size of a swap block */ { "_dmmax" }, /* maximum size of a swap block */
{ 0 } { 0 }
}; };
#endif #endif
#elif (defined __NetBSD__) #elif defined(__NetBSD__)
#include <vm/vm_swap.h> #include <vm/vm_swap.h>
@@ -76,8 +84,8 @@ static struct nlist nlst2 [] = {
void void
glibtop_init_swap_p (glibtop *server) glibtop_init_swap_p (glibtop *server)
{ {
#ifdef __FreeBSD__ #if defined(__FreeBSD__) || defined(__bsdi__)
#if __FreeBSD__ < 4 #if __FreeBSD__ < 4 || defined(__bsdi__)
if (kvm_nlist (server->machine.kd, nlst) != 0) { if (kvm_nlist (server->machine.kd, nlst) != 0) {
glibtop_warn_io_r (server, "kvm_nlist (swap)"); glibtop_warn_io_r (server, "kvm_nlist (swap)");
return; return;
@@ -86,14 +94,14 @@ glibtop_init_swap_p (glibtop *server)
struct kvm_swap dummy; struct kvm_swap dummy;
if (kvm_getswapinfo (server->machine.kd, &dummy, 1, 0) != 0) { if (kvm_getswapinfo (server->machine.kd, &dummy, 1, 0) != 0) {
glibtop_warn_io_r (server, "kvm_nlist (swap)"); glibtop_warn_io_r (server, "kvm_swap (swap)");
return; return;
} }
#endif #endif
#endif #endif
if (kvm_nlist (server->machine.kd, nlst2) != 0) { if (kvm_nlist (server->machine.kd, nlst2) != 0) {
glibtop_warn_io_r (server, "kvm_nlist (swap)"); glibtop_warn_io_r (server, "kvm_nlist (cnt)");
return; return;
} }
@@ -110,8 +118,9 @@ glibtop_init_swap_p (glibtop *server)
void void
glibtop_get_swap_p (glibtop *server, glibtop_swap *buf) glibtop_get_swap_p (glibtop *server, glibtop_swap *buf)
{ {
#ifdef __FreeBSD__ #if defined(__FreeBSD__)
#if __FreeBSD__ < 4
# if __FreeBSD__ < 4
char *header; char *header;
int hlen, nswdev, dmmax; int hlen, nswdev, dmmax;
int div, nfree, npfree; int div, nfree, npfree;
@@ -122,11 +131,14 @@ glibtop_get_swap_p (glibtop *server, glibtop_swap *buf)
struct rlist *swapptr; struct rlist *swapptr;
size_t sw_size; size_t sw_size;
u_long ptr; u_long ptr;
#else # else
int nswdev; int nswdev;
struct kvm_swap kvmsw[16]; struct kvm_swap kvmsw[16];
#endif # endif
#elif (defined __NetBSD__)
#elif defined(__bsdi__)
struct swapstats swap;
#elif defined(__NetBSD__)
struct swapent *swaplist; struct swapent *swaplist;
#endif #endif
@@ -174,7 +186,7 @@ glibtop_get_swap_p (glibtop *server, glibtop_swap *buf)
swappgsout = vmm.v_swpout; swappgsout = vmm.v_swpout;
#endif #endif
#ifdef __FreeBSD__ #if defined(__FreeBSD__)
#if __FreeBSD__ < 4 #if __FreeBSD__ < 4
@@ -214,7 +226,7 @@ glibtop_get_swap_p (glibtop *server, glibtop_swap *buf)
if (kvm_read (server->machine.kd, nlst[VM_SWDEVT].n_value, if (kvm_read (server->machine.kd, nlst[VM_SWDEVT].n_value,
&ptr, sizeof (ptr)) != sizeof (ptr)) { &ptr, sizeof (ptr)) != sizeof (ptr)) {
glibtop_warn_io_r (server, "kvm_read (swaplist)"); glibtop_warn_io_r (server, "kvm_read (swdevt)");
return; return;
} }
@@ -328,7 +340,24 @@ glibtop_get_swap_p (glibtop *server, glibtop_swap *buf)
#endif #endif
#elif (defined __NetBSD__) #elif defined(__bsdi__)
/* General info about swap devices. */
if (kvm_read (server->machine.kd, nlst[0].n_value,
&swap, sizeof (swap)) != sizeof (swap)) {
glibtop_warn_io_r (server, "kvm_read (swap)");
return;
}
buf->flags = _glibtop_sysdeps_swap;
buf->used = swap.swap_total - swap.swap_free;
buf->free = swap.swap_free;
buf->total = swap.swap_total;
#elif defined(__NetBSD__)
nswap = swapctl (SWAP_NSWAP, NULL, 0); nswap = swapctl (SWAP_NSWAP, NULL, 0);
if (nswap < 0) { if (nswap < 0) {