Chillcraft/libgtop
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added pagein/pageout for linux 2.6.

Browse Source 
* swap.c: (glibtop_get_swap_s): Added pagein/pageout for linux 2.6.
This commit is contained in:
Benoît Dejean
2005-06-13 09:03:41 +00:00
parent c19ba1af03
commit ef2ed50bf7
2 changed files with 35 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sysdeps/linux/ChangeLog
View File

@@ -1,3 +1,7 @@
2005-06-13 Benoît Dejean <TazForEver@dlfp.org>
* swap.c: (glibtop_get_swap_s): Added pagein/pageout for linux 2.6.
2005-05-26 Benoît Dejean <TazForEver@dlfp.org> 2005-05-26 Benoît Dejean <TazForEver@dlfp.org>
* siglist.c: Fixed compilation on mips. Closes #304570. * siglist.c: Fixed compilation on mips. Closes #304570.

38
sysdeps/linux/swap.c
View File

@@ -49,6 +49,7 @@ glibtop_init_swap_s (glibtop *server)
#define MEMINFO "/proc/meminfo" #define MEMINFO "/proc/meminfo"
#define PROC_STAT "/proc/stat" #define PROC_STAT "/proc/stat"
#define PROC_VMSTAT "/proc/vmstat"
void void
glibtop_get_swap_s (glibtop *server, glibtop_swap *buf) glibtop_get_swap_s (glibtop *server, glibtop_swap *buf)
@@ -69,15 +70,38 @@ glibtop_get_swap_s (glibtop *server, glibtop_swap *buf)
buf->flags = _glibtop_sysdeps_swap; buf->flags = _glibtop_sysdeps_swap;
file_to_buffer(server, buffer, PROC_STAT);
p = strstr (buffer, "\nswap"); if(server->os_version_code >= LINUX_VERSION_CODE(2, 6, 0))
if (p == NULL) return; {
file_to_buffer (server, buffer, PROC_VMSTAT);
p = skip_token (p); p = strstr (buffer, "\npswpin");
buf->pagein = strtoull (p, &p, 0); if(p)
buf->pageout = strtoull (p, &p, 0); {
p = skip_token(p);
buf->pagein = strtoull (p, &p, 0);
buf->flags |= _glibtop_sysdeps_swap_paging; p = skip_token(p);
buf->pageout = strtoull (p, &p, 0);
buf->flags |= _glibtop_sysdeps_swap_paging;
}
}
else /* Linux 2.4 */
{
file_to_buffer (server, buffer, PROC_STAT);
p = strstr (buffer, "\nswap");
if(p)
{
p = skip_token (p);
buf->pagein = strtoull (p, &p, 0);
buf->pageout = strtoull (p, &p, 0);
buf->flags |= _glibtop_sysdeps_swap_paging;
}
}
} }