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

Applied all patches from the FreeBSD 3.3 ports collection.

Browse Source 
1999-10-16  Martin Baulig  <martin@home-of-linux.org>

	Applied all patches from the FreeBSD 3.3 ports collection.

	* swap.c: Only #include <rlist.h> for __FreeBSD_version < 400005.

	* prockernel.c: Make it compile on FreeBSD / alpha.

	* procsignal.c: Some fixes for FreeBSD-current.
This commit is contained in:
Martin Baulig
1999-10-16 18:30:52 +00:00
committed by Martin Baulig
parent 7881e4212f
commit 20bc40ac18
4 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sysdeps/freebsd/ChangeLog
View File

@@ -1,3 +1,13 @@
1999-10-16 Martin Baulig <martin@home-of-linux.org>
Applied all patches from the FreeBSD 3.3 ports collection.
* swap.c: Only #include <rlist.h> for __FreeBSD_version < 400005.
* prockernel.c: Make it compile on FreeBSD / alpha.
* procsignal.c: Some fixes for FreeBSD-current.
1999-10-16 Martin Baulig <martin@home-of-linux.org>
* procstate.c (glibtop_get_proc_state_p): Don't use the

8
sysdeps/freebsd/prockernel.c
View File

@@ -34,10 +34,10 @@
#if (!defined __OpenBSD__) && (!defined __bsdi__)
#include <sys/user.h>
#endif
#ifndef __bsdi__
#if !defined(__bsdi__) && !(defined(__FreeBSD__) && defined(__alpha__))
#include <machine/pcb.h>
#endif
#ifdef __FreeBSD__
#if defined(__FreeBSD__) && !defined(__alpha__)
#include <machine/tss.h>
#endif
@@ -155,6 +155,7 @@ glibtop_get_proc_kernel_p (glibtop *server,
(char *) &pcb, sizeof (pcb)) == sizeof (pcb))
{
#ifdef __FreeBSD__
#ifndef __alpha__
#if (__FreeBSD_version >= 300003)
buf->kstk_esp = (u_int64_t) pcb.pcb_esp;
buf->kstk_eip = (u_int64_t) pcb.pcb_eip;
@@ -162,6 +163,9 @@ glibtop_get_proc_kernel_p (glibtop *server,
buf->kstk_esp = (u_int64_t) pcb.pcb_ksp;
buf->kstk_eip = (u_int64_t) pcb.pcb_pc;
#endif
#else
/*xxx FreeBSD/Alpha? */
#endif
#else
buf->kstk_esp = (u_int64_t) pcb.pcb_tss.tss_esp0;
#ifdef __bsdi__

11
sysdeps/freebsd/procsignal.c
View File

@@ -26,6 +26,7 @@
#include <glibtop/procsignal.h>
#include <glibtop_suid.h>
#include <osreldate.h>
static const unsigned long _glibtop_sysdeps_proc_signal =
(1L << GLIBTOP_PROC_SIGNAL_SIGNAL) +
@@ -66,7 +67,7 @@ glibtop_get_proc_signal_p (glibtop *server,
/* signal: mask of pending signals.
* pinfo [0].kp_proc.p_siglist
*/
#if defined(__NetBSD__) && (NSIG > 32)
#if (defined(__NetBSD__) && (NSIG > 32)) || (__FreeBSD_version >= 400011)
buf->signal [0] = pinfo [0].kp_proc.p_siglist.__bits[0];
#else
buf->signal [0] = pinfo [0].kp_proc.p_siglist;
@@ -75,7 +76,7 @@ glibtop_get_proc_signal_p (glibtop *server,
/* blocked: mask of blocked signals.
* pinfo [0].kp_proc.p_sigmask
*/
#if defined(__NetBSD__) && (NSIG > 32)
#if (defined(__NetBSD__) && (NSIG > 32)) || (__FreeBSD_version >= 400011)
buf->blocked [0] = pinfo [0].kp_proc.p_sigmask.__bits[0];
#else
buf->blocked [0] = pinfo [0].kp_proc.p_sigmask;
@@ -84,16 +85,16 @@ glibtop_get_proc_signal_p (glibtop *server,
/* sigignore: mask of ignored signals.
* pinfo [0].kp_proc.p_sigignore
*/
#if defined(__NetBSD__) && (NSIG > 32)
#if (defined(__NetBSD__) && (NSIG > 32)) || (__FreeBSD_version >= 400011)
buf->sigignore [0] = pinfo [0].kp_proc.p_sigignore.__bits[0];
#else
buf->sigignore [0] = pinfo [0].kp_proc.p_sigignore;
buf->sigignore [0] = pinfo [0].kp_proc.p_sigignore.__bits[0];
#endif
/* sigcatch: mask of caught signals.
* pinfo [0].kp_proc.p_sigcatch
*/
#if defined(__NetBSD__) && (NSIG > 32)
#if (defined(__NetBSD__) && (NSIG > 32)) || (__FreeBSD_version >= 400011)
buf->sigcatch [0] = pinfo [0].kp_proc.p_sigcatch.__bits[0];
#else
buf->sigcatch [0] = pinfo [0].kp_proc.p_sigcatch;

2
sysdeps/freebsd/swap.c
View File

@@ -40,8 +40,10 @@ static const unsigned long _glibtop_sysdeps_swap =
#ifdef __bsdi__
#include <vm/swap_pager.h>
#else
#if __FreeBSD_version < 400005
#include <sys/rlist.h>
#endif
#endif
#include <sys/vmmeter.h>
/* nlist structure for kernel access */