Renamed procdiskio to procio

5 files changed, 27 insertions, 27 deletions

diff --git a/include/glibtop/Makefile.am b/include/glibtop/Makefile.am
index b797385e..6d0e055f 100644
--- a/include/glibtop/Makefile.am
+++ b/include/glibtop/Makefile.am
@@ -9,7 +9,7 @@ glibtop_HEADERS		= close.h loadavg.h prockernel.h procstate.h \
 			  parameter.h mountlist.h fsusage.h procmap.h signal.h \
 			  sysinfo.h ppp.h procargs.h netload.h \
 			  procwd.h procaffinity.h \
-              procdiskio.h \
+              procio.h \
 			  netlist.h procopenfiles.h open.h
 
 noinst_HEADERS		= error.h write.h read_data.h read.h init_hooks.h machine.h \
diff --git a/include/glibtop/command.h b/include/glibtop/command.h
index 6e9dc079..9a0e47b1 100644
--- a/include/glibtop/command.h
+++ b/include/glibtop/command.h
@@ -59,7 +59,7 @@ G_BEGIN_DECLS
 #define GLIBTOP_CMND_PROC_OPEN_FILES	25
 #define GLIBTOP_CMND_PROC_WD		26
 #define GLIBTOP_CMND_PROC_AFFINITY	27
-#define GLIBTOP_CMND_PROC_DISKIO	28
+#define GLIBTOP_CMND_PROC_IO	28
 
 #define GLIBTOP_MAX_CMND		29
 
diff --git a/include/glibtop/procdiskio.h b/include/glibtop/procio.h
index 6545ab36..48e2c617 100644
--- a/include/glibtop/procdiskio.h
+++ b/include/glibtop/procio.h
@@ -19,27 +19,27 @@
    Boston, MA 02110-1301, USA.
 */
 
-#ifndef __GLIBTOP_PROCDISKIO_H__
-#define __GLIBTOP_PROCDISKIO_H__
+#ifndef __GLIBTOP_PROCIO_H__
+#define __GLIBTOP_PROCIO_H__
 
 #include <glibtop.h>
 #include <glibtop/global.h>
 
 G_BEGIN_DECLS
 
-#define GLIBTOP_PROC_DISKIO_RCHAR	0
-#define GLIBTOP_PROC_DISKIO_WCHAR	1
-#define GLIBTOP_PROC_DISKIO_RBYTES	2
-#define GLIBTOP_PROC_DISKIO_WBYTES	3
+#define GLIBTOP_PROC_IO_RCHAR	0
+#define GLIBTOP_PROC_IO_WCHAR	1
+#define GLIBTOP_PROC_IO_RBYTES	2
+#define GLIBTOP_PROC_IO_WBYTES	3
 
-#define GLIBTOP_MAX_PROC_DISKIO		3
+#define GLIBTOP_MAX_PROC_IO		3
 
-typedef struct _glibtop_proc_diskio	glibtop_proc_diskio;
+typedef struct _glibtop_proc_io	glibtop_proc_io;
 
 /* Time section */
 
 /**
- * glibtop_proc_diskio:
+ * glibtop_proc_io:
  * @rchar: The number of bytes which this task has caused to be read from storage. This
  * is simply the sum of bytes which this process passed to read() and pread(), also including tty IO,
  * and it is unaffected by whether or not actual physical disk IO was required.
@@ -51,10 +51,10 @@ typedef struct _glibtop_proc_diskio	glibtop_proc_diskio;
  * @wbytes: Attempt to count the number of bytes which this process caused to be sent to
  * the storage layer. This is done at page-dirtying time.
  *
- * Process disk io data filled by glibtop_get_proc_diskio().
+ * Process disk io data filled by glibtop_get_proc_io().
  *
  */
-struct _glibtop_proc_diskio
+struct _glibtop_proc_io
 {
     /*< private >*/
 	guint64	flags;
@@ -66,22 +66,22 @@ struct _glibtop_proc_diskio
 };
 
 
