diff options
| author | Michael Catanzaro <mcatanzaro@gnome.org> | 2020-11-06 09:52:00 -0600 |
|---|---|---|
| committer | Michael Catanzaro <mcatanzaro@gnome.org> | 2020-11-06 09:52:00 -0600 |
| commit | ea08151ae6582a438db76b738293a0194c964b88 (patch) | |
| tree | 2456ecc117edf25ce43fecf625946a40e72007f6 /include/glibtop | |
| parent | 2229253e11ae5c729a703f0c72e006f46746c592 (diff) | |
| download | libgtop-ea08151ae6582a438db76b738293a0194c964b88.tar.gz | |
Revert "Code clean up and add example"
This reverts commit 7396970afe2290488fd072612a650353dd13a16d.
Diffstat (limited to 'include/glibtop')
| -rw-r--r-- | include/glibtop/Makefile.am | 2 | ||||
| -rw-r--r-- | include/glibtop/command.h | 3 | ||||
| -rw-r--r-- | include/glibtop/disk.h | 6 | ||||
| -rw-r--r-- | include/glibtop/union.h | 2 |
4 files changed, 4 insertions, 9 deletions
diff --git a/include/glibtop/Makefile.am b/include/glibtop/Makefile.am index da78ca93..6d0e055f 100644 --- a/include/glibtop/Makefile.am +++ b/include/glibtop/Makefile.am @@ -2,7 +2,7 @@ glibtopdir = $(includedir)/libgtop-2.0/glibtop glibtop_HEADERS = close.h loadavg.h prockernel.h procstate.h \ sem_limits.h uptime.h command.h mem.h proclist.h \ - proctime.h shm_limits.h cpu.h disk.h msg_limits.h \ + proctime.h shm_limits.h cpu.h msg_limits.h \ procmem.h procuid.h swap.h \ procsegment.h sysdeps.h global.h \ procsignal.h union.h gnuserv.h \ diff --git a/include/glibtop/command.h b/include/glibtop/command.h index 31e89589..9a0e47b1 100644 --- a/include/glibtop/command.h +++ b/include/glibtop/command.h @@ -60,9 +60,8 @@ G_BEGIN_DECLS #define GLIBTOP_CMND_PROC_WD 26 #define GLIBTOP_CMND_PROC_AFFINITY 27 #define GLIBTOP_CMND_PROC_IO 28 -#define GLIBTOP_CMND_DISK 29 -#define GLIBTOP_MAX_CMND 30 +#define GLIBTOP_MAX_CMND 29 #define _GLIBTOP_PARAM_SIZE 16 diff --git a/include/glibtop/disk.h b/include/glibtop/disk.h index 292924f6..cdde7796 100644 --- a/include/glibtop/disk.h +++ b/include/glibtop/disk.h @@ -46,20 +46,16 @@ struct _partition_info { char name[256]; char type[256]; - char raid_num[256]; + char raid_num[256]; int max; }; -typedef struct _partition_info partition_info; - struct _glibtop_disk { - guint64 flags; 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 */ guint64 xdisk_time_write [GLIBTOP_NDISK]; /* GLIBTOP_XDISK_TIME_WRITE */ - guint64 xdisk_flags; }; void glibtop_get_disk (glibtop_disk *buf); diff --git a/include/glibtop/union.h b/include/glibtop/union.h index eb57cfc0..bda7c576 100644 --- a/include/glibtop/union.h +++ b/include/glibtop/union.h @@ -61,7 +61,7 @@ typedef union _glibtop_union glibtop_union; union _glibtop_union { glibtop_cpu cpu; - glibtop_disk disk; + glibtop_disk disk; glibtop_mem mem; glibtop_swap swap; glibtop_uptime uptime; |