zeldon
/
htop
mirror of https://github.com/xzeldon/htop.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

IWYU update (FreeBSD)

This commit is contained in:
Christian Goettsche 2020-11-18 15:12:18 +01:00 committed by BenBE
parent 7cf5277594
commit f5c3349bdb
14 changed files with 63 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Action.c
View File

@ -13,8 +13,6 @@ in the source distribution for its full text.
#include <stdbool.h>
#include <stdlib.h>
#include "Affinity.h"
#include "AffinityPanel.h"
#include "CategoriesPanel.h"
#include "CommandScreen.h"
#include "CRT.h"
@ -36,6 +34,11 @@ in the source distribution for its full text.
#include "Vector.h"
#include "XUtils.h"
#if (defined(HAVE_LIBHWLOC) || defined(HAVE_LINUX_AFFINITY))
#include "Affinity.h"
#include "AffinityPanel.h"
#endif
Object* Action_pickFromVector(State* st, Panel* list, int x, bool followProcess) {
Panel* panel = st->panel;

2
Affinity.c
View File

@ -6,7 +6,7 @@ Released under the GNU GPLv2, see the COPYING file
in the source distribution for its full text.
*/
#include "config.h"
#include "config.h" // IWYU pragma: keep
#include "Affinity.h"

13
Affinity.h
View File

@ -8,18 +8,23 @@ Released under the GNU GPLv2, see the COPYING file
in the source distribution for its full text.
*/
#include "config.h"
#include "config.h" // IWYU pragma: keep
#include "ProcessList.h"
#if defined(HAVE_LIBHWLOC) || defined(HAVE_LINUX_AFFINITY)
#include <stdbool.h>
#include "Object.h"
#include "Process.h"
#include "ProcessList.h"
#endif
#if defined(HAVE_LIBHWLOC) && defined(HAVE_LINUX_AFFINITY)
#error hwlock and linux affinity are mutual exclusive.
#error hwloc and linux affinity are mutual exclusive.
#endif
typedef struct Affinity_ {
ProcessList* pl;
int size;
@ -39,6 +44,6 @@ Affinity* Affinity_get(Process* proc, ProcessList* pl);
bool Affinity_set(Process* proc, Arg arg);
#endif
#endif /* HAVE_LIBHWLOC || HAVE_LINUX_AFFINITY */
#endif

2
CPUMeter.c
View File

@ -5,7 +5,7 @@ Released under the GNU GPLv2, see the COPYING file
in the source distribution for its full text.
*/
#include "config.h"
#include "config.h" // IWYU pragma: keep
#include "CPUMeter.h"

13
freebsd/FreeBSDProcess.c
View File

@ -5,16 +5,15 @@ Released under the GNU GPLv2, see the COPYING file
in the source distribution for its full text.
*/
#include "Process.h"
#include "ProcessList.h"
#include "FreeBSDProcess.h"
#include "Platform.h"
#include "CRT.h"
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <sys/syscall.h>
#include "CRT.h"
#include "Macros.h"
#include "Process.h"
#include "RichString.h"
#include "XUtils.h"
const char* const nodevStr = "nodev";

1
freebsd/FreeBSDProcess.h
View File

@ -11,7 +11,6 @@ in the source distribution for its full text.
#include "Object.h"
#include "Process.h"
#include "RichString.h"
#include "Settings.h"

18
freebsd/FreeBSDProcessList.c
View File

@ -10,23 +10,31 @@ in the source distribution for its full text.
#include <assert.h>
#include <dirent.h>
#include <err.h>
#include <fcntl.h>
#include <limits.h>
#include <stdlib.h>
#include <string.h>
#include <time.h>
#include <unistd.h>
#include <unistd.h>
#include <sys/_iovec.h>
#include <sys/dirent.h>
#include <sys/errno.h>
#include <sys/param.h> // needs to be included before <sys/jail.h> for MAXPATHLEN
#include <sys/jail.h>
#include <sys/priority.h>
#include <sys/proc.h>
#include <sys/resource.h>
#include <sys/stat.h>
#include <sys/sysctl.h>
#include <sys/time.h>
#include <sys/types.h>
#include <sys/user.h>
#include "Compat.h"
#include "CRT.h"
#include "Compat.h"
#include "FreeBSDProcess.h"
#include "Macros.h"
#include "Object.h"
#include "Process.h"
#include "ProcessList.h"
#include "Settings.h"
#include "XUtils.h"
#include "zfs/ZfsArcStats.h"
#include "zfs/openzfs_sysctl.h"

8
freebsd/FreeBSDProcessList.h
View File

@ -8,14 +8,10 @@ in the source distribution for its full text.
*/
#include <kvm.h>
#include <sys/param.h> // needs to be included before <sys/jail.h> for MAXPATHLEN
#include <sys/jail.h>
#include <sys/resource.h>
#include <sys/uio.h>
#include <stdbool.h>
#include <sys/types.h>
#include "FreeBSDProcess.h"
#include "Hashtable.h"
#include "Process.h"
#include "ProcessList.h"
#include "UsersTable.h"
#include "zfs/ZfsArcStats.h"

9
freebsd/Platform.c
View File

@ -9,10 +9,16 @@ in the source distribution for its full text.
#include <devstat.h>
#include <math.h>
#include <stdint.h>
#include <stdlib.h>
#include <time.h>
#include <net/if.h>
#include <net/if_mib.h>
#include <sys/_types.h>
#include <sys/devicestat.h>
#include <sys/param.h>
#include <sys/resource.h>
#include <sys/socket.h>
#include <sys/sysctl.h>
#include <sys/time.h>
#include <sys/types.h>
@ -31,9 +37,12 @@ in the source distribution for its full text.
#include "MemoryMeter.h"
#include "Meter.h"
#include "NetworkIOMeter.h"
#include "ProcessList.h"
#include "Settings.h"
#include "SwapMeter.h"
#include "TasksMeter.h"
#include "UptimeMeter.h"
#include "XUtils.h"
#include "zfs/ZfsArcMeter.h"
#include "zfs/ZfsCompressedArcMeter.h"

3
freebsd/Platform.h
View File

@ -13,9 +13,12 @@ in the source distribution for its full text.
#include "Action.h"
#include "BatteryMeter.h"
#include "DiskIOMeter.h"
#include "Meter.h"
#include "Process.h"
#include "ProcessLocksScreen.h"
#include "SignalsPanel.h"
extern ProcessFieldData Process_fields[];
extern ProcessField Platform_defaultFields[];

8
iwyu/htop.imp
View File

@ -7,4 +7,12 @@
{ include: ["<bits/types/struct_tm.h>", "private", "<time.h>", "public"] },
{ include: ["<bits/getopt_core.h>", "private", "<unistd.h>", "public"] },
{ include: ["<sys/signal.h>", "private", "<signal.h>", "public"] },
{ include: ["<sys/_stdarg.h>", "private", "<stdarg.h>", "public"] },
{ include: ["<sys/limits.h>", "private", "<limits.h>", "public"] },
{ include: ["<x86/_inttypes.h>", "private", "<inttypes.h>", "public"] },
]

2
iwyu/run_iwyu.sh
View File

@ -11,4 +11,4 @@ IWYU=${IWYU:-iwyu}
cd "$SOURCEDIR" || exit
make clean
make --keep-going --silent CC="$IWYU" CFLAGS="-Xiwyu --no_comments -Xiwyu --no_fwd_decl -Xiwyu --mapping_file='$SCRIPTDIR/htop.imp' $PKG_NL3"
make -k -s CC="$IWYU" CFLAGS="-Xiwyu --no_comments -Xiwyu --no_fwd_decl -Xiwyu --mapping_file='$SCRIPTDIR/htop.imp' $PKG_NL3"

16
zfs/ZfsArcStats.c
View File

@ -5,22 +5,6 @@ Released under the GNU GPLv2, see the COPYING file
in the source distribution for its full text.
*/
/*{
typedef struct ZfsArcStats_ {
int enabled;
int isCompressed;
unsigned long long int max;
unsigned long long int size;
unsigned long long int MFU;
unsigned long long int MRU;
unsigned long long int anon;
unsigned long long int header;
unsigned long long int other;
unsigned long long int compressed;
unsigned long long int uncompressed;
} ZfsArcStats;
}*/
#include "Macros.h"
static int make_iso_compilers_happy ATTR_UNUSED;

13
zfs/openzfs_sysctl.c
View File

@ -6,12 +6,13 @@ in the source distribution for its full text.
*/
#include "zfs/openzfs_sysctl.h"
#include <stdlib.h>
#include <sys/types.h> // IWYU pragma: keep
#include <sys/sysctl.h> // needs <sys/types.h> for u_int with gcc
#include "zfs/ZfsArcStats.h"
#include <unistd.h>
#include <stdlib.h>
#include <sys/types.h>
#include <sys/sysctl.h>
static int MIB_kstat_zfs_misc_arcstats_size[5];
static int MIB_kstat_zfs_misc_arcstats_c_max[5];
@ -23,10 +24,6 @@ static int MIB_kstat_zfs_misc_arcstats_other_size[5];
static int MIB_kstat_zfs_misc_arcstats_compressed_size[5];
static int MIB_kstat_zfs_misc_arcstats_uncompressed_size[5];
/*{
#include "zfs/ZfsArcStats.h"
}*/
void openzfs_sysctl_init(ZfsArcStats* stats) {
size_t len;
unsigned long long int arcSize;