Skip to content

Commit 0b0d5f9

Browse files
authored
Merge branch 'htop-dev:main' into main
2 parents db71059 + eb86bdf commit 0b0d5f9

154 files changed

Lines changed: 5670 additions & 2515 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/ci.yml

Lines changed: 54 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Bootstrap
1818
run: ./autogen.sh
1919
- name: Configure
20-
run: ./configure --enable-werror --enable-affinity --disable-unicode --disable-sensors
20+
run: ./configure --enable-werror --enable-affinity --disable-unicode --disable-sensors || (cat config.log; exit 1)
2121
- name: Enable compatibility modes
2222
run: |
2323
sed -i 's/#define HAVE_FSTATAT 1/#undef HAVE_FSTATAT/g' config.h
@@ -31,20 +31,20 @@ jobs:
3131
build-ubuntu-latest-minimal-clang:
3232
runs-on: ubuntu-latest
3333
env:
34-
CC: clang-15
34+
CC: clang-16
3535
steps:
3636
- uses: actions/checkout@v3
3737
- name: install clang repo
3838
run: |
3939
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key 2>/dev/null | sudo apt-key add -
40-
sudo add-apt-repository 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal-15 main' -y
40+
sudo add-apt-repository 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal-16 main' -y
4141
sudo apt-get update -q
4242
- name: Install Dependencies
43-
run: sudo apt-get install --no-install-recommends clang-15 libncursesw5-dev
43+
run: sudo apt-get install --no-install-recommends clang-16 libncursesw5-dev
4444
- name: Bootstrap
4545
run: ./autogen.sh
4646
- name: Configure
47-
run: ./configure --enable-werror --enable-affinity --disable-unicode --disable-sensors
47+
run: ./configure --enable-werror --enable-affinity --disable-unicode --disable-sensors || ( cat config.log; exit 1; )
4848
- name: Build
4949
run: make -k
5050
- name: Distcheck
@@ -63,7 +63,7 @@ jobs:
6363
- name: Bootstrap
6464
run: ./autogen.sh
6565
- name: Configure
66-
run: ./configure --enable-werror --enable-openvz --enable-vserver --enable-ancient-vserver --enable-unicode --enable-hwloc --enable-delayacct --enable-sensors --enable-capabilities
66+
run: ./configure --enable-werror --enable-openvz --enable-vserver --enable-ancient-vserver --enable-unicode --enable-hwloc --enable-delayacct --enable-sensors --enable-capabilities || ( cat config.log; exit 1; )
6767
- name: Build
6868
run: make -k
6969
- name: Distcheck
@@ -72,20 +72,20 @@ jobs:
7272
build-ubuntu-latest-full-featured-clang:
7373
runs-on: ubuntu-latest
7474
env:
75-
CC: clang-15
75+
CC: clang-16
7676
steps:
7777
- uses: actions/checkout@v3
7878
- name: install clang repo
7979
run: |
8080
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key 2>/dev/null | sudo apt-key add -
81-
sudo add-apt-repository 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal-15 main' -y
81+
sudo add-apt-repository 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal-16 main' -y
8282
sudo apt-get update -q
8383
- name: Install Dependencies
84-
run: sudo apt-get install --no-install-recommends clang-15 libncursesw5-dev libhwloc-dev libnl-3-dev libnl-genl-3-dev libsensors4-dev libcap-dev
84+
run: sudo apt-get install --no-install-recommends clang-16 libncursesw5-dev libhwloc-dev libnl-3-dev libnl-genl-3-dev libsensors4-dev libcap-dev
8585
- name: Bootstrap
8686
run: ./autogen.sh
8787
- name: Configure
88-
run: ./configure --enable-werror --enable-openvz --enable-vserver --enable-ancient-vserver --enable-unicode --enable-hwloc --enable-delayacct --enable-sensors --enable-capabilities
88+
run: ./configure --enable-werror --enable-openvz --enable-vserver --enable-ancient-vserver --enable-unicode --enable-hwloc --enable-delayacct --enable-sensors --enable-capabilities || ( cat config.log; exit 1; )
8989
- name: Build
9090
run: make -k
9191
- name: Distcheck
@@ -104,7 +104,7 @@ jobs:
104104
- name: Bootstrap
105105
run: ./autogen.sh
106106
- name: Configure
107-
run: ./configure --enable-static --enable-werror --enable-openvz --enable-vserver --enable-ancient-vserver --enable-unicode --disable-hwloc --disable-delayacct --enable-sensors --enable-capabilities
107+
run: ./configure --enable-static --enable-werror --enable-openvz --enable-vserver --enable-ancient-vserver --enable-unicode --disable-hwloc --disable-delayacct --enable-sensors --enable-capabilities || ( cat config.log; exit 1; )
108108
- name: Build
109109
run: make -k
110110
- name: Distcheck
@@ -120,29 +120,65 @@ jobs:
120120
- name: Bootstrap
121121
run: ./autogen.sh
122122
- name: Configure
123-
run: ./configure --enable-werror --enable-pcp --enable-unicode
123+
run: ./configure --enable-werror --enable-pcp --enable-unicode || ( cat config.log; exit 1; )
124124
- name: Build
125125
run: make -k
126126

