platform-dependent files included relative to main source directory

2021-04-29 23:43:36 +05:30 · 2021-04-29 23:43:36 +05:30 · 3f86a011e6
parent 1b74dfe187
commit 3f86a011e6
41 changed files with 97 additions and 91 deletions
--- a/Header.h
+++ b/Header.h
@ -12,6 +12,7 @@ in the source distribution for its full text.
 #include "Settings.h"
 #include "Vector.h"

+
 typedef struct Header_ {
   Vector** columns;
   Settings* settings;
--- a/darwin/DarwinProcess.c
+++ b/darwin/DarwinProcess.c
@ -5,7 +5,7 @@ Released under the GNU GPLv2, see the COPYING file
 in the source distribution for its full text.
 */

-#include "DarwinProcess.h"
+#include "darwin/DarwinProcess.h"

 #include <libproc.h>
 #include <stdio.h>
@ -14,8 +14,8 @@ in the source distribution for its full text.
 #include <mach/mach.h>

 #include "CRT.h"
-#include "Platform.h"
 #include "Process.h"
+#include "darwin/Platform.h"


 const ProcessFieldData Process_fields[LAST_PROCESSFIELD] = {
--- a/darwin/DarwinProcess.h
+++ b/darwin/DarwinProcess.h
@ -9,9 +9,8 @@ in the source distribution for its full text.

 #include <sys/sysctl.h>

-#include "DarwinProcessList.h"
 #include "Settings.h"
-
+#include "darwin/DarwinProcessList.h"

 typedef struct DarwinProcess_ {
   Process super;
--- a/darwin/DarwinProcessList.c
+++ b/darwin/DarwinProcessList.c
@ -5,7 +5,7 @@ Released under the GNU GPLv2, see the COPYING file
 in the source distribution for its full text.
 */

-#include "DarwinProcessList.h"
+#include "darwin/DarwinProcessList.h"

 #include <errno.h>
 #include <libproc.h>
@ -19,9 +19,9 @@ in the source distribution for its full text.
 #include <sys/sysctl.h>

 #include "CRT.h"
-#include "DarwinProcess.h"
-#include "Platform.h"
 #include "ProcessList.h"
+#include "darwin/DarwinProcess.h"
+#include "darwin/Platform.h"
 #include "generic/openzfs_sysctl.h"
 #include "zfs/ZfsArcStats.h"

--- a/darwin/Platform.c
+++ b/darwin/Platform.c
@ -8,7 +8,7 @@ in the source distribution for its full text.

 #include "config.h" // IWYU pragma: keep

-#include "Platform.h"
+#include "darwin/Platform.h"

 #include <errno.h>
 #include <math.h>
@ -22,7 +22,6 @@ in the source distribution for its full text.
 #include "ClockMeter.h"
 #include "CPUMeter.h"
 #include "CRT.h"
-#include "DarwinProcessList.h"
 #include "DateMeter.h"
 #include "DateTimeMeter.h"
 #include "HostnameMeter.h"
@ -34,6 +33,7 @@ in the source distribution for its full text.
 #include "SysArchMeter.h"
 #include "TasksMeter.h"
 #include "UptimeMeter.h"
+#include "darwin/DarwinProcessList.h"
 #include "zfs/ZfsArcMeter.h"
 #include "zfs/ZfsCompressedArcMeter.h"

--- a/darwin/Platform.h
+++ b/darwin/Platform.h
@ -14,11 +14,11 @@ in the source distribution for its full text.
 #include "Action.h"
 #include "BatteryMeter.h"
 #include "CPUMeter.h"
-#include "DarwinProcess.h"
 #include "DiskIOMeter.h"
 #include "NetworkIOMeter.h"
 #include "ProcessLocksScreen.h"
 #include "SignalsPanel.h"
+#include "darwin/DarwinProcess.h"
 #include "generic/gettime.h"
 #include "generic/hostname.h"
 #include "generic/uname.h"
--- a/dragonflybsd/DragonFlyBSDProcess.c
+++ b/dragonflybsd/DragonFlyBSDProcess.c
@ -6,17 +6,17 @@ Released under the GNU GPLv2, see the COPYING file
 in the source distribution for its full text.
 */

-#include "Process.h"
-#include "ProcessList.h"
-#include "DragonFlyBSDProcess.h"
-#include "Platform.h"
-#include "CRT.h"
+#include "dragonflybsd/DragonFlyBSDProcess.h"

 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <sys/syscall.h>

+#include "Process.h"
+#include "ProcessList.h"
+#include "dragonflybsd/Platform.h"
+#include "CRT.h"

 const ProcessFieldData Process_fields[LAST_PROCESSFIELD] = {
   [0] = { .name = "", .title = NULL, .description = NULL, .flags = 0, },
--- a/dragonflybsd/DragonFlyBSDProcessList.c
+++ b/dragonflybsd/DragonFlyBSDProcessList.c
@ -6,9 +6,7 @@ Released under the GNU GPLv2, see the COPYING file
 in the source distribution for its full text.
 */

-#include "ProcessList.h"
-#include "DragonFlyBSDProcessList.h"
-#include "DragonFlyBSDProcess.h"
+#include "dragonflybsd/DragonFlyBSDProcessList.h"

 #include <unistd.h>
 #include <stdlib.h>
@ -22,6 +20,8 @@ in the source distribution for its full text.

 #include "CRT.h"
 #include "Macros.h"
+#include "ProcessList.h"
+#include "dragonflybsd/DragonFlyBSDProcess.h"


 static int MIB_hw_physmem[2];
--- a/dragonflybsd/DragonFlyBSDProcessList.h
+++ b/dragonflybsd/DragonFlyBSDProcessList.h
@ -15,7 +15,8 @@ in the source distribution for its full text.
 #include <sys/uio.h>
 #include <sys/resource.h>
 #include "Hashtable.h"
-#include "DragonFlyBSDProcess.h"
+
+#include "dragonflybsd/DragonFlyBSDProcess.h"


 typedef struct CPUData_ {
--- a/dragonflybsd/Platform.c
+++ b/dragonflybsd/Platform.c
@ -6,30 +6,31 @@ Released under the GNU GPLv2, see the COPYING file
 in the source distribution for its full text.
 */

-#include "Platform.h"
-#include "Macros.h"
-#include "Meter.h"
-#include "CPUMeter.h"
-#include "MemoryMeter.h"
-#include "SwapMeter.h"
-#include "TasksMeter.h"
-#include "LoadAverageMeter.h"
-#include "UptimeMeter.h"
+#include "dragonflybsd/Platform.h"
+
+#include <math.h>
+#include <time.h>
+#include <sys/resource.h>
+#include <sys/sysctl.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <vm/vm_param.h>
+
 #include "ClockMeter.h"
+#include "CPUMeter.h"
 #include "DateMeter.h"
 #include "DateTimeMeter.h"
 #include "HostnameMeter.h"
+#include "LoadAverageMeter.h"
+#include "Macros.h"
+#include "MemoryMeter.h"
+#include "Meter.h"
+#include "SwapMeter.h"
 #include "SysArchMeter.h"
-#include "DragonFlyBSDProcess.h"
-#include "DragonFlyBSDProcessList.h"
-
-#include <sys/types.h>
-#include <sys/sysctl.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <vm/vm_param.h>
-#include <time.h>
-#include <math.h>
+#include "TasksMeter.h"
+#include "UptimeMeter.h"
+#include "dragonflybsd/DragonFlyBSDProcess.h"
+#include "dragonflybsd/DragonFlyBSDProcessList.h"


 const ProcessField Platform_defaultFields[] = { PID, USER, PRIORITY, NICE, M_VIRT, M_RESIDENT, STATE, PERCENT_CPU, PERCENT_MEM, TIME, COMM, 0 };
--- a/freebsd/FreeBSDProcess.c
+++ b/freebsd/FreeBSDProcess.c
@ -5,7 +5,7 @@ Released under the GNU GPLv2, see the COPYING file
 in the source distribution for its full text.
 */

-#include "FreeBSDProcess.h"
+#include "freebsd/FreeBSDProcess.h"

 #include <stdlib.h>

--- a/freebsd/FreeBSDProcessList.c
+++ b/freebsd/FreeBSDProcessList.c
@ -7,7 +7,7 @@ in the source distribution for its full text.

 #include "config.h" // IWYU pragma: keep

-#include "FreeBSDProcessList.h"
+#include "freebsd/FreeBSDProcessList.h"

 #include <assert.h>
 #include <limits.h>
--- a/freebsd/Platform.c
+++ b/freebsd/Platform.c
@ -7,7 +7,7 @@ in the source distribution for its full text.

 #include "config.h" // IWYU pragma: keep

-#include "Platform.h"
+#include "freebsd/Platform.h"

 #include <devstat.h>
 #include <math.h>
@ -31,8 +31,6 @@ in the source distribution for its full text.
 #include "DateMeter.h"
 #include "DateTimeMeter.h"
 #include "DiskIOMeter.h"
-#include "FreeBSDProcess.h"
-#include "FreeBSDProcessList.h"
 #include "HostnameMeter.h"
 #include "LoadAverageMeter.h"
 #include "Macros.h"
@ -46,6 +44,8 @@ in the source distribution for its full text.
 #include "TasksMeter.h"
 #include "UptimeMeter.h"
 #include "XUtils.h"
+#include "freebsd/FreeBSDProcess.h"
+#include "freebsd/FreeBSDProcessList.h"
 #include "zfs/ZfsArcMeter.h"
 #include "zfs/ZfsCompressedArcMeter.h"

--- a/generic/gettime.c
+++ b/generic/gettime.c
@ -6,11 +6,11 @@ in the source distribution for its full text.
 */
 #include "config.h"  // IWYU pragma: keep

+#include "generic/gettime.h"
+
 #include <string.h>
 #include <time.h>

-#include "generic/gettime.h"
-

 void Generic_gettime_realtime(struct timeval* tvp, uint64_t* msec) {

--- a/generic/uname.c
+++ b/generic/uname.c
@ -6,13 +6,14 @@ in the source distribution for its full text.
 */
 #include "config.h"  // IWYU pragma: keep

+#include "generic/uname.h"
+
 #include <stdbool.h>
 #include <stdio.h>
 #include <string.h>

 #include "Macros.h"
 #include "XUtils.h"
-#include "generic/uname.h"

 #ifdef HAVE_SYS_UTSNAME_H
 #include <sys/utsname.h>
--- a/linux/HugePageMeter.c
+++ b/linux/HugePageMeter.c
@ -5,7 +5,7 @@ Released under the GNU GPLv2, see the COPYING file
 in the source distribution for its full text.
 */

-#include "HugePageMeter.h"
+#include "linux/HugePageMeter.h"

 #include <assert.h>
 #include <limits.h>
@ -13,11 +13,11 @@ in the source distribution for its full text.
 #include <stddef.h>

 #include "CRT.h"
-#include "LinuxProcessList.h"
 #include "Macros.h"
 #include "Object.h"
 #include "ProcessList.h"
 #include "RichString.h"
+#include "linux/LinuxProcessList.h"


 static const char *HugePageMeter_active_labels[4] = { NULL, NULL, NULL, NULL };
--- a/linux/IOPriorityPanel.c
+++ b/linux/IOPriorityPanel.c
@ -5,7 +5,7 @@ Released under the GNU GPLv2, see the COPYING file
 in the source distribution for its full text.
 */

-#include "IOPriorityPanel.h"
+#include "linux/IOPriorityPanel.h"

 #include <stdbool.h>
 #include <stddef.h>
@ -14,6 +14,7 @@ in the source distribution for its full text.
 #include "ListItem.h"
 #include "Object.h"
 #include "XUtils.h"
+#include "IOPriority.h"


 Panel* IOPriorityPanel_new(IOPriority currPrio) {
--- a/linux/IOPriorityPanel.h
+++ b/linux/IOPriorityPanel.h
@ -8,7 +8,7 @@ in the source distribution for its full text.
 */

 #include "Panel.h"
-#include "IOPriority.h"
+#include "linux/IOPriority.h"

 Panel* IOPriorityPanel_new(IOPriority currPrio);

--- a/linux/LibSensors.c
+++ b/linux/LibSensors.c
@ -1,4 +1,4 @@
-#include "LibSensors.h"
+#include "linux/LibSensors.h"

 #ifdef HAVE_SENSORS_SENSORS_H

--- a/linux/LibSensors.h
+++ b/linux/LibSensors.h
@ -5,7 +5,7 @@

 #include <stdio.h>

-#include "LinuxProcessList.h"
+#include "linux/LinuxProcessList.h"


 int LibSensors_init(FILE* input);
--- a/linux/LinuxProcess.c
+++ b/linux/LinuxProcess.c
@ -6,7 +6,7 @@ Released under the GNU GPLv2, see the COPYING file
 in the source distribution for its full text.
 */

-#include "LinuxProcess.h"
+#include "linux/LinuxProcess.h"

 #include <assert.h>
 #include <math.h>
@ -22,6 +22,7 @@ in the source distribution for its full text.
 #include "ProvideCurses.h"
 #include "RichString.h"
 #include "XUtils.h"
+#include "linux/IOPriority.h"


 /* semi-global */
--- a/linux/LinuxProcess.h
+++ b/linux/LinuxProcess.h
@ -12,7 +12,7 @@ in the source distribution for its full text.

 #include <stdbool.h>

-#include "IOPriority.h"
+#include "linux/IOPriority.h"
 #include "Object.h"
 #include "Process.h"
 #include "Settings.h"
--- a/linux/LinuxProcessList.c
+++ b/linux/LinuxProcessList.c
@ -7,7 +7,7 @@ in the source distribution for its full text.

 #include "config.h" // IWYU pragma: keep

-#include "LinuxProcessList.h"
+#include "linux/LinuxProcessList.h"

 #include <assert.h>
 #include <dirent.h>
@ -41,13 +41,13 @@ in the source distribution for its full text.

 #include "Compat.h"
 #include "CRT.h"
-#include "LinuxProcess.h"
 #include "Macros.h"
 #include "Object.h"
-#include "Platform.h" // needed for GNU/hurd to get PATH_MAX
 #include "Process.h"
 #include "Settings.h"
 #include "XUtils.h"
+#include "linux/LinuxProcess.h"
+#include "linux/Platform.h" // needed for GNU/hurd to get PATH_MAX

 #if defined(MAJOR_IN_MKDEV)
 #include <sys/mkdev.h>
--- a/linux/Platform.c
+++ b/linux/Platform.c
@ -7,7 +7,7 @@ in the source distribution for its full text.

 #include "config.h"

-#include "Platform.h"
+#include "linux/Platform.h"

 #include <assert.h>
 #include <ctype.h>
@ -31,10 +31,6 @@ in the source distribution for its full text.
 #include "DiskIOMeter.h"
 #include "HostnameMeter.h"
 #include "HugePageMeter.h"
-#include "IOPriority.h"
-#include "IOPriorityPanel.h"
-#include "LinuxProcess.h"
-#include "LinuxProcessList.h"
 #include "LoadAverageMeter.h"
 #include "Macros.h"
 #include "MainPanel.h"
@ -46,17 +42,20 @@ in the source distribution for its full text.
 #include "PressureStallMeter.h"
 #include "ProcessList.h"
 #include "ProvideCurses.h"
-#include "SELinuxMeter.h"
+#include "linux/SELinuxMeter.h"
 #include "Settings.h"
 #include "SwapMeter.h"
 #include "SysArchMeter.h"
-#include "SystemdMeter.h"
 #include "TasksMeter.h"
 #include "UptimeMeter.h"
 #include "XUtils.h"
-#include "ZramMeter.h"
-#include "ZramStats.h"
-
+#include "linux/IOPriority.h"
+#include "linux/IOPriorityPanel.h"
+#include "linux/LinuxProcess.h"
+#include "linux/LinuxProcessList.h"
+#include "linux/SystemdMeter.h"
+#include "linux/ZramMeter.h"
+#include "linux/ZramStats.h"
 #include "zfs/ZfsArcMeter.h"
 #include "zfs/ZfsArcStats.h"
 #include "zfs/ZfsCompressedArcMeter.h"
--- a/linux/PressureStallMeter.c
+++ b/linux/PressureStallMeter.c
@ -6,7 +6,7 @@ Released under the GNU GPLv2, see the COPYING file
 in the source distribution for its full text.
 */

-#include "PressureStallMeter.h"
+#include "linux/PressureStallMeter.h"

 #include <stdbool.h>
 #include <string.h>
--- a/linux/SELinuxMeter.c
+++ b/linux/SELinuxMeter.c
@ -5,7 +5,7 @@ Released under the GNU GPLv2, see the COPYING file
 in the source distribution for its full text.
 */

-#include "SELinuxMeter.h"
+#include "linux/SELinuxMeter.h"

 #include "CRT.h"

--- a/linux/SystemdMeter.c
+++ b/linux/SystemdMeter.c
@ -5,7 +5,7 @@ Released under the GNU GPLv2, see the COPYING file
 in the source distribution for its full text.
 */

-#include "SystemdMeter.h"
+#include "linux/SystemdMeter.h"

 #include <dlfcn.h>
 #include <fcntl.h>
--- a/linux/ZramMeter.c
+++ b/linux/ZramMeter.c
@ -1,4 +1,4 @@
-#include "ZramMeter.h"
+#include "linux/ZramMeter.h"

 #include <stddef.h>

--- a/openbsd/OpenBSDProcess.c
+++ b/openbsd/OpenBSDProcess.c
@ -6,7 +6,7 @@ Released under the GNU GPLv2, see the COPYING file
 in the source distribution for its full text.
 */

-#include "OpenBSDProcess.h"
+#include "openbsd/OpenBSDProcess.h"

 #include <stdlib.h>

--- a/openbsd/OpenBSDProcessList.c
+++ b/openbsd/OpenBSDProcessList.c
@ -6,7 +6,7 @@ Released under the GNU GPLv2, see the COPYING file
 in the source distribution for its full text.
 */

-#include "OpenBSDProcessList.h"
+#include "openbsd/OpenBSDProcessList.h"

 #include <kvm.h>
 #include <limits.h>
@ -25,11 +25,11 @@ in the source distribution for its full text.
 #include "CRT.h"
 #include "Macros.h"
 #include "Object.h"
-#include "OpenBSDProcess.h"
 #include "Process.h"
 #include "ProcessList.h"
 #include "Settings.h"
 #include "XUtils.h"
+#include "openbsd/OpenBSDProcess.h"


 static long fscale;
--- a/openbsd/Platform.c
+++ b/openbsd/Platform.c
@ -6,7 +6,7 @@ Released under the GNU GPLv2, see the COPYING file
 in the source distribution for its full text.
 */

-#include "Platform.h"
+#include "openbsd/Platform.h"

 #include <errno.h>
 #include <kvm.h>
@ -33,8 +33,6 @@ in the source distribution for its full text.
 #include "Macros.h"
 #include "MemoryMeter.h"
 #include "Meter.h"
-#include "OpenBSDProcess.h"
-#include "OpenBSDProcessList.h"
 #include "ProcessList.h"
 #include "Settings.h"
 #include "SignalsPanel.h"
@ -43,6 +41,8 @@ in the source distribution for its full text.
 #include "TasksMeter.h"
 #include "UptimeMeter.h"
 #include "XUtils.h"
+#include "openbsd/OpenBSDProcess.h"
+#include "openbsd/OpenBSDProcessList.h"


 const ProcessField Platform_defaultFields[] = { PID, USER, PRIORITY, NICE, M_VIRT, M_RESIDENT, STATE, PERCENT_CPU, PERCENT_MEM, TIME, COMM, 0 };
--- a/solaris/Platform.h
+++ b/solaris/Platform.h
@ -25,7 +25,6 @@ in the source distribution for its full text.
 #include "NetworkIOMeter.h"
 #include "ProcessLocksScreen.h"
 #include "SignalsPanel.h"
-
 #include "generic/gettime.h"
 #include "generic/hostname.h"
 #include "generic/uname.h"
--- a/solaris/SolarisProcessList.c
+++ b/solaris/SolarisProcessList.c
@ -6,9 +6,8 @@ Released under the GNU GPLv2, see the COPYING file
 in the source distribution for its full text.
 */

-#include "ProcessList.h"
-#include "SolarisProcess.h"
-#include "SolarisProcessList.h"
+
+#include "solaris/SolarisProcessList.h"

 #include <unistd.h>
 #include <stdlib.h>
@ -23,6 +22,8 @@ in the source distribution for its full text.
 #include <time.h>

 #include "CRT.h"
+#include "solaris/ProcessList.h"
+#include "solaris/SolarisProcess.h"


 #define MAXCMDLINE 255
--- a/solaris/SolarisProcessList.h
+++ b/solaris/SolarisProcessList.h
@ -13,8 +13,6 @@ in the source distribution for its full text.
 #define GZONE "global    "
 #define UZONE "unknown   "

-#include "zfs/ZfsArcStats.h"
-
 #include <kstat.h>
 #include <sys/param.h>
 #include <sys/uio.h>
@ -23,6 +21,9 @@ in the source distribution for its full text.
 #include <sys/sysinfo.h>
 #include <sys/swap.h>

+#include "zfs/ZfsArcStats.h"
+
+
 #define ZONE_ERRMSGLEN 1024
 extern char zone_errmsg[ZONE_ERRMSGLEN];

--- a/unsupported/Platform.c
+++ b/unsupported/Platform.c
@ -8,7 +8,7 @@ in the source distribution for its full text.

 #include "config.h" // IWYU pragma: keep

-#include "Platform.h"
+#include "unsupported/Platform.h"

 #include <math.h>

--- a/unsupported/Platform.h
+++ b/unsupported/Platform.h
@ -14,8 +14,8 @@ in the source distribution for its full text.
 #include "NetworkIOMeter.h"
 #include "ProcessLocksScreen.h"
 #include "SignalsPanel.h"
-#include "UnsupportedProcess.h"
 #include "generic/gettime.h"
+#include "unsupported/UnsupportedProcess.h"


 extern const SignalItem Platform_signals[];
--- a/unsupported/UnsupportedProcess.c
+++ b/unsupported/UnsupportedProcess.c
@ -7,7 +7,7 @@ in the source distribution for its full text.

 #include "config.h" // IWYU pragma: keep

-#include "UnsupportedProcess.h"
+#include "unsupported/UnsupportedProcess.h"

 #include <stdlib.h>

--- a/zfs/ZfsArcMeter.c
+++ b/zfs/ZfsArcMeter.c
@ -5,8 +5,7 @@ Released under the GNU GPLv2, see the COPYING file
 in the source distribution for its full text.
 */

-#include "ZfsArcMeter.h"
-#include "ZfsArcStats.h"
+#include "zfs/ZfsArcMeter.h"

 #include <stddef.h>

@ -15,6 +14,8 @@ in the source distribution for its full text.
 #include "Platform.h"
 #include "RichString.h"

+#include "zfs/ZfsArcStats.h"
+

 static const int ZfsArcMeter_attributes[] = {
   ZFS_MFU, ZFS_MRU, ZFS_ANON, ZFS_HEADER, ZFS_OTHER
--- a/zfs/ZfsArcMeter.h
+++ b/zfs/ZfsArcMeter.h
@ -7,7 +7,7 @@ Released under the GNU GPLv2, see the COPYING file
 in the source distribution for its full text.
 */

-#include "ZfsArcStats.h"
+#include "zfs/ZfsArcStats.h"

 #include "Meter.h"

--- a/zfs/ZfsCompressedArcMeter.c
+++ b/zfs/ZfsCompressedArcMeter.c
@ -5,7 +5,7 @@ Released under the GNU GPLv2, see the COPYING file
 in the source distribution for its full text.
 */

-#include "ZfsCompressedArcMeter.h"
+#include "zfs/ZfsCompressedArcMeter.h"

 #include <stddef.h>

--- a/zfs/ZfsCompressedArcMeter.h
+++ b/zfs/ZfsCompressedArcMeter.h
@ -7,7 +7,7 @@ Released under the GNU GPLv2, see the COPYING file
 in the source distribution for its full text.
 */

-#include "ZfsArcStats.h"
+#include "zfs/ZfsArcStats.h"

 #include "Meter.h"