5e97af535f
* Splitted `libgtop_sysdeps.la' into `libgtop_sysdeps.la' and
`libgtop_sysdeps_suid.la'.
Everything that needs to be suid/sgid is in `libgtop_sysdeps_suid.la'
and the rest in `libgtop_sysdeps.la'.
The functions from `libgtop_sysdeps_suid.la' have the `_p' prefix and
the ones from `libgtop_sysdeps.la' the `_s' prefix.
The suid library uses `glibtop_open_p' and `glibtop_close_p', the
normal one `glibtop_init_s' (found in lib/init.c), `glibtop_open_s'
and `glibtop_close_s'.
* Added `libgtop_suid_common.la' containing stuff from sysdeps/common
that is required from the suid server (currently everything from
error.c and xmalloc.c).
This means, we can add some more stuff to `libgtop_common.la' without
the risk that it may be dangerous in the suid server.
* The ``library order'' is much clearer now:
-> `libgtop.la' (from lib/) contains user-level stuff;
all functions except `glibtop_init_r' have the `_l'
suffix.
-> `libgtop_common.la' (from sysdeps/common/) contains stuff
that is common among the sysdeps directories.
use anything from `libgtop_sysdeps.la' and
`libgtop_sysdeps_suid.la'.
-> `libgtop_sysdeps.la' (from sysdeps/<sysdeps_dir>/) contains
everything from the sysdeps directory that doesn't need to
be suid/sgid.
-> `libgtop_suid_common.la' (from sysdeps/common/) is used from
the suid server instead of `libgtop_common.la'.
-> `libgtop_sysdeps_suid.la' (from sysdeps/<sysdeps_dir>/) contains
everything from the sysdeps directory that needs to be in the
suid server.
* To summarize: the server is linked only with functions that need
to be suid and everything else is linked only with functions that
do not need to be suid.
Martin
1998-07-22 Martin Baulig <martin@home-of-linux.org>
* lib/init.c (glibtop_init_s): Added this init function of
the sysdeps directory `libgtop_sysdeps.la'.
* lib/open.c (glibtop_open_l): Unconditionally calling
`glibtop_init_s' after server initialization.
* lib/lib.awk: Removed references to functions from
`libgtop_sysdeps_suid.la' to avoid undefined symbols.
* sysdeps/stub/open.c (glibtop_open_s): Renamed this
function from `glibtop_open_r'.
* sysdeps/stub/close.c (glibtop_close_s): Renamed this
function from `glibtop_close_l'.
* sysdeps/kernel/open.c (glibtop_open_s): Renamed this
function from `glibtop_open_r'.
* sysdeps/kernel/close.c (glibtop_close_s): Renamed this
function from `glibtop_close_l'.
* sysdeps/linux/open.c (glibtop_open_s): Renamed this
function from `glibtop_open_r'.
* sysdeps/linux/close.c (glibtop_close_s): Renamed this
function from `glibtop_close_l'.
* sysdeps/osf1/Makefile.am (lib_LTLIBRARIES): Added
`libgtop_sysdeps_suid.la' for the suid server.
* sysdeps/osf1/open_suid.c (glibtop_open_p): New file.
Contains all stuff that was formerly in `open.c'.
* sysdeps/osf1/open.c: Moved everything from here into
the new file `open_suid.c'.
* sysdeps/osf1/open.c (glibtop_open_s): New function.
* sysdeps/osf1/close_suid.c (glibtop_close_p): New file.
* sysdeps/osf1/close.c (glibtop_close_s): New function.
* sysdeps/osf1/*.c: Using the new init, open and close
functions.
* sysdeps/sun4/Makefile.am (lib_LTLIBRARIES): Added
`libgtop_sysdeps_suid.la' for the suid server.
* sysdeps/sun4/nosuid.c (glibtop_open_s, glibtop_close_s): New file
* sysdeps/sun4/*.c: All functions now have the `_p' suffix.
* sysdeps/common/Makefile.am (lib_LTLIBRARIES): Added
`libgtop_suid_common.la' which only contains stuff that is
needed in the suid parts.
* sysdeps/common/xmalloc.c: Using `glibtop_error_io_r' instead
of `glibtop_error_r'.
* sysdeps/{kernel, linux, osf1, sun4, stub}/init.c: Removed.
`glibtop_init_s' has been moved into `lib/init.c' since it's the
same in all the sysdeps directories.
* src/server/main.c: It is now an error to request a feature that
does not need the suid server.
* src/proxy: Removed.
104 lines
3.1 KiB
C
104 lines
3.1 KiB
C
/* $Id$ */
|
|
|
|
/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
|
|
This file is part of the Gnome Top Library.
|
|
Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
|
|
|
|
The Gnome Top Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Library General Public License as
|
|
published by the Free Software Foundation; either version 2 of the
|
|
License, or (at your option) any later version.
|
|
|
|
The Gnome Top Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with the GNU C Library; see the file COPYING.LIB. If not,
|
|
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
#include <glibtop.h>
|
|
#include <glibtop/cpu.h>
|
|
|
|
static const unsigned long _glibtop_sysdeps_cpu =
|
|
(1 << GLIBTOP_CPU_TOTAL) + (1 << GLIBTOP_CPU_USER) +
|
|
(1 << GLIBTOP_CPU_NICE) + (1 << GLIBTOP_CPU_SYS) +
|
|
(1 << GLIBTOP_CPU_IDLE) + (1 << GLIBTOP_CPU_FREQUENCY);
|
|
|
|
/* Provides information about cpu usage. */
|
|
|
|
void
|
|
glibtop_get_cpu_p (glibtop *server, glibtop_cpu *buf)
|
|
{
|
|
long cp_time [CPUSTATES], mp_time [NCPU][CPUSTATES];
|
|
int i;
|
|
|
|
glibtop_init_p (&server, 0, 0);
|
|
|
|
memset (buf, 0, sizeof (glibtop_cpu));
|
|
|
|
/* !!! THE FOLLOWING CODE RUNS SGID KMEM - CHANGE WITH CAUTION !!! */
|
|
|
|
setregid (server->machine.gid, server->machine.egid);
|
|
|
|
/* get the cp_time array */
|
|
|
|
(void) _glibtop_getkval (server, _glibtop_nlist [X_CP_TIME].n_value,
|
|
(int *) cp_time, sizeof (cp_time),
|
|
_glibtop_nlist [X_CP_TIME].n_name);
|
|
|
|
#ifdef MULTIPROCESSOR
|
|
/* get the mp_time array as well */
|
|
|
|
if (server->machine.ncpu > 1) {
|
|
(void) _glibtop_getkval (server, _glibtop_nlist [X_MP_TIME].n_value,
|
|
(int *) mp_time, sizeof (mp_time),
|
|
_glibtop_nlist [X_MP_TIME].n_name);
|
|
}
|
|
#endif
|
|
|
|
if (setregid (server->machine.egid, server->machine.gid))
|
|
_exit (1);
|
|
|
|
/* !!! END OF SUID ROOT PART !!! */
|
|
|
|
#ifdef MULTIPROCESSOR
|
|
/* If we have multiple processors, we add the times for each of them and set
|
|
frequency to 100 times the number of the processors. */
|
|
|
|
/* [FIXME]: I had no machine with more than one processor to test this code !!! */
|
|
|
|
if (server->machine.ncpu > 1) {
|
|
for (i = 0; i < server->machine.ncpu; i++) {
|
|
buf->user += mp_time [i][CP_USER];
|
|
buf->nice += mp_time [i][CP_NICE];
|
|
buf->sys += mp_time [i][CP_SYS];
|
|
buf->idle += mp_time [i][CP_IDLE];
|
|
buf->frequency += 100;
|
|
}
|
|
} else {
|
|
buf->user = cp_time [CP_USER];
|
|
buf->nice = cp_time [CP_NICE];
|
|
buf->sys = cp_time [CP_SYS];
|
|
buf->idle = cp_time [CP_IDLE];
|
|
buf->frequency = 100;
|
|
}
|
|
#else
|
|
buf->user = cp_time [CP_USER];
|
|
buf->nice = cp_time [CP_NICE];
|
|
buf->sys = cp_time [CP_SYS];
|
|
buf->idle = cp_time [CP_IDLE];
|
|
buf->frequency = 100;
|
|
#endif
|
|
|
|
/* Calculate total time. */
|
|
|
|
buf->total = buf->user + buf->nice + buf->sys + buf->idle;
|
|
|
|
/* Now we can set the flags. */
|
|
|
|
buf->flags = _glibtop_sysdeps_cpu;
|
|
}
|