oxmc/libgtop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reverted some stuff from 06-07-1998 since it was too buggy.

Browse Source 
1998-06-18  Martin Baulig  <baulig@taurus.uni-trier.de>

	* sysdeps/linux/*.c: Reverted some stuff from 06-07-1998
	since it was too buggy.
This commit is contained in:
Martin Baulig
1998-06-18 19:02:49 +00:00
committed by Martin Baulig
parent 3fcc477b25
commit 1b90ed4fcc
11 changed files with 117 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
sysdeps/linux/cpu.c
View File

@@ -44,17 +44,10 @@ glibtop_get_cpu_s (glibtop *server, glibtop_cpu *buf)
buf->flags = _glibtop_sysdeps_cpu; buf->flags = _glibtop_sysdeps_cpu;
#ifdef GLIBTOP_CACHE_OPEN fd = open (FILENAME, O_RDONLY);
fd = server->machine.fd_stat; if (fd == -1)
#endif glibtop_error_r (server, "open (%s): %s",
if (fd == 0) { FILENAME, strerror (errno));
fd = open (FILENAME, O_RDONLY);
if (fd == -1)
glibtop_error_r (server, "open (%s): %s",
FILENAME, strerror (errno));
} else {
lseek (fd, 0, SEEK_SET);
}
ret = read (fd, buffer, BUFSIZ); ret = read (fd, buffer, BUFSIZ);
if (ret == -1) if (ret == -1)
@@ -63,6 +56,7 @@ glibtop_get_cpu_s (glibtop *server, glibtop_cpu *buf)
tmp = strchr (buffer, '\n'); tmp = strchr (buffer, '\n');
tmp = skip_token (tmp); /* "cpu" */ tmp = skip_token (tmp); /* "cpu" */
buf->user = strtoul (tmp, &tmp, 10); buf->user = strtoul (tmp, &tmp, 10);
buf->nice = strtoul (tmp, &tmp, 10); buf->nice = strtoul (tmp, &tmp, 10);
buf->sys = strtoul (tmp, &tmp, 10); buf->sys = strtoul (tmp, &tmp, 10);
@@ -71,10 +65,5 @@ glibtop_get_cpu_s (glibtop *server, glibtop_cpu *buf)
buf->total = buf->user + buf->nice + buf->sys + buf->idle; buf->total = buf->user + buf->nice + buf->sys + buf->idle;
buf->frequency = 100; buf->frequency = 100;
#ifdef GLIBTOP_CACHE_OPEN
server->machine.fd_stat = fd;
#else
close (fd); close (fd);
#endif
} }

19
sysdeps/linux/loadavg.c
View File

@@ -42,17 +42,10 @@ glibtop_get_loadavg_s (glibtop *server, glibtop_loadavg *buf)
buf->flags = _glibtop_sysdeps_loadavg; buf->flags = _glibtop_sysdeps_loadavg;
#ifdef GLIBTOP_CACHE_OPEN fd = open (FILENAME, O_RDONLY);
fd = server->machine.fd_loadavg; if (fd == -1)
#endif glibtop_error_r (server, "open (%s): %s",
if (fd == 0) { FILENAME, strerror (errno));
fd = open (FILENAME, O_RDONLY);
if (fd == -1)
glibtop_error_r (server, "open (%s): %s",
FILENAME, strerror (errno));
} else {
lseek (fd, 0, SEEK_SET);
}
ret = read (fd, buffer, BUFSIZ); ret = read (fd, buffer, BUFSIZ);
if (ret == -1) if (ret == -1)
@@ -63,9 +56,5 @@ glibtop_get_loadavg_s (glibtop *server, glibtop_loadavg *buf)
buf->loadavg [1] = strtod (tmp, &tmp); buf->loadavg [1] = strtod (tmp, &tmp);
buf->loadavg [2] = strtod (tmp, &tmp); buf->loadavg [2] = strtod (tmp, &tmp);
#ifdef GLIBTOP_CACHE_OPEN
server->machine.fd_loadavg = fd;
#else
close (fd); close (fd);
#endif
} }

19
sysdeps/linux/mem.c
View File

