summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorBenoît Dejean <bdejean@src.gnome.org>2004-07-17 12:09:01 +0000
committerBenoît Dejean <bdejean@src.gnome.org>2004-07-17 12:09:01 +0000
commit644b0ebcf520c654a2dd085984812cd314a47401 (patch)
treef37b49b35751788983f3fd9583723855804032df /include
parente5a855db7c639d1e7431c054767046c92f9cf144 (diff)
downloadlibgtop-644b0ebcf520c654a2dd085984812cd314a47401.tar.gz
Added read, write. This members provides total read and write in bytes
* include/glibtop/fsusage.h: Added read, write. This members provides total read and write in bytes since boot_time. * include/glibtop/netload.h: Added hwaddress : provides harware address, eg MAC address. mtu, address and subnet are now guint32.
Diffstat (limited to 'include')
-rw-r--r--include/glibtop/fsusage.h6
-rw-r--r--include/glibtop/netload.h21
2 files changed, 17 insertions, 10 deletions
diff --git a/include/glibtop/fsusage.h b/include/glibtop/fsusage.h
index 82e9c7ea..c6e489de 100644
--- a/include/glibtop/fsusage.h
+++ b/include/glibtop/fsusage.h
@@ -34,8 +34,9 @@ G_BEGIN_DECLS
#define GLIBTOP_FSUSAGE_FILES 3
#define GLIBTOP_FSUSAGE_FFREE 4
#define GLIBTOP_FSUSAGE_BLOCK_SIZE 5
-
-#define GLIBTOP_MAX_FSUSAGE 6
+#define GLIBTOP_FSUSAGE_READ 6
+#define GLIBTOP_FSUSAGE_WRITE 7
+#define GLIBTOP_MAX_FSUSAGE 8
typedef struct _glibtop_fsusage glibtop_fsusage;
@@ -49,6 +50,7 @@ struct _glibtop_fsusage
files, /* Total file nodes. */
ffree; /* Free file nodes. */
guint32 block_size; /* Size of a block in bytes. */
+ guint64 read, write; /* Total blocks read and written */
};
#define glibtop_get_fsusage(fsusage,disk) glibtop_get_fsusage_l(glibtop_global_server, fsusage, disk)
diff --git a/include/glibtop/netload.h b/include/glibtop/netload.h
index 1ef45ed8..e17893e1 100644
--- a/include/glibtop/netload.h
+++ b/include/glibtop/netload.h
@@ -46,8 +46,9 @@ G_BEGIN_DECLS
#define GLIBTOP_NETLOAD_ADDRESS6 14
#define GLIBTOP_NETLOAD_PREFIX6 15
#define GLIBTOP_NETLOAD_SCOPE6 16
+#define GLIBTOP_NETLOAD_HWADDRESS 17
-#define GLIBTOP_MAX_NETLOAD 17
+#define GLIBTOP_MAX_NETLOAD 18
typedef struct _glibtop_netload glibtop_netload;
@@ -82,11 +83,13 @@ enum GLIBTOP_IF_IN6_SCOPE
struct _glibtop_netload
{
guint64 flags,
- if_flags, /* GLIBTOP_NETLOAD_IF_FLAGS */
- mtu, /* GLIBTOP_NETLOAD_MTU */
+ if_flags; /* GLIBTOP_NETLOAD_IF_FLAGS */
+
+ guint32 mtu, /* GLIBTOP_NETLOAD_MTU */
subnet, /* GLIBTOP_NETLOAD_SUBNET */
- address, /* GLIBTOP_NETLOAD_ADDRESS */
- packets_in, /* GLIBTOP_NETLOAD_PACKETS_IN */
+ address; /* GLIBTOP_NETLOAD_ADDRESS */
+
+ guint64 packets_in, /* GLIBTOP_NETLOAD_PACKETS_IN */
packets_out, /* GLIBTOP_NETLOAD_PACKETS_OUT */
packets_total, /* GLIBTOP_NETLOAD_PACKETS_TOTAL*/
bytes_in, /* GLIBTOP_NETLOAD_BYTES_IN */
@@ -97,9 +100,11 @@ struct _glibtop_netload
errors_total, /* GLIBTOP_NETLOAD_ERRORS_TOTAL */
collisions; /* GLIBTOP_NETLOAD_COLLISIONS */
- guint8 address6[16];
- guint8 prefix6[16];
- guint8 scope6;
+ guint8 address6[16]; /* GLIBTOP_NETLOAD_ADDRESS6 */
+ guint8 prefix6[16]; /* GLIBTOP_NETLOAD_PREXIF6 */
+ guint8 scope6; /* GLIBTOP_NETLOAD_SCOPE6 */
+
+ guint8 hwaddress[8]; /* GLIBTOP_NETLOAD_HWADDRESS */
};
#define glibtop_get_netload(netload,interface) glibtop_get_netload_l(glibtop_global_server, netload, interface)