[libgtop] Revert "New API to retrieve disk stats in Linux"
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgtop] Revert "New API to retrieve disk stats in Linux"
- Date: Fri, 6 Nov 2020 15:51:59 +0000 (UTC)
commit 7e214414bf23d1ea34e7fdccb17a7f41040ffea9
Author: Michael Catanzaro <mcatanzaro gnome org>
Date: Fri Nov 6 09:52:01 2020 -0600
Revert "New API to retrieve disk stats in Linux"
This reverts commit 9e62440b314fbf87bbeca865a4223311314c52a3.
glibtop.h | 2 -
include/glibtop/disk.h | 74 -------------------------------
include/glibtop/sysdeps.h | 4 +-
include/glibtop/union.h | 2 -
lib/Makefile.am | 2 +-
lib/command.c | 1 -
lib/libgtop.sym | 2 -
lib/sysdeps.c | 4 --
src/daemon/main.c | 4 --
sysdeps/common/default.c | 14 ------
sysdeps/common/sysdeps_suid.c | 3 --
sysdeps/linux/Makefile.am | 2 +-
sysdeps/linux/disk.c | 96 -----------------------------------------
sysdeps/linux/glibtop_private.c | 18 --------
sysdeps/linux/glibtop_private.h | 3 --
sysdeps/linux/glibtop_server.h | 1 -
sysdeps/stub/disk.c | 42 ------------------
sysdeps/stub/glibtop_server.h | 1 -
18 files changed, 3 insertions(+), 272 deletions(-)
---
diff --git a/glibtop.h b/glibtop.h
index 804294da..3542249a 100644
--- a/glibtop.h
+++ b/glibtop.h
@@ -80,8 +80,6 @@ struct _glibtop
int socket; /* Accepted connection of a socket */
int ncpu; /* Number of CPUs, zero if single-processor */
int real_ncpu; /* Real number of CPUs. Only ncpu are monitored */
- int ndisk; /* Number of DISKs, zero if single-disk */
- int real_ndisk; /* Number of PHYSICAL DISKs. Only ncpu is monitored */
unsigned long os_version_code; /* Version code of the operating system */
const char *name; /* Program name for error messages */
const char *server_command; /* Command used to invoke server */
diff --git a/include/glibtop/sysdeps.h b/include/glibtop/sysdeps.h
index a1db66d8..a18c69e6 100644
--- a/include/glibtop/sysdeps.h
+++ b/include/glibtop/sysdeps.h
@@ -54,9 +54,8 @@ G_BEGIN_DECLS
#define GLIBTOP_SYSDEPS_PROC_WD 25
#define GLIBTOP_SYSDEPS_PROC_AFFINITY 26
#define GLIBTOP_SYSDEPS_PROC_IO 27
-#define GLIBTOP_SYSDEPS_DISK 28
-#define GLIBTOP_MAX_SYSDEPS 29
+#define GLIBTOP_MAX_SYSDEPS 28
/* The 'features' args to glibtop_init_* is an unsigned long */
G_STATIC_ASSERT((1UL << (GLIBTOP_MAX_SYSDEPS - 1)) <= ULONG_MAX);
@@ -70,7 +69,6 @@ struct _glibtop_sysdeps
guint64 flags;
guint64 features; /* server features */
guint64 cpu; /* glibtop_cpu */
- guint64 disk; /* glibtop_cpu */
guint64 mem; /* glibtop_mem */
guint64 swap; /* glibtop_swap */
guint64 uptime; /* glibtop_uptime */
diff --git a/include/glibtop/union.h b/include/glibtop/union.h
index bda7c576..334f0217 100644
--- a/include/glibtop/union.h
+++ b/include/glibtop/union.h
@@ -23,7 +23,6 @@
#define __GLIBTOP_UNION_H__
#include <glibtop/cpu.h>
-#include <glibtop/disk.h>
#include <glibtop/mem.h>
#include <glibtop/swap.h>
#include <glibtop/uptime.h>
@@ -61,7 +60,6 @@ typedef union _glibtop_union glibtop_union;
union _glibtop_union
{
glibtop_cpu cpu;
- glibtop_disk disk;
glibtop_mem mem;
glibtop_swap swap;
glibtop_uptime uptime;
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 5a6f6511..90b82861 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -29,7 +29,7 @@ if HAVE_INTROSPECTION
introspection_sources = $(libgtop_2_0_la_SOURCES) lib.c ../glibtop.h ../libgtopconfig.h \
../include/glibtop/close.h ../include/glibtop/loadavg.h
../include/glibtop/prockernel.h ../include/glibtop/procstate.h \
../include/glibtop/sem_limits.h ../include/glibtop/uptime.h
../include/glibtop/command.h ../include/glibtop/mem.h ../include/glibtop/proclist.h \
- ../include/glibtop/proctime.h ../include/glibtop/shm_limits.h
../include/glibtop/cpu.h ../include/glibtop/disk.h ../include/glibtop/msg_limits.h \
+ ../include/glibtop/proctime.h ../include/glibtop/shm_limits.h
../include/glibtop/cpu.h ../include/glibtop/msg_limits.h \
../include/glibtop/procmem.h ../include/glibtop/procuid.h ../include/glibtop/swap.h \
../include/glibtop/procsegment.h ../include/glibtop/sysdeps.h
../include/glibtop/global.h \
../include/glibtop/procsignal.h ../include/glibtop/union.h
../include/glibtop/gnuserv.h \
diff --git a/lib/command.c b/lib/command.c
index cf2270e0..b6ccf1f2 100644
--- a/lib/command.c
+++ b/lib/command.c
@@ -43,7 +43,6 @@ glibtop_call_l (glibtop *server, unsigned command, size_t send_size,
CHECK_CMND(GLIBTOP_CMND_QUIT);
CHECK_CMND(GLIBTOP_CMND_SYSDEPS);
CHECK_CMND(GLIBTOP_CMND_CPU);
- CHECK_CMND(GLIBTOP_CMND_DISK);
CHECK_CMND(GLIBTOP_CMND_MEM);
CHECK_CMND(GLIBTOP_CMND_SWAP);
CHECK_CMND(GLIBTOP_CMND_UPTIME);
diff --git a/lib/libgtop.sym b/lib/libgtop.sym
index 60316a72..afa9d070 100644
--- a/lib/libgtop.sym
+++ b/lib/libgtop.sym
@@ -3,8 +3,6 @@ glibtop_close
glibtop_close_r
glibtop_get_cpu
glibtop_get_cpu_l
-glibtop_get_disk
-glibtop_get_disk_l
glibtop_get_fsusage
glibtop_get_fsusage_l
glibtop_get_loadavg
diff --git a/lib/sysdeps.c b/lib/sysdeps.c
index 96292568..2a761576 100644
--- a/lib/sysdeps.c
+++ b/lib/sysdeps.c
@@ -27,7 +27,6 @@
const unsigned long glibtop_server_features =
GLIBTOP_SUID_CPU +
-GLIBTOP_SUID_DISK +
GLIBTOP_SUID_MEM +
GLIBTOP_SUID_SWAP +
GLIBTOP_SUID_UPTIME +
@@ -57,9 +56,6 @@ const _glibtop_init_func_t _glibtop_init_hook_s [] = {
#if !GLIBTOP_SUID_CPU
_glibtop_init_cpu_s,
#endif
-#if !GLIBTOP_SUID_DISK
- _glibtop_init_disk_s,
-#endif
#if !GLIBTOP_SUID_MEM
_glibtop_init_mem_s,
#endif
diff --git a/src/daemon/main.c b/src/daemon/main.c
index 34cbaf50..b51addf6 100644
--- a/src/daemon/main.c
+++ b/src/daemon/main.c
@@ -97,10 +97,6 @@ handle_parent_connection (int s)
glibtop_get_cpu_l (server, &resp->u.data.cpu);
do_output (s, resp, _offset_data (cpu), 0, NULL);
break;
- case GLIBTOP_CMND_DISK:
- glibtop_get_disk_l (server, &resp->u.disk.cpu);
- do_output (s, resp, _offset_data (disk), 0, NULL);
- break;
case GLIBTOP_CMND_MEM:
glibtop_get_mem_l (server, &resp->u.data.mem);
do_output (s, resp, _offset_data (mem), 0, NULL);
diff --git a/sysdeps/common/default.c b/sysdeps/common/default.c
index c20f2938..e3b096f2 100644
--- a/sysdeps/common/default.c
+++ b/sysdeps/common/default.c
@@ -64,20 +64,6 @@ glibtop_get_cpu(glibtop_cpu *buf)
}
-/**
- * glibtop_get_disk:
- * @buf: A location to return the disk usage.
- *
- * Get the DISK usage.
- *
- */
-void
-glibtop_get_cpu(glibtop_cpu *buf)
-{
- glibtop_get_cpu_l(glibtop_global_server, buf);
-}
-
-
/**
* glibtop_get_fsusage:
* @buf: A location to return the file system usage.
diff --git a/sysdeps/common/sysdeps_suid.c b/sysdeps/common/sysdeps_suid.c
index ecb1d53e..24953176 100644
--- a/sysdeps/common/sysdeps_suid.c
+++ b/sysdeps/common/sysdeps_suid.c
@@ -30,9 +30,6 @@ const _glibtop_init_func_t _glibtop_init_hook_p [] = {
#if GLIBTOP_SUID_CPU
_glibtop_init_cpu_p,
#endif
-#if GLIBTOP_SUID_DISK
- _glibtop_init_disk_p,
-#endif
#if GLIBTOP_SUID_MEM
_glibtop_init_mem_p,
#endif
diff --git a/sysdeps/linux/Makefile.am b/sysdeps/linux/Makefile.am
index c51bb155..fdd54696 100644
--- a/sysdeps/linux/Makefile.am
+++ b/sysdeps/linux/Makefile.am
@@ -4,7 +4,7 @@ noinst_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
EXTRA_DIST = procmap_smaps.gperf procmap_smaps.c
-libgtop_sysdeps_2_0_la_SOURCES = open.c close.c cpu.c disk.c mem.c swap.c \
+libgtop_sysdeps_2_0_la_SOURCES = open.c close.c cpu.c mem.c swap.c \
uptime.c loadavg.c shm_limits.c msg_limits.c \
sem_limits.c proclist.c procstate.c procuid.c \
proctime.c procmem.c procsignal.c prockernel.c \
diff --git a/sysdeps/linux/glibtop_private.c b/sysdeps/linux/glibtop_private.c
index 7b36561c..d3a49aa6 100644
--- a/sysdeps/linux/glibtop_private.c
+++ b/sysdeps/linux/glibtop_private.c
@@ -57,24 +57,6 @@ skip_token (const char *p)
}
-int
-check_alphanumeric_word (const char *p)
-{
- int test = 0;
- p = next_token(p);
- while (*p && !g_ascii_isspace(*p)) {
- if(g_ascii_isalpha(*p)){
- test = 0;
- }else if(g_ascii_isdigit(*p)){
- test = 1;
- }
- p++;
- };
- p = next_token(p);
- return test;
-}
-
-
/*
* Read functions
*/
diff --git a/sysdeps/linux/glibtop_private.h b/sysdeps/linux/glibtop_private.h
index d42ee669..03761f4f 100644
--- a/sysdeps/linux/glibtop_private.h
+++ b/sysdeps/linux/glibtop_private.h
@@ -61,9 +61,6 @@ skip_line (const char *p)
return (char *) (*p ? p+1 : p);
}
-int
-check_alphanumeric_word (const char *p);
-
/*
* Smart strtoul which handles binary suffixes
* e.g: get_scaled("Size: 32 kB", "Size:") == 32768
diff --git a/sysdeps/linux/glibtop_server.h b/sysdeps/linux/glibtop_server.h
index 43dd9d9f..6240d5de 100644
--- a/sysdeps/linux/glibtop_server.h
+++ b/sysdeps/linux/glibtop_server.h
@@ -23,7 +23,6 @@
#define __LINUX__GLIBTOP_SERVER_H__
#define GLIBTOP_SUID_CPU 0
-#define GLIBTOP_SUID_DISK 0
#define GLIBTOP_SUID_MEM 0
#define GLIBTOP_SUID_SWAP 0
#define GLIBTOP_SUID_UPTIME 0
diff --git a/sysdeps/stub/glibtop_server.h b/sysdeps/stub/glibtop_server.h
index 0f8bd194..1dd18bf0 100644
--- a/sysdeps/stub/glibtop_server.h
+++ b/sysdeps/stub/glibtop_server.h
@@ -25,7 +25,6 @@
G_BEGIN_DECLS
#define GLIBTOP_SUID_CPU 0
-#define GLIBTOP_SUID_DISK 0
#define GLIBTOP_SUID_MEM 0
#define GLIBTOP_SUID_SWAP 0
#define GLIBTOP_SUID_UPTIME 0
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]