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

Revert "Revert "Updated config and added reference""

Browse Source 
This reverts commit 2229253e11.
This commit is contained in:
James Dominic P. Guana
2021-04-10 18:20:28 +08:00
committed by Robert Roth
parent 2ec1815e6c
commit b738a0ae09
6 changed files with 84 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@@ -8,16 +8,16 @@ m4_define([libgtop_micro_version], [0])
m4_define([libgtop_version], [libgtop_major_version.libgtop_minor_version.libgtop_micro_version])
dnl increment if the interface has additions, changes, removals.
m4_define([libgtop_current], [11])
m4_define([libgtop_current], [12])
dnl increment any time the source changes; set to
dnl 0 if you increment CURRENT
m4_define([libgtop_revision], [1])
m4_define([libgtop_revision], [0])
dnl increment if any interfaces have been added; set to 0
dnl if any interfaces have been removed. removal has
dnl precedence over adding, so set to 0 if both happened.
m4_define([libgtop_age], [0])
m4_define([libgtop_age], [1])
# Increase each time you change the client/server protocol.
m4_define([libgtop_server_version], [5])

1
doc/main.texi
View File

@@ -49,6 +49,7 @@ System Dependent Functions
* glibtop_proc_map:: Process Memory Maps.
* glibtop_netload:: Network Load.
* glibtop_ppp:: PPP Usage.
* glibtop_disk:: DISK Usage.
Common Functions

59
doc/reference.texi
View File