-void glibtop_get_proc_diskio (glibtop_proc_diskio *buf, pid_t pid);
+void glibtop_get_proc_io (glibtop_proc_io *buf, pid_t pid);
 
-#if GLIBTOP_SUID_PROC_DISKIO
-#define glibtop_get_proc_diskio_r	glibtop_get_proc_diskio_p
+#if GLIBTOP_SUID_PROC_IO
+#define glibtop_get_proc_io_r	glibtop_get_proc_io_p
 #else
-#define glibtop_get_proc_diskio_r	glibtop_get_proc_diskio_s
+#define glibtop_get_proc_io_r	glibtop_get_proc_io_s
 #endif
 
-void glibtop_get_proc_diskio_l (glibtop *server, glibtop_proc_diskio *buf, pid_t pid);
+void glibtop_get_proc_io_l (glibtop *server, glibtop_proc_io *buf, pid_t pid);
 
-#if GLIBTOP_SUID_PROC_DISKIO
-void _glibtop_init_proc_diskio_p (glibtop *server);
-void glibtop_get_proc_diskio_p (glibtop *server, glibtop_proc_diskio *buf, pid_t pid);
+#if GLIBTOP_SUID_PROC_IO
+void _glibtop_init_proc_io_p (glibtop *server);
+void glibtop_get_proc_io_p (glibtop *server, glibtop_proc_io *buf, pid_t pid);
 #else
-void _glibtop_init_proc_diskio_s (glibtop *server);
-void glibtop_get_proc_diskio_s (glibtop *server, glibtop_proc_diskio *buf, pid_t pid);
+void _glibtop_init_proc_io_s (glibtop *server);
+void glibtop_get_proc_io_s (glibtop *server, glibtop_proc_io *buf, pid_t pid);
 #endif
 
 
diff --git a/include/glibtop/sysdeps.h b/include/glibtop/sysdeps.h
index 39c2dad2..6b5682df 100644
--- a/include/glibtop/sysdeps.h
+++ b/include/glibtop/sysdeps.h
@@ -53,7 +53,7 @@ G_BEGIN_DECLS
 #define GLIBTOP_SYSDEPS_PROC_OPEN_FILES	24
 #define GLIBTOP_SYSDEPS_PROC_WD		25
 #define GLIBTOP_SYSDEPS_PROC_AFFINITY	26
-#define GLIBTOP_SYSDEPS_PROC_DISKIO	27
+#define GLIBTOP_SYSDEPS_PROC_IO	27
 
 #define GLIBTOP_MAX_SYSDEPS		28
 
@@ -94,7 +94,7 @@ struct _glibtop_sysdeps
 	guint64 ppp;			/* glibtop_ppp		*/
 	guint64	proc_wd;		/* glibtop_proc_wd	*/
 	guint64	proc_affinity;		/* glibtop_proc_affinity */
-	guint64	proc_diskio;		/* glibtop_proc_diskio */
+	guint64	proc_io;		/* glibtop_proc_io */
 };
 
 void glibtop_get_sysdeps (glibtop_sysdeps *buf);
diff --git a/include/glibtop/union.h b/include/glibtop/union.h
index 9148c408..334f0217 100644
--- a/include/glibtop/union.h
+++ b/include/glibtop/union.h
@@ -44,7 +44,7 @@
 #include <glibtop/procopenfiles.h>
 #include <glibtop/procwd.h>
 #include <glibtop/procaffinity.h>
-#include <glibtop/procdiskio.h>
+#include <glibtop/procio.h>
 
 #include <glibtop/mountlist.h>
 #include <glibtop/fsusage.h>
@@ -85,7 +85,7 @@ union _glibtop_union
 	glibtop_proc_open_files proc_open_files;
 	glibtop_proc_wd		proc_wd;
 	glibtop_proc_affinity	proc_affinity;
-	glibtop_proc_diskio	proc_diskio;
+	glibtop_proc_io	proc_io;
 };
 
 G_END_DECLS