Replaced glibtop_init_r' with
glibtop_init_s'.
1998-07-24 Martin Baulig <martin@home-of-linux.org> * sysdeps/{kernel, linux}/*.c: Replaced `glibtop_init_r' with `glibtop_init_s'. * sysdeps/sun4/open.c (glibtop_init_p): Removed `program_name' parameter. * sysdeps/osf1/glibtop_suid.h: New file. * sysdeps/osf1/glibtop_server.h: Now correctly using `(1 << GLIBTOP_SYSDEPS_*)' instead of `GLIBTOP_SYSDEPS_*'. * sysdeps/osf1/open_suid.c (glibtop_init_p): New function. * sysdeps/osf1/proc*.c: Done some more work here.
This commit is contained in:
committed by
Martin Baulig
parent
51c5c3ac22
commit
f3f051ecba
@@ -19,14 +19,75 @@
|
||||
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||||
Boston, MA 02111-1307, USA. */
|
||||
|
||||
#include <config.h>
|
||||
#include <glibtop.h>
|
||||
#include <glibtop/error.h>
|
||||
#include <glibtop/procmem.h>
|
||||
|
||||
#include <glibtop_suid.h>
|
||||
|
||||
#include <sys/user.h>
|
||||
#include <sys/time.h>
|
||||
#include <sys/resource.h>
|
||||
|
||||
#include <mach.h>
|
||||
#include <mach/mach_types.h>
|
||||
#include <mach/task_info.h>
|
||||
|
||||
static const unsigned long _glibtop_sysdeps_proc_mem =
|
||||
(1 << GLIBTOP_PROC_MEM_VSIZE) + (1 << GLIBTOP_PROC_MEM_RESIDENT) +
|
||||
(1 << GLIBTOP_PROC_MEM_RSS);
|
||||
|
||||
/* Provides detailed information about a process. */
|
||||
|
||||
void
|
||||
glibtop_get_proc_mem_p (glibtop *server, glibtop_proc_mem *buf,
|
||||
pid_t pid)
|
||||
{
|
||||
task_basic_info_data_t taskinfo;
|
||||
int ret, info_count;
|
||||
task_t thistask;
|
||||
struct user u;
|
||||
|
||||
glibtop_init_p (server, 0, 0);
|
||||
|
||||
memset (buf, 0, sizeof (glibtop_proc_mem));
|
||||
|
||||
/* Get task structure. */
|
||||
|
||||
ret = task_by_unix_pid (task_self(), pid, &thistask);
|
||||
|
||||
if (ret != KERN_SUCCESS) return;
|
||||
|
||||
/* Get taskinfo about this task. */
|
||||
|
||||
info_count = TASK_BASIC_INFO_COUNT;
|
||||
|
||||
ret = task_info (thistask, TASK_BASIC_INFO,
|
||||
(task_info_t) &taskinfo, &info_count);
|
||||
|
||||
if (ret != KERN_SUCCESS) return;
|
||||
|
||||
buf->resident = taskinfo.resident_size;
|
||||
buf->rss = taskinfo.resident_size;
|
||||
buf->vsize = taskinfo.virtual_size;
|
||||
|
||||
/* !!! THE FOLLOWING CODE RUNS SUID ROOT - CHANGE WITH CAUTION !!! */
|
||||
|
||||
glibtop_suid_enter (server);
|
||||
|
||||
ret = table (TBL_UAREA, pid, (char *) &u, 1,
|
||||
sizeof (struct user));
|
||||
|
||||
glibtop_suid_leave (server);
|
||||
|
||||
/* !!! END OF SUID ROOT PART !!! */
|
||||
|
||||
if (ret != 1) return;
|
||||
|
||||
buf->rss_rlim = u.u_rlimit [RLIMIT_RSS].rlim_cur;
|
||||
|
||||
buf->share = u.u_ru.ru_ixrss;
|
||||
|
||||
buf->flags |= (1 << GLIBTOP_PROC_MEM_RSS_RLIM) |
|
||||
(1 << GLIBTOP_PROC_MEM_SHARE);
|
||||
}
|
||||
|
Reference in New Issue
Block a user