@@ -28,6 +28,7 @@
* glibtop_proc_map:: Process Memory Maps.
* glibtop_netload:: Network Load.
* glibtop_ppp:: PPP Usage.
* glibtop_disk:: DISK Usage.
@end menu
@node glibtop_cpu, glibtop_mem, System Dependent, System Dependent
@@ -1343,7 +1344,7 @@ enum @{
@end example
@page
@node glibtop_ppp, , glibtop_netload, System Dependent
@node glibtop_ppp, glibtop_disk, glibtop_netload, System Dependent
@subsection PPP Statistics
Library function @code{glibtop_get_ppp}:
@@ -1403,6 +1404,62 @@ We're currently offline.
We're currently online.
@end table
@page
@node glibtop_disk, , glibtop_ppp, System Dependent
@subsection DISK Usage
Library function @code{glibtop_get_disk}:
@example
@cartouche
void glibtop_get_disk (glibtop_disk *buf);
void glibtop_get_disk_l (glibtop *server, glibtop_disk *buf);
@end cartouche
@end example
Declaration of @code{glibtop_disk} in @file{<glibtop/disk.h>}:
@example
@cartouche
typedef struct _glibtop_disk glibtop_disk;
struct _glibtop_disk
@{
xdisk_sectors_read [GLIBTOP_NDISK],
xdisk_time_read [GLIBTOP_NDISK],
xdisk_sectors_write [GLIBTOP_NDISK],
xdisk_time_write [GLIBTOP_NDISK],
@};
@end cartouche
@end example
All DISK reads and writes are measured by @dfn{sectors} which are normally 512 bytes each.
All disk time are measured in milliseconds which is 1/1000th of a second.
@table @code
@item xdisk_sectors_read
Number of sectors read since system boot.
@item xdisk_time_read
Number of milliseconds spent reading since system boot.
@item xdisk_sectors_write
Number of sectors written since system boot.
@item xdisk_time_write
Number of milliseconds spent writing since system boot.
@end table
The @samp{xdisk_} are values from arrays of @code{GLIBTOP_NDISK} (defined in
@file{<glibtop/disk.h>}) elements and contain one value for each DISK
in the system.
Please note that all of the disk values are absolute values measured in
certain units since system boot. To get bandwidth values (bytes/s), you need to call @code{glibtop_disk}, save the
result, wait some time and then call it again and divide the differences of
the two values by the time spent reading or writing.
@page
@node Common Functions, Library Functions, System Dependent, Reference Manual
@section Common Functions

22
doc/reference/libgtop-sections.txt
View File

@@ -682,24 +682,10 @@ glibtop_get_cpu_s
<INCLUDE>glibtop/disk.h</INCLUDE>
<SECTION>
<FILE>disk</FILE>
GLIBTOP_DISK_TOTAL
GLIBTOP_DISK_USER
GLIBTOP_DISK_NICE
GLIBTOP_DISK_SYS
GLIBTOP_DISK_IDLE
GLIBTOP_DISK_FREQUENCY
GLIBTOP_XDISK_TOTAL
GLIBTOP_XDISK_USER
GLIBTOP_XDISK_NICE
GLIBTOP_XDISK_SYS
GLIBTOP_XDISK_IDLE
GLIBTOP_XDISK_FLAGS
GLIBTOP_DISK_IOWAIT
GLIBTOP_DISK_IRQ
GLIBTOP_DISK_SOFTIRQ
GLIBTOP_XDISK_IOWAIT
GLIBTOP_XDISK_IRQ
GLIBTOP_XDISK_SOFTIRQ
LIBTOP_XDISK_SECTORS_READ
GLIBTOP_XDISK_TIME_READ
GLIBTOP_XDISK_SECTORS_WRITE
GLIBTOP_XDISK_TIME_WRITE
GLIBTOP_MAX_DISK
GLIBTOP_NDISK
glibtop_disk

2
include/glibtop/disk.h
View File

@@ -54,7 +54,7 @@ typedef struct _partition_info partition_info;
struct _glibtop_disk
{
guint64 flags;
guint64 flags; /* NOT USED YET */
guint64 xdisk_sectors_read [GLIBTOP_NDISK]; /* GLIBTOP_XDISK_SECTORS_READ */
guint64 xdisk_time_read [GLIBTOP_NDISK]; /* GLIBTOP_XDISK_TIME_READ */
guint64 xdisk_sectors_write [GLIBTOP_NDISK]; /* GLIBTOP_XDISK_SECTORS_WRITE */

31
sysdeps/linux/disk.c
View File

@@ -51,7 +51,7 @@ void
find_primary_part (partition_info *primary_part, const char *m)
{
int n = 0, tlvl = 0;
char name[256]="",type[256]="";
char name[256]="", type[256]="";
primary_part->max = 0;
@@ -92,13 +92,7 @@ find_primary_part (partition_info *primary_part, const char *m)
n--;
}
else if ((strcmp (type, "lvm") == 0)) {
tlvl = 2;
primary_part->max++;
}
else if ((strncmp (type, "raid", 4) == 0)) {
else if ((strcmp (type, "lvm") == 0) || (strncmp (type, "raid", 4) == 0)) {
tlvl = 2;
primary_part->max++;
@@ -115,23 +109,14 @@ find_primary_part (partition_info *primary_part, const char *m)
primary_part->max++;
}
else if ((strcmp (primary_part[n-1].type, "lvm") == 0) && (strcmp (type, "lvm") == 0)) {
else if ((strcmp (primary_part[n-1].type, "lvm") == 0) && (strcmp (type, "lvm") == 0) ||
(strcmp (primary_part[n-1].type, "raid") == 0) && (strncmp (type, "raid", 4) == 0)) {
n--;
}
else if ((strcmp (primary_part[n-1].type, "raid") == 0) && (strncmp (type, "raid", 4) == 0)) {
n--;
}
else if ((strcmp (primary_part[n-1].type, "lvm") == 0) && (strcmp (type, "part") == 0)) {
n--;
tlvl = 1;
}
else if ((strcmp (primary_part[n-1].type, "raid") == 0) && (strcmp (type, "part") == 0)) {
else if ((strcmp (primary_part[n-1].type, "lvm") == 0) && (strcmp (type, "part") == 0) ||
(strcmp (primary_part[n-1].type, "raid") == 0) && (strcmp (type, "part") == 0)) {
n--;
tlvl = 1;
@@ -171,6 +156,7 @@ find_primary_part (partition_info *primary_part, const char *m)
tlvl = 1;
}
}
@@ -195,11 +181,12 @@ is_virtual_drive (partition_info *primary_part, const char *p)
int i;
char name[256];
int test = 1;
sscanf (p, "%s", name);
if (*p) {
for (i=0; i<primary_part->max; i++) {
for (i=0; i < primary_part->max; i++) {
if (strcmp (primary_part[i].name, name) == 0) {