127127
build-ubuntu-latest-clang-analyzer:
128128
runs-on: ubuntu-latest
129129
env:
130-
CC: clang-15
130+
CC: clang-16
131131
steps:
132132
- uses: actions/checkout@v3
133133
- name: install clang repo
134134
run: |
135135
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key 2>/dev/null | sudo apt-key add -
136-
sudo add-apt-repository 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal-15 main' -y
136+
sudo add-apt-repository 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal-16 main' -y
137137
sudo apt-get update -q
138138
- name: Install Dependencies
139-
run: sudo apt-get install --no-install-recommends clang-15 clang-tools-15 libncursesw5-dev libnl-3-dev libnl-genl-3-dev libsensors4-dev libcap-dev
139+
run: sudo apt-get install --no-install-recommends clang-16 clang-tools-16 libncursesw5-dev libnl-3-dev libnl-genl-3-dev libsensors4-dev libcap-dev
140140
- name: Bootstrap
141141
run: ./autogen.sh
142142
- name: Configure
143-
run: scan-build-15 -analyze-headers --status-bugs ./configure --enable-debug --enable-werror --enable-openvz --enable-vserver --enable-ancient-vserver --enable-unicode --enable-delayacct --enable-sensors --enable-capabilities
143+
run: scan-build-16 -analyze-headers --status-bugs ./configure --enable-debug --enable-werror --enable-openvz --enable-vserver --enable-ancient-vserver --enable-unicode --enable-delayacct --enable-sensors --enable-capabilities || ( cat config.log; exit 1; )
144144
- name: Build
145-
run: scan-build-15 -analyze-headers --status-bugs make -j"$(nproc)"
145+
run: scan-build-16 -analyze-headers --status-bugs make -j"$(nproc)"
146+
147+
build-ubuntu-latest-clang-sanitizer:
148+
runs-on: ubuntu-latest
149+
env:
150+
CC: clang-16
151+
CFLAGS: '-O1 -g -ftrivial-auto-var-init=pattern -fsanitize=address -fsanitize-address-use-after-scope -fsanitize-address-use-after-return=always -fno-omit-frame-pointer -fsanitize=undefined -fsanitize=nullability -fsanitize=implicit-conversion -fsanitize=integer -fsanitize=float-divide-by-zero -fsanitize=local-bounds'
152+
LDFLAGS: '-ftrivial-auto-var-init=pattern -fsanitize=address -fsanitize-address-use-after-scope -fsanitize-address-use-after-return=always -fno-omit-frame-pointer -fsanitize=undefined -fsanitize=nullability -fsanitize=implicit-conversion -fsanitize=integer -fsanitize=float-divide-by-zero -fsanitize=local-bounds'
153+
ASAN_OPTIONS: strict_string_checks=1:detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1
154+
UBSAN_OPTIONS: print_stacktrace=1:print_summary=1:halt_on_error=1
155+
TERM: xterm-color
156+
HTOPRC: .github/workflows/htoprc
157+
steps:
158+
- uses: actions/checkout@v3
159+
- name: install clang repo
160+
run: |
161+
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key 2>/dev/null | sudo apt-key add -
162+
sudo add-apt-repository 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal-16 main' -y
163+
sudo apt-get update -q
164+
- name: Install LLVM Toolchain
165+
run: sudo apt-get install --no-install-recommends clang-16 libclang-rt-16-dev llvm-16
166+
- name: Install Dependencies
167+
run: sudo apt-get install --no-install-recommends libncursesw5-dev libhwloc-dev libnl-3-dev libnl-genl-3-dev libsensors4-dev libcap-dev
168+
- name: Bootstrap
169+
run: ./autogen.sh
170+
- name: Configure
171+
run: ./configure --enable-werror --enable-openvz --enable-vserver --enable-ancient-vserver --enable-unicode --enable-hwloc --enable-delayacct --enable-sensors --enable-capabilities || ( cat config.log; exit 1; )
172+
- name: Build
173+
run: make -k
174+
- name: Run sanitized htop (1)
175+
run: ./htop -h
176+
- name: Run sanitized htop (2)
177+
run: ./htop -n 5
178+
- name: Run sanitized htop (3)
179+
run: ./htop -n 5 -t
180+
- name: Run sanitized htop (4)
181+
run: ./htop -d 1 -n 50
146182

