No longer use `glibtop_machine.h' for Linux.

1998-07-03  Martin baulig  <martin@home-of-linux.org>

	* macros/gnome-libgtop-sysdeps.m4: No longer use
	`glibtop_machine.h' for Linux.

	* sysdeps/linux/glibtop_machine.h: Removed.

	* sysdeps/guile/guile.awk: Using `scm_append'
	instead of `gh_append'.

	* sysdeps/guile/names/guile-names.awk: dito.

	* sysdeps/linux/*.c: Using code from stable branch again.

	* include/glibtop/parameter.h: New file.

	* lib/parameter.c: New file.

	* lib/{open, init}.c: Done some more work on server
	initialization
This commit is contained in:
Martin baulig
1998-07-03 17:19:25 +00:00
committed by Martin Baulig
parent 94715ef718
commit 9532dadc2e
26 changed files with 557 additions and 355 deletions

View File

@@ -33,8 +33,7 @@ static unsigned long _glibtop_sysdeps_uptime =
void
glibtop_get_uptime_s (glibtop *server, glibtop_uptime *buf)
{
int fd, ret;
char buffer [BUFSIZ];
FILE *f;
glibtop_init_r (&server, 0, 0);
@@ -42,17 +41,10 @@ glibtop_get_uptime_s (glibtop *server, glibtop_uptime *buf)
buf->flags = _glibtop_sysdeps_uptime;
fd = open (FILENAME, O_RDONLY);
if (fd == -1)
glibtop_error_r (server, "open (%s): %s",
FILENAME, strerror (errno));
f = fopen ("/proc/uptime", "r");
if (!f) return;
ret = read (fd, buffer, BUFSIZ);
if (ret == -1)
glibtop_error_r (server, "read (%s): %s",
FILENAME, strerror (errno));
fscanf (f, "%lf %lf\n", &buf->uptime, &buf->idletime);
sscanf (buffer, "%lf %lf\n", &buf->uptime, &buf->idletime);
close (fd);
fclose (f);
}