From: Sebastien GODARD <sysstat@users.noreply.github.com>
Date: Wed, 28 Dec 2022 15:19:53 +0000 (+0100)
Subject: Move some definitions from common.h to rd_stats.h
X-Git-Tag: v12.7.2~28
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=78b9645506fbc8ab4e8d91185979256ae77715ea;p=sysstat

Move some definitions from common.h to rd_stats.h

proc and sys files which are used only by sadc are moved to rd_stats.h
file.

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
---

diff --git a/common.h b/common.h
index 4c1d184..e4cf46a 100644
--- a/common.h
+++ b/common.h
@@ -85,19 +85,11 @@ enum {
 #define SYSFS_BLOCK		SLASH_SYS "/" __BLOCK
 #define SYSFS_DEV_BLOCK		SLASH_SYS "/" __DEV_BLOCK
 #define SYSFS_DEVCPU		PRE "/sys/devices/system/cpu"
-#define SYSFS_TIME_IN_STATE	"cpufreq/stats/time_in_state"
 #define S_STAT			"stat"
 #define DEVMAP_DIR		PRE "/dev/mapper"
 #define DEVICES			PRE "/proc/devices"
-#define SYSFS_USBDEV		PRE "/sys/bus/usb/devices"
 #define DEV_DISK_BY		PRE "/dev/disk/by"
 #define DEV_DISK_BY_ID		PRE "/dev/disk/by-id"
-#define SYSFS_IDVENDOR		"idVendor"
-#define SYSFS_IDPRODUCT		"idProduct"
-#define SYSFS_BMAXPOWER		"bMaxPower"
-#define SYSFS_MANUFACTURER	"manufacturer"
-#define SYSFS_PRODUCT		"product"
-#define SYSFS_FCHOST		PRE "/sys/class/fc_host"
 
 #define MAX_FILE_LEN		512
 #define MAX_PF_NAME		1024
diff --git a/rd_stats.h b/rd_stats.h
index 02bb9ba..0699aff 100644
--- a/rd_stats.h
+++ b/rd_stats.h
@@ -49,36 +49,44 @@
  */
 
 /* Files */
-#define SERIAL		PRE "/proc/tty/driver/serial"
-#define FDENTRY_STATE	PRE "/proc/sys/fs/dentry-state"
-#define FFILE_NR	PRE "/proc/sys/fs/file-nr"
-#define FINODE_STATE	PRE "/proc/sys/fs/inode-state"
-#define PTY_NR		PRE "/proc/sys/kernel/pty/nr"
-#define NET_DEV		PRE "/proc/net/dev"
-#define NET_SOCKSTAT	PRE "/proc/net/sockstat"
-#define NET_SOCKSTAT6	PRE "/proc/net/sockstat6"
-#define NET_RPC_NFS	PRE "/proc/net/rpc/nfs"
-#define NET_RPC_NFSD	PRE "/proc/net/rpc/nfsd"
-#define NET_SOFTNET	PRE "/proc/net/softnet_stat"
-#define LOADAVG		PRE "/proc/loadavg"
-#define PRESSURE	PRE "/proc/pressure"
-#define PSI_CPU		PRESSURE "/cpu"
-#define PSI_IO		PRESSURE "/io"
-#define PSI_MEM		PRESSURE "/memory"
-#define VMSTAT		PRE "/proc/vmstat"
-#define NET_SNMP	PRE "/proc/net/snmp"
-#define NET_SNMP6	PRE "/proc/net/snmp6"
-#define CPUINFO		PRE "/proc/cpuinfo"
-#define MTAB		PRE "/etc/mtab"
-#define IF_DUPLEX	PRE "/sys/class/net/%s/duplex"
-#define IF_SPEED	PRE "/sys/class/net/%s/speed"
-#define FC_RX_FRAMES	"%s/%s/statistics/rx_frames"
-#define FC_TX_FRAMES	"%s/%s/statistics/tx_frames"
-#define FC_RX_WORDS	"%s/%s/statistics/rx_words"
-#define FC_TX_WORDS	"%s/%s/statistics/tx_words"
-#define SYSFS_PWR_SUPPLY PRE "/sys/class/power_supply"
-#define BAT_CAPACITY	"%s/%s/capacity"
-#define BAT_STATUS	"%s/%s/status"
+#define SERIAL			PRE "/proc/tty/driver/serial"
+#define FDENTRY_STATE		PRE "/proc/sys/fs/dentry-state"
+#define FFILE_NR		PRE "/proc/sys/fs/file-nr"
+#define FINODE_STATE		PRE "/proc/sys/fs/inode-state"
+#define PTY_NR			PRE "/proc/sys/kernel/pty/nr"
+#define NET_DEV			PRE "/proc/net/dev"
+#define NET_SOCKSTAT		PRE "/proc/net/sockstat"
+#define NET_SOCKSTAT6		PRE "/proc/net/sockstat6"
+#define NET_RPC_NFS		PRE "/proc/net/rpc/nfs"
+#define NET_RPC_NFSD		PRE "/proc/net/rpc/nfsd"
+#define NET_SOFTNET		PRE "/proc/net/softnet_stat"
+#define LOADAVG			PRE "/proc/loadavg"
+#define PRESSURE		PRE "/proc/pressure"
+#define PSI_CPU			PRESSURE "/cpu"
+#define PSI_IO			PRESSURE "/io"
+#define PSI_MEM			PRESSURE "/memory"
+#define VMSTAT			PRE "/proc/vmstat"
+#define NET_SNMP		PRE "/proc/net/snmp"
+#define NET_SNMP6		PRE "/proc/net/snmp6"
+#define CPUINFO			PRE "/proc/cpuinfo"
+#define MTAB			PRE "/etc/mtab"
+#define IF_DUPLEX		PRE "/sys/class/net/%s/duplex"
+#define IF_SPEED		PRE "/sys/class/net/%s/speed"
+#define FC_RX_FRAMES		"%s/%s/statistics/rx_frames"
+#define FC_TX_FRAMES		"%s/%s/statistics/tx_frames"
+#define FC_RX_WORDS		"%s/%s/statistics/rx_words"
+#define FC_TX_WORDS		"%s/%s/statistics/tx_words"
+#define SYSFS_USBDEV		PRE "/sys/bus/usb/devices"
+#define SYSFS_TIME_IN_STATE	"cpufreq/stats/time_in_state"
+#define SYSFS_IDVENDOR		"idVendor"
+#define SYSFS_IDPRODUCT		"idProduct"
+#define SYSFS_BMAXPOWER		"bMaxPower"
+#define SYSFS_MANUFACTURER	"manufacturer"
+#define SYSFS_PRODUCT		"product"
+#define SYSFS_FCHOST		PRE "/sys/class/fc_host"
+#define SYSFS_PWR_SUPPLY	PRE "/sys/class/power_supply"
+#define BAT_CAPACITY		"%s/%s/capacity"
+#define BAT_STATUS		"%s/%s/status"
 
 /*
  ***************************************************************************