147183
build-macos-latest-clang:
148184
runs-on: macOS-latest
@@ -155,7 +191,7 @@ jobs:
155191
- name: Bootstrap
156192
run: ./autogen.sh
157193
- name: Configure
158-
run: ./configure --enable-werror
194+
run: ./configure --enable-werror || ( cat config.log; exit 1; )
159195
- name: Build
160196
run: make -k
161197
- name: Distcheck

.github/workflows/htoprc

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
# Beware! This file is rewritten by htop when settings are changed in the interface.
2+
# The parser is also very primitive, and not human-friendly.
3+
htop_version=3.3.0-dev
4+
config_reader_min_version=3
5+
fields=0 48 17 18 38 39 40 2 46 47 49 1
6+
hide_kernel_threads=1
7+
hide_userland_threads=0
8+
hide_running_in_container=0
9+
shadow_other_users=1
10+
show_thread_names=1
11+
show_program_path=1
12+
highlight_base_name=1
13+
highlight_deleted_exe=1
14+
shadow_distribution_path_prefix=1
15+
highlight_megabytes=1
16+
highlight_threads=1
17+
highlight_changes=1
18+
highlight_changes_delay_secs=5
19+
find_comm_in_cmdline=1
20+
strip_exe_from_cmdline=1
21+
show_merged_command=1
22+
header_margin=1
23+
screen_tabs=1
24+
detailed_cpu_time=1
25+
cpu_count_from_one=0
26+
show_cpu_usage=1
27+
show_cpu_frequency=1
28+
show_cpu_temperature=1
29+
degree_fahrenheit=0
30+
update_process_names=1
31+
account_guest_in_cpu_meter=1
32+
color_scheme=0
33+
enable_mouse=1
34+
delay=15
35+
hide_function_bar=0
36+
header_layout=two_50_50
37+
column_meters_0=LeftCPUs4 CPU Memory Swap MemorySwap Zram Clock Date DateTime ZFSARC ZFSCARC SELinux SystemdUser FileDescriptors
38+
column_meter_modes_0=1 1 1 1 1 1 2 2 2 2 2 2 2 2
39+
column_meters_1=RightCPUs4 Tasks LoadAverage Load Uptime Battery System HugePages Hostname Blank PressureStallCPUSome PressureStallIOSome PressureStallIOFull PressureStallIRQFull PressureStallMemorySome PressureStallMemoryFull DiskIO NetworkIO
40+
column_meter_modes_1=1 2 2 2 2 2 2 1 2 2 2 2 2 2 2 2 2 2
41+
tree_view=0
42+
sort_key=46
43+
tree_sort_key=0
44+
sort_direction=-1
45+
tree_sort_direction=1
46+
tree_view_always_by_pid=0
47+
all_branches_collapsed=0
48+
screen:Main=PID USER PRIORITY NICE M_VIRT M_RESIDENT M_SHARE STATE PERCENT_CPU PERCENT_MEM TIME Command
49+
.sort_key=PERCENT_CPU
50+
.tree_sort_key=PID
51+
.tree_view_always_by_pid=0
52+
.tree_view=0
53+
.sort_direction=-1
54+
.tree_sort_direction=1
55+
.all_branches_collapsed=0
56+
screen:I/O=PID USER IO_PRIORITY IO_RATE IO_READ_RATE IO_WRITE_RATE PERCENT_SWAP_DELAY PERCENT_IO_DELAY Command
57+
.sort_key=IO_RATE
58+
.tree_sort_key=PID
59+
.tree_view_always_by_pid=0
60+
.tree_view=0
61+
.sort_direction=-1
62+
.tree_sort_direction=1
63+
.all_branches_collapsed=0
64+
screen:Dump=PID SCHEDULERPOLICY SYSCR CGROUP CCGROUP OOM IO_PRIORITY PERCENT_CPU_DELAY CTXT SECATTR CWD AUTOGROUP_ID Command
65+
.sort_key=PID
66+
.tree_sort_key=PID
67+
.tree_view_always_by_pid=0
68+
.tree_view=0
69+
.sort_direction=1
70+
.tree_sort_direction=1
71+
.all_branches_collapsed=0

0 commit comments

Comments
 (0)