diff options
| author | Robert Roth <robert.roth.off@gmail.com> | 2017-05-12 05:08:41 +0300 |
|---|---|---|
| committer | Robert Roth <robert.roth.off@gmail.com> | 2017-05-12 05:08:41 +0300 |
| commit | 1bf16bfffd28e6724c35589e49db10a10cae594d (patch) | |
| tree | 1fc0bac8c4b8b3d60aa9374fb7893fefc1368ca8 /sysdeps/linux | |
| parent | c29d7de9a087ff781be5463f4d9efc9a8f6abbe4 (diff) | |
| download | libgtop-1bf16bfffd28e6724c35589e49db10a10cae594d.tar.gz | |
Renamed procdiskio to procio
Diffstat (limited to 'sysdeps/linux')
| -rw-r--r-- | sysdeps/linux/Makefile.am | 2 | ||||
| -rw-r--r-- | sysdeps/linux/glibtop_server.h | 2 | ||||
| -rw-r--r-- | sysdeps/linux/procio.c (renamed from sysdeps/linux/procdiskio.c) | 18 |
3 files changed, 11 insertions, 11 deletions
diff --git a/sysdeps/linux/Makefile.am b/sysdeps/linux/Makefile.am index 0657fdc2..7baabe0b 100644 --- a/sysdeps/linux/Makefile.am +++ b/sysdeps/linux/Makefile.am @@ -10,7 +10,7 @@ libgtop_sysdeps_2_0_la_SOURCES = open.c close.c cpu.c mem.c swap.c \ proctime.c procmem.c procsignal.c prockernel.c \ procsegment.c procargs.c procmap.c siglist.c \ sysinfo.c netload.c ppp.c glibtop_private.c \ - mountlist.c procaffinity.c procdiskio.c \ + mountlist.c procaffinity.c procio.c \ fsusage.c netlist.c procopenfiles.c procwd.c libgtop_sysdeps_2_0_la_LIBADD = @GLIB_LIBS@ diff --git a/sysdeps/linux/glibtop_server.h b/sysdeps/linux/glibtop_server.h index db81b71c..8e591eab 100644 --- a/sysdeps/linux/glibtop_server.h +++ b/sysdeps/linux/glibtop_server.h @@ -46,6 +46,6 @@ #define GLIBTOP_SUID_PROC_AFFINITY 0 #define GLIBTOP_SUID_PPP 0 #define GLIBTOP_SUID_PROC_FILE 0 -#define GLIBTOP_SUID_PROC_DISKIO 0 +#define GLIBTOP_SUID_PROC_IO 0 #endif /* __LINUX__GLIBTOP_SERVER_H__ */ diff --git a/sysdeps/linux/procdiskio.c b/sysdeps/linux/procio.c index 08bd5539..55a37fe9 100644 --- a/sysdeps/linux/procdiskio.c +++ b/sysdeps/linux/procio.c @@ -22,29 +22,29 @@ #include <config.h> #include <glibtop.h> #include <glibtop/error.h> -#include <glibtop/procdiskio.h> +#include <glibtop/procio.h> #include "glibtop_private.h" -static const unsigned long _glibtop_sysdeps_proc_diskio = -(1L << GLIBTOP_PROC_DISKIO_RCHAR) + (1L << GLIBTOP_PROC_DISKIO_WCHAR) + -(1L << GLIBTOP_PROC_DISKIO_RBYTES) + (1L << GLIBTOP_PROC_DISKIO_WBYTES); +static const unsigned long _glibtop_sysdeps_proc_io = +(1L << GLIBTOP_PROC_IO_RCHAR) + (1L << GLIBTOP_PROC_IO_WCHAR) + +(1L << GLIBTOP_PROC_IO_RBYTES) + (1L << GLIBTOP_PROC_IO_WBYTES); /* Init function. */ void -_glibtop_init_proc_diskio_s (glibtop *server) +_glibtop_init_proc_io_s (glibtop *server) { - server->sysdeps.proc_diskio = _glibtop_sysdeps_proc_diskio; + server->sysdeps.proc_io = _glibtop_sysdeps_proc_io; } /* Provides detailed information about a process. */ void -glibtop_get_proc_diskio_s (glibtop *server, glibtop_proc_diskio *buf, pid_t pid) +glibtop_get_proc_io_s (glibtop *server, glibtop_proc_io *buf, pid_t pid) { char buffer [BUFSIZ], *p; - memset (buf, 0, sizeof (glibtop_proc_diskio)); + memset (buf, 0, sizeof (glibtop_proc_io)); if (server->os_version_code < LINUX_VERSION_CODE(2, 6, 20)) return; @@ -66,5 +66,5 @@ glibtop_get_proc_diskio_s (glibtop *server, glibtop_proc_diskio *buf, pid_t pid) p = skip_token (p); buf->wbytes = g_ascii_strtoull (p, &p, 10); - buf->flags = _glibtop_sysdeps_proc_diskio; + buf->flags = _glibtop_sysdeps_proc_io; } |