@@ -45,17 +45,10 @@ glibtop_get_mem_s (glibtop *server, glibtop_mem *buf)
buf->flags = _glibtop_sysdeps_mem; buf->flags = _glibtop_sysdeps_mem;
#ifdef GLIBTOP_CACHE_OPEN fd = open (FILENAME, O_RDONLY);
fd = server->machine.fd_meminfo; if (fd == -1)
#endif glibtop_error_r (server, "open (%s): %s",
if (fd == 0) { FILENAME, strerror (errno));
fd = open (FILENAME, O_RDONLY);
if (fd == -1)
glibtop_error_r (server, "open (%s): %s",
FILENAME, strerror (errno));
} else {
lseek (fd, 0, SEEK_SET);
}
ret = read (fd, buffer, BUFSIZ); ret = read (fd, buffer, BUFSIZ);
if (ret == -1) if (ret == -1)
@@ -75,9 +68,5 @@ glibtop_get_mem_s (glibtop *server, glibtop_mem *buf)
buf->user = buf->total - buf->free - buf->shared - buf->buffer; buf->user = buf->total - buf->free - buf->shared - buf->buffer;
#ifdef GLIBTOP_CACHE_OPEN
server->machine.fd_meminfo = fd;
#else
close (fd); close (fd);
#endif
} }

38
sysdeps/linux/prockernel.c
View File

@@ -47,36 +47,20 @@ glibtop_get_proc_kernel_s (glibtop *server, glibtop_proc_kernel *buf, pid_t pid)
return; return;
} }
if (pid != server->machine.last_pid) { sprintf (input, "/proc/%d/stat", pid);
server->machine.last_pid = pid;
server->machine.no_update = 0;
}
if (!server->machine.no_update) {
server->machine.proc_status [0] = 0;
server->machine.proc_statm [0] = 0;
server->machine.proc_stat [0] = 0;
}
if (server->machine.proc_stat [0]) {
strcpy (buffer, server->machine.proc_stat);
} else {
sprintf (input, "/proc/%d/stat", pid);
fd = open (input, O_RDONLY); fd = open (input, O_RDONLY);
if (fd == -1) if (fd == -1)
glibtop_error_r (server, "open (%s): %s", glibtop_error_r (server, "open (%s): %s",
input, strerror (errno)); input, strerror (errno));
nread = read (fd, buffer, BUFSIZ); nread = read (fd, buffer, BUFSIZ);
if (nread == -1) if (nread == -1)
glibtop_error_r (server, "read (%s): %s", glibtop_error_r (server, "read (%s): %s",
input, strerror (errno)); input, strerror (errno));
buffer [nread] = 0; buffer [nread] = 0;
strcpy (server->machine.proc_stat, buffer); close (fd);
close (fd);
}
/* This is from guile-utils/gtop/proc/readproc.c */ /* This is from guile-utils/gtop/proc/readproc.c */

65
sysdeps/linux/procmem.c
View File

@@ -46,36 +46,20 @@ glibtop_get_proc_mem_s (glibtop *server, glibtop_proc_mem *buf, pid_t pid)
return; return;
} }
if (pid != server->machine.last_pid) { sprintf (input, "/proc/%d/stat", pid);
server->machine.last_pid = pid;
server->machine.no_update = 0;
}
if (!server->machine.no_update) {
server->machine.proc_status [0] = 0;
server->machine.proc_statm [0] = 0;
server->machine.proc_stat [0] = 0;
}
if (server->machine.proc_stat [0]) {
strcpy (buffer, server->machine.proc_stat);
} else {
sprintf (input, "/proc/%d/stat", pid);
fd = open (input, O_RDONLY); fd = open (input, O_RDONLY);
if (fd == -1) if (fd == -1)
glibtop_error_r (server, "open (%s): %s", glibtop_error_r (server, "open (%s): %s",
input, strerror (errno)); input, strerror (errno));
nread = read (fd, buffer, BUFSIZ); nread = read (fd, buffer, BUFSIZ);
if (nread == -1) if (nread == -1)
glibtop_error_r (server, "read (%s): %s", glibtop_error_r (server, "read (%s): %s",
input, strerror (errno)); input, strerror (errno));
buffer [nread] = 0; buffer [nread] = 0;
strcpy (server->machine.proc_stat, buffer); close (fd);
close (fd);
}
/* This is from guile-utils/gtop/proc/readproc.c */ /* This is from guile-utils/gtop/proc/readproc.c */
@@ -88,25 +72,20 @@ glibtop_get_proc_mem_s (glibtop *server, glibtop_proc_mem *buf, pid_t pid)
"%*d %*d %*d %*d %*d %*d %*u %*u %*d %lu " "%*d %*d %*d %*d %*d %*d %*u %*u %*d %lu "
"%lu %lu", &buf->vsize, &buf->rss, &buf->rss_rlim); "%lu %lu", &buf->vsize, &buf->rss, &buf->rss_rlim);
if (server->machine.proc_statm [0]) { sprintf (input, "/proc/%d/statm", pid);
strcpy (buffer, server->machine.proc_statm);
} else {
sprintf (input, "/proc/%d/statm", pid);
fd = open (input, O_RDONLY); fd = open (input, O_RDONLY);
if (fd == -1) if (fd == -1)
glibtop_error_r (server, "open (%s): %s", glibtop_error_r (server, "open (%s): %s",
input, strerror (errno)); input, strerror (errno));
nread = read (fd, buffer, BUFSIZ); nread = read (fd, buffer, BUFSIZ);
if (nread == -1) if (nread == -1)
glibtop_error_r (server, "read (%s): %s", glibtop_error_r (server, "read (%s): %s",
input, strerror (errno)); input, strerror (errno));
buffer [nread] = 0; buffer [nread] = 0;
strcpy (server->machine.proc_statm, buffer); close (fd);
close (fd);
}
sscanf (buffer, "%ld %ld %ld", sscanf (buffer, "%ld %ld %ld",
&buf->size, &buf->resident, &buf->share); &buf->size, &buf->resident, &buf->share);

65
sysdeps/linux/procsegment.c
View File

@@ -48,36 +48,20 @@ glibtop_get_proc_segment_s (glibtop *server, glibtop_proc_segment *buf,
return; return;
} }
if (pid != server->machine.last_pid) { sprintf (input, "/proc/%d/stat", pid);
server->machine.last_pid = pid;
server->machine.no_update = 0;
}
if (!server->machine.no_update) {
server->machine.proc_status [0] = 0;
server->machine.proc_statm [0] = 0;
server->machine.proc_stat [0] = 0;
}
if (server->machine.proc_stat [0]) {
strcpy (buffer, server->machine.proc_stat);
} else {
sprintf (input, "/proc/%d/stat", pid);
fd = open (input, O_RDONLY); fd = open (input, O_RDONLY);
if (fd == -1) if (fd == -1)
glibtop_error_r (server, "open (%s): %s", glibtop_error_r (server, "open (%s): %s",
input, strerror (errno)); input, strerror (errno));
nread = read (fd, buffer, BUFSIZ); nread = read (fd, buffer, BUFSIZ);
if (nread == -1) if (nread == -1)
glibtop_error_r (server, "read (%s): %s", glibtop_error_r (server, "read (%s): %s",
input, strerror (errno)); input, strerror (errno));
buffer [nread] = 0; buffer [nread] = 0;
strcpy (server->machine.proc_stat, buffer); close (fd);
close (fd);
}
/* This is from guile-utils/gtop/proc/readproc.c */ /* This is from guile-utils/gtop/proc/readproc.c */
@@ -91,25 +75,20 @@ glibtop_get_proc_segment_s (glibtop *server, glibtop_proc_segment *buf,
"%*u %*u %lu %lu %lu", &buf->start_code, "%*u %*u %lu %lu %lu", &buf->start_code,
&buf->end_code, &buf->start_stack); &buf->end_code, &buf->start_stack);
if (server->machine.proc_statm [0]) { sprintf (input, "/proc/%d/statm", pid);
strcpy (buffer, server->machine.proc_statm);
} else {
sprintf (input, "/proc/%d/statm", pid);
fd = open (input, O_RDONLY); fd = open (input, O_RDONLY);
if (fd == -1) if (fd == -1)
glibtop_error_r (server, "open (%s): %s", glibtop_error_r (server, "open (%s): %s",
input, strerror (errno)); input, strerror (errno));
nread = read (fd, buffer, BUFSIZ); nread = read (fd, buffer, BUFSIZ);
if (nread == -1) if (nread == -1)
glibtop_error_r (server, "read (%s): %s", glibtop_error_r (server, "read (%s): %s",
input, strerror (errno)); input, strerror (errno));
buffer [nread] = 0; buffer [nread] = 0;
strcpy (server->machine.proc_statm, buffer); close (fd);
close (fd);
}
sscanf (buffer, "%*d %*d %*d %ld %ld %ld %ld", sscanf (buffer, "%*d %*d %*d %ld %ld %ld %ld",
&buf->trs, &buf->lrs, &buf->drs, &buf->dt); &buf->trs, &buf->lrs, &buf->drs, &buf->dt);

38
sysdeps/linux/procsignal.c
View File

@@ -45,36 +45,20 @@ glibtop_get_proc_signal_s (glibtop *server, glibtop_proc_signal *buf, pid_t pid)
return; return;
} }
if (pid != server->machine.last_pid) { sprintf (input, "/proc/%d/stat", pid);
server->machine.last_pid = pid;
server->machine.no_update = 0;
}
if (!server->machine.no_update) {
server->machine.proc_status [0] = 0;
server->machine.proc_statm [0] = 0;
server->machine.proc_stat [0] = 0;
}
if (server->machine.proc_stat [0]) {
strcpy (buffer, server->machine.proc_stat);
} else {
sprintf (input, "/proc/%d/stat", pid);
fd = open (input, O_RDONLY); fd = open (input, O_RDONLY);
if (fd == -1) if (fd == -1)
glibtop_error_r (server, "open (%s): %s", glibtop_error_r (server, "open (%s): %s",
input, strerror (errno)); input, strerror (errno));
nread = read (fd, buffer, BUFSIZ); nread = read (fd, buffer, BUFSIZ);
if (nread == -1) if (nread == -1)
glibtop_error_r (server, "read (%s): %s", glibtop_error_r (server, "read (%s): %s",
input, strerror (errno)); input, strerror (errno));
buffer [nread] = 0; buffer [nread] = 0;
strcpy (server->machine.proc_stat, buffer); close (fd);
close (fd);
}
/* This is from guile-utils/gtop/proc/readproc.c */ /* This is from guile-utils/gtop/proc/readproc.c */

9
sysdeps/linux/procstate.c
View File

@@ -48,12 +48,6 @@ glibtop_get_proc_state_s (glibtop *server, glibtop_proc_state *buf, pid_t pid)
return; return;
} }
server->machine.last_pid = pid;
server->machine.no_update = 0;
server->machine.proc_status [0] = 0;
server->machine.proc_statm [0] = 0;
server->machine.proc_stat [0] = 0;
sprintf (input, "/proc/%d/stat", pid); sprintf (input, "/proc/%d/stat", pid);
/* IMPORTANT NOTICE: For security reasons it is extremely important /* IMPORTANT NOTICE: For security reasons it is extremely important
@@ -80,9 +74,6 @@ glibtop_get_proc_state_s (glibtop *server, glibtop_proc_state *buf, pid_t pid)
buffer [nread] = 0; buffer [nread] = 0;
server->machine.last_pid = pid;
strcpy (server->machine.proc_stat, buffer);
/* This is from guile-utils/gtop/proc/readproc.c */ /* This is from guile-utils/gtop/proc/readproc.c */
/* split into "PID (cmd" and "<rest>" */ /* split into "PID (cmd" and "<rest>" */

38
sysdeps/linux/proctime.c
View File

@@ -47,36 +47,20 @@ glibtop_get_proc_time_s (glibtop *server, glibtop_proc_time *buf, pid_t pid)
return; return;
} }
if (pid != server->machine.last_pid) { sprintf (input, "/proc/%d/stat", pid);
server->machine.last_pid = pid;
server->machine.no_update = 0;
}
if (!server->machine.no_update) {
server->machine.proc_status [0] = 0;
server->machine.proc_statm [0] = 0;
server->machine.proc_stat [0] = 0;
}
if (server->machine.proc_stat [0]) {
strcpy (buffer, server->machine.proc_stat);
} else {
sprintf (input, "/proc/%d/stat", pid);
fd = open (input, O_RDONLY); fd = open (input, O_RDONLY);
if (fd == -1) if (fd == -1)
glibtop_error_r (server, "open (%s): %s", glibtop_error_r (server, "open (%s): %s",
input, strerror (errno)); input, strerror (errno));
nread = read (fd, buffer, BUFSIZ); nread = read (fd, buffer, BUFSIZ);
if (nread == -1) if (nread == -1)
glibtop_error_r (server, "read (%s): %s", glibtop_error_r (server, "read (%s): %s",
input, strerror (errno)); input, strerror (errno));
buffer [nread] = 0; buffer [nread] = 0;
strcpy (server->machine.proc_stat, buffer); close (fd);
close (fd);
}
/* This is from guile-utils/gtop/proc/readproc.c */ /* This is from guile-utils/gtop/proc/readproc.c */

65
sysdeps/linux/procuid.c
View File

@@ -51,36 +51,20 @@ glibtop_get_proc_uid_s (glibtop *server, glibtop_proc_uid *buf, pid_t pid)
return; return;
} }
if (pid != server->machine.last_pid) { sprintf (input, "/proc/%d/status", pid);
server->machine.last_pid = pid;
server->machine.no_update = 0;
}
if (!server->machine.no_update) {
server->machine.proc_status [0] = 0;
server->machine.proc_statm [0] = 0;
server->machine.proc_stat [0] = 0;
}
if (server->machine.proc_status [0]) {
strcpy (buffer, server->machine.proc_status);
} else {
sprintf (input, "/proc/%d/status", pid);
fd = open (input, O_RDONLY); fd = open (input, O_RDONLY);
if (fd == -1) if (fd == -1)
glibtop_error_r (server, "open (%s): %s", glibtop_error_r (server, "open (%s): %s",
input, strerror (errno)); input, strerror (errno));
nread = read (fd, buffer, BUFSIZ); nread = read (fd, buffer, BUFSIZ);
if (nread == -1) if (nread == -1)
glibtop_error_r (server, "read (%s): %s", glibtop_error_r (server, "read (%s): %s",
input, strerror (errno)); input, strerror (errno));
buffer [nread] = 0; buffer [nread] = 0;
strcpy (server->machine.proc_status, buffer); close (fd);
close (fd);
}
/* Search substring 'Pid:' */ /* Search substring 'Pid:' */
@@ -92,25 +76,20 @@ glibtop_get_proc_uid_s (glibtop *server, glibtop_proc_uid *buf, pid_t pid)
"Gid: %u %u %*u %*u\n", &buf->pid, &buf->ppid, "Gid: %u %u %*u %*u\n", &buf->pid, &buf->ppid,
&buf->uid, &buf->euid, &buf->gid, &buf->egid); &buf->uid, &buf->euid, &buf->gid, &buf->egid);
if (server->machine.proc_stat [0]) { sprintf (input, "/proc/%d/stat", pid);
strcpy (buffer, server->machine.proc_stat);
} else {
sprintf (input, "/proc/%d/stat", pid);
fd = open (input, O_RDONLY); fd = open (input, O_RDONLY);
if (fd == -1) if (fd == -1)
glibtop_error_r (server, "open (%s): %s", glibtop_error_r (server, "open (%s): %s",
input, strerror (errno)); input, strerror (errno));
nread = read (fd, buffer, BUFSIZ); nread = read (fd, buffer, BUFSIZ);
if (nread == -1) if (nread == -1)
glibtop_error_r (server, "read (%s): %s", glibtop_error_r (server, "read (%s): %s",
input, strerror (errno)); input, strerror (errno));
buffer [nread] = 0; buffer [nread] = 0;
strcpy (server->machine.proc_stat, buffer); close (fd);
close (fd);
}
/* This is from guile-utils/gtop/proc/readproc.c */ /* This is from guile-utils/gtop/proc/readproc.c */

20
sysdeps/linux/swap.c
View File

@@ -43,17 +43,10 @@ glibtop_get_swap_s (glibtop *server, glibtop_swap *buf)
buf->flags = _glibtop_sysdeps_swap; buf->flags = _glibtop_sysdeps_swap;
#ifdef GLIBTOP_CACHE_OPEN fd = open (FILENAME, O_RDONLY);
fd = server->machine.fd_meminfo; if (fd == -1)
#endif glibtop_error_r (server, "open (%s): %s",
if (fd == 0) { FILENAME, strerror (errno));
fd = open (FILENAME, O_RDONLY);
if (fd == -1)
glibtop_error_r (server, "open (%s): %s",
FILENAME, strerror (errno));
} else {
lseek (fd, 0, SEEK_SET);
}
ret = read (fd, buffer, BUFSIZ); ret = read (fd, buffer, BUFSIZ);
if (ret == -1) if (ret == -1)
@@ -64,13 +57,10 @@ glibtop_get_swap_s (glibtop *server, glibtop_swap *buf)
tmp = strchr (tmp+1, '\n'); tmp = strchr (tmp+1, '\n');
tmp = skip_token (tmp); /* "Swap:" */ tmp = skip_token (tmp); /* "Swap:" */
buf->total = strtoul (tmp, &tmp, 10); buf->total = strtoul (tmp, &tmp, 10);
buf->used = strtoul (tmp, &tmp, 10); buf->used = strtoul (tmp, &tmp, 10);
buf->free = strtoul (tmp, &tmp, 10); buf->free = strtoul (tmp, &tmp, 10);
#ifdef GLIBTOP_CACHE_OPEN
server->machine.fd_meminfo = fd;
#else
close (fd); close (fd);
#endif
} }