9968f74a05
2003-12-23 Bastien Nocera <hadess@hadess.net> * cpu.c: (glibtop_get_cpu_s): * glibtop_server.h: * loadavg.c: (glibtop_get_loadavg_s): * mem.c: (glibtop_get_mem_s): * netload.c: (glibtop_get_netload_s): * prockernel.c: (glibtop_get_proc_kernel_s): * procmem.c: (glibtop_get_proc_mem_s): * procsegment.c: (glibtop_get_proc_segment_s): * procsignal.c: (glibtop_get_proc_signal_s): * proctime.c: (glibtop_get_proc_time_s): * procuid.c: (glibtop_get_proc_uid_s): * swap.c: (glibtop_get_swap_s): Apply patch from Benoît Dejean <bnet@ifrance.com> to fix overflow issues using strtol (Closes: #129881)
104 lines
2.8 KiB
C
104 lines
2.8 KiB
C
/* $Id$ */
|
|
|
|
/* Copyright (C) 1998-99 Martin Baulig
|
|
This file is part of LibGTop 1.0.
|
|
|
|
Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
|
|
|
|
LibGTop is free software; you can redistribute it and/or modify it
|
|
under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License,
|
|
or (at your option) any later version.
|
|
|
|
LibGTop 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 General Public License
|
|
for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with LibGTop; see the file COPYING. If not, write to the
|
|
Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
Boston, MA 02111-1307, USA.
|
|
*/
|
|
|
|
#include <glibtop.h>
|
|
#include <glibtop/error.h>
|
|
#include <glibtop/proctime.h>
|
|
|
|
static const unsigned long _glibtop_sysdeps_proc_time =
|
|
(1L << GLIBTOP_PROC_TIME_UTIME) + (1L << GLIBTOP_PROC_TIME_CUTIME) +
|
|
(1L << GLIBTOP_PROC_TIME_STIME) + (1L << GLIBTOP_PROC_TIME_CSTIME) +
|
|
(1L << GLIBTOP_PROC_TIME_FREQUENCY) + (1L << GLIBTOP_PROC_TIME_TIMEOUT) +
|
|
(1L << GLIBTOP_PROC_TIME_IT_REAL_VALUE) + (1L << GLIBTOP_PROC_TIME_START_TIME);
|
|
|
|
static const unsigned long _glibtop_sysdeps_proc_time_smp =
|
|
(1L << GLIBTOP_PROC_TIME_XCPU_UTIME) + (1L << GLIBTOP_PROC_TIME_XCPU_STIME);
|
|
|
|
/* Init function. */
|
|
|
|
void
|
|
glibtop_init_proc_time_s (glibtop *server)
|
|
{
|
|
server->sysdeps.proc_time = _glibtop_sysdeps_proc_time;
|
|
|
|
if (server->ncpu)
|
|
server->sysdeps.proc_time |= _glibtop_sysdeps_proc_time_smp;
|
|
}
|
|
|
|
/* Provides detailed information about a process. */
|
|
|
|
void
|
|
glibtop_get_proc_time_s (glibtop *server, glibtop_proc_time *buf, pid_t pid)
|
|
{
|
|
char buffer [BUFSIZ], *p;
|
|
int i;
|
|
|
|
glibtop_init_s (&server, GLIBTOP_SYSDEPS_PROC_TIME, 0);
|
|
|
|
memset (buf, 0, sizeof (glibtop_proc_time));
|
|
|
|
if (proc_stat_to_buffer (buffer, pid))
|
|
return;
|
|
|
|
p = proc_stat_after_cmd (buffer);
|
|
if (!p) return;
|
|
|
|
p = skip_multiple_token (p, 11);
|
|
|
|
buf->utime = strtoull (p, &p, 0);
|
|
buf->stime = strtoull (p, &p, 0);
|
|
buf->cutime = strtoull (p, &p, 0);
|
|
buf->cstime = strtoull (p, &p, 0);
|
|
|
|
p = skip_multiple_token (p, 2);
|
|
|
|
buf->timeout = strtoull (p, &p, 0);
|
|
buf->it_real_value = strtoull (p, &p, 0);
|
|
buf->start_time = strtoull (p, &p, 0);
|
|
|
|
buf->frequency = 100;
|
|
|
|
buf->flags = _glibtop_sysdeps_proc_time;
|
|
|
|
if (!server->ncpu)
|
|
return;
|
|
|
|
if (proc_file_to_buffer (buffer, "/proc/%d/cpu", pid))
|
|
return;
|
|
|
|
p = skip_token (buffer);
|
|
buf->utime = strtoull (p, &p, 0);
|
|
buf->stime = strtoull (p, &p, 0);
|
|
|
|
for (i = 0; i < GLIBTOP_NCPU; i++) {
|
|
if (strncmp (p+1, "cpu", 3) || !isdigit (p [4]))
|
|
break;
|
|
|
|
p += 6;
|
|
buf->xcpu_utime [i] = strtoull (p, &p, 0);
|
|
buf->xcpu_stime [i] = strtoull (p, &p, 0);
|
|
}
|
|
|
|
buf->flags |= _glibtop_sysdeps_proc_time_smp;
|
|
}
|