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)
95 lines
2.4 KiB
C
95 lines
2.4 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 <config.h>
|
|
#include <glibtop/error.h>
|
|
#include <glibtop/loadavg.h>
|
|
|
|
static const unsigned long _glibtop_sysdeps_loadavg =
|
|
(1L << GLIBTOP_LOADAVG_LOADAVG);
|
|
|
|
static const unsigned long _glibtop_sysdeps_loadavg_tasks =
|
|
(1L << GLIBTOP_LOADAVG_NR_RUNNING) +
|
|
(1L << GLIBTOP_LOADAVG_NR_TASKS) +
|
|
(1L << GLIBTOP_LOADAVG_LAST_PID);
|
|
|
|
/* Init function. */
|
|
|
|
void
|
|
glibtop_init_loadavg_s (glibtop *server)
|
|
{
|
|
server->sysdeps.loadavg = _glibtop_sysdeps_loadavg;
|
|
}
|
|
|
|
/* Provides load load averange. */
|
|
|
|
#define FILENAME "/proc/loadavg"
|
|
|
|
void
|
|
glibtop_get_loadavg_s (glibtop *server, glibtop_loadavg *buf)
|
|
{
|
|
char buffer [BUFSIZ], *p, *old;
|
|
int fd, len;
|
|
|
|
glibtop_init_s (&server, GLIBTOP_SYSDEPS_LOADAVG, 0);
|
|
|
|
memset (buf, 0, sizeof (glibtop_loadavg));
|
|
|
|
fd = open (FILENAME, O_RDONLY);
|
|
if (fd < 0)
|
|
glibtop_error_io_r (server, "open (%s)", FILENAME);
|
|
|
|
len = read (fd, buffer, BUFSIZ-1);
|
|
if (len < 0)
|
|
glibtop_error_io_r (server, "read (%s)", FILENAME);
|
|
|
|
close (fd);
|
|
|
|
buffer [len] = '\0';
|
|
|
|
buf->loadavg [0] = strtod (buffer, &p);
|
|
buf->loadavg [1] = strtod (p, &p);
|
|
buf->loadavg [2] = strtod (p, &p);
|
|
|
|
buf->flags = _glibtop_sysdeps_loadavg;
|
|
|
|
while (isspace(*p)) p++;
|
|
|
|
/* Older Linux versions don't have the nr_running/nr_tasks fields. */
|
|
|
|
old = p;
|
|
while (*p) {
|
|
if (*p == '/')
|
|
break;
|
|
if (!isdigit (*p))
|
|
return;
|
|
p++;
|
|
}
|
|
|
|
buf->nr_running = strtoull (old, &p, 0); p++;
|
|
buf->nr_tasks = strtoull (p, &p, 0);
|
|
buf->last_pid = strtoull (p, &p, 0);
|
|
|
|
buf->flags |= _glibtop_sysdeps_loadavg_tasks;
|
|
}
|