mirror of
https://github.com/aristocratos/btop.git
synced 2024-06-27 02:20:25 +12:00
commit285fb215d1
Author: aristocratos <gnmjpl@gmail.com> Date: Thu Dec 28 13:10:18 2023 +0100 Proc::draw() -> Use std::erase_if() instead of for loops commit2fba934cde
Author: aristocratos <gnmjpl@gmail.com> Date: Wed Dec 27 00:54:28 2023 +0100 Fixed leftover code in GPU init logging false errors commitad14554f32
Author: aristocratos <gnmjpl@gmail.com> Date: Tue Dec 26 19:32:43 2023 +0100 Try alternative names for GPU libraries during GPU init commita8fda16bf6
Merge:e15e0b7
2796af3
Author: Jakob P. Liljenberg <admin@qvantnet.com> Date: Tue Dec 26 19:19:14 2023 +0100 Merge pull request #696 from aristocratos/map_safety commit2796af3f37
Author: aristocratos <gnmjpl@gmail.com> Date: Tue Dec 26 19:18:37 2023 +0100 Document DEBUG flag for Makefile commitf484326bf2
Merge:b4eb397
e15e0b7
Author: aristocratos <gnmjpl@gmail.com> Date: Tue Dec 26 19:11:26 2023 +0100 Merge branch 'main' into map_safety commitb4eb397fc6
Author: aristocratos <gnmjpl@gmail.com> Date: Mon Dec 25 10:52:52 2023 +0100 Fix errors commit3c04a7a380
Author: aristocratos <gnmjpl@gmail.com> Date: Mon Dec 25 10:41:15 2023 +0100 Added more checks and debug logging commit8b81c4a4ec
Author: aristocratos <gnmjpl@gmail.com> Date: Mon Dec 25 03:28:35 2023 +0100 Return const refs commitf836233b64
Author: aristocratos <gnmjpl@gmail.com> Date: Mon Dec 25 02:49:24 2023 +0100 Remove robin_hood.h commit3a8ceacaf8
Author: aristocratos <gnmjpl@gmail.com> Date: Mon Dec 25 02:37:32 2023 +0100 Fix call to compact and missing utility include commite15e0b7188
Author: aristocratos <gnmjpl@gmail.com> Date: Mon Dec 25 02:27:38 2023 +0100 Revert "Replace robin_hood map and set with STD alternative and add safeVal() function for map/vector access with fallback" This reverts commit6c87ab6196
. commitced47a960f
Author: aristocratos <gnmjpl@gmail.com> Date: Mon Dec 25 02:26:13 2023 +0100 Replace robin_hood map and set with STD alternative and add safeVal() function for map/vector access with fallback commit6c87ab6196
Author: aristocratos <gnmjpl@gmail.com> Date: Mon Dec 25 02:16:15 2023 +0100 Replace robin_hood map and set with STD alternative and add safeVal() function for map/vector access with fallback commita2325371d4
Merge:aab2e8c
b598f02
Author: Jakob P. Liljenberg <admin@qvantnet.com> Date: Sun Dec 17 19:56:31 2023 +0100 Merge pull request #690 from aristocratos/osx-fix commitb598f02468
Merge:b1fe377
aab2e8c
Author: Jakob P. Liljenberg <admin@qvantnet.com> Date: Sun Dec 17 12:06:39 2023 +0100 Merge branch 'main' into osx-fix commitaab2e8cc55
Author: Jakob P. Liljenberg <admin@qvantnet.com> Date: Sun Dec 17 12:03:47 2023 +0100 Fixed test-snap-can-build.yml commitb1fe3779e1
Merge:7805242
2d15c41
Author: Jakob P. Liljenberg <admin@qvantnet.com> Date: Sun Dec 17 11:56:14 2023 +0100 Merge branch 'main' into osx-fix commit2d15c41555
Merge:fe699b4
2d3e453
Author: Jakob P. Liljenberg <admin@qvantnet.com> Date: Sun Dec 17 11:54:49 2023 +0100 Merge pull request #684 from kz6fittycent/main commit2d3e453ed5
Merge:0a38864
fe699b4
Author: kz6fittycent <jimmy.tigert@gmail.com> Date: Fri Dec 15 12:02:11 2023 -0600 Merge branch 'main' into main commit0a388647cc
Author: kz6fittycent <jimmy.tigert@gmail.com> Date: Fri Dec 15 12:01:45 2023 -0600 Update test-snap-can-build.yml whoops commit49f425f356
Author: kz6fittycent <jimmy.tigert@gmail.com> Date: Fri Dec 15 12:00:48 2023 -0600 Update test-snap-can-build.yml https://github.com/aristocratos/btop/pull/684#issuecomment-1852801811 commit780524267f
Author: Jos Dehaes <jos.dehaes@gmail.com> Date: Fri Dec 15 09:02:57 2023 +0100 conditional compile on Big Sur and up commitfe699b4333
Author: aristocratos <gnmjpl@gmail.com> Date: Tue Dec 12 23:20:09 2023 +0100 Version bump to 1.3.0 in preparation for upcoming release commit2d2df23198
Merge:d7b581e
b71538e
Author: aristocratos <gnmjpl@gmail.com> Date: Tue Dec 12 23:19:31 2023 +0100 Merge branch 'main' of github.com:aristocratos/btop commitd7b581eda4
Author: aristocratos <gnmjpl@gmail.com> Date: Tue Dec 12 23:17:36 2023 +0100 Updated changes commitb71538eabe
Merge:a017056
730af5d
Author: Jakob P. Liljenberg <admin@qvantnet.com> Date: Tue Dec 12 23:07:39 2023 +0100 Merge pull request #666 from muneebmahmed/macos-clang commit730af5d4e1
Merge:0246b1b
a017056
Author: Jakob P. Liljenberg <admin@qvantnet.com> Date: Tue Dec 12 23:05:52 2023 +0100 Merge branch 'main' into macos-clang commita017056ea0
Author: aristocratos <gnmjpl@gmail.com> Date: Tue Dec 12 23:05:07 2023 +0100 Added swap to ignore for statvfs() since it will always fail commite770cccaf8
Author: aristocratos <gnmjpl@gmail.com> Date: Tue Dec 12 22:55:48 2023 +0100 Added try->catch for get_zfs_stat_file() to avoid fs error commit0246b1b971
Author: Muneeb Ahmed <32603485+muneebmahmed@users.noreply.github.com> Date: Mon Nov 20 12:18:40 2023 -0800 Enable macos clang Apple clang uses different versioning from LLVM, so 15.0.0 is compatible commit6282f36f8f
Merge:cfd20a3
be73160
Author: Jakob P. Liljenberg <admin@qvantnet.com> Date: Tue Dec 12 22:06:02 2023 +0100 Merge pull request #675 from imwints/cmake commitbe731600f1
Merge:f4b14ce
cfd20a3
Author: Jakob P. Liljenberg <admin@qvantnet.com> Date: Tue Dec 12 22:01:21 2023 +0100 Merge branch 'main' into cmake commit450b59b657
Merge:875f08b
cfd20a3
Author: Jakob P. Liljenberg <admin@qvantnet.com> Date: Tue Dec 12 21:55:27 2023 +0100 Merge branch 'main' into main commitcfd20a374b
Merge:14e664e
b6a8696
Author: Jakob P. Liljenberg <admin@qvantnet.com> Date: Tue Dec 12 21:48:55 2023 +0100 Merge pull request #677 from imwints/cpu-model commitb6a86962e2
Merge:8096433
14e664e
Author: Jakob P. Liljenberg <admin@qvantnet.com> Date: Tue Dec 12 21:47:01 2023 +0100 Merge branch 'main' into cpu-model commit14e664e756
Merge:0d35746
5902484
Author: Jakob P. Liljenberg <admin@qvantnet.com> Date: Tue Dec 12 21:41:55 2023 +0100 Merge pull request #679 from masiboss/main commit875f08ba5e
Author: kz6fittycent <jimmy.tigert@gmail.com> Date: Tue Dec 12 14:27:16 2023 -0600 Update snapcraft.yaml - opengl - Testing opengl plug commit3ee4b18e57
Author: kz6fittycent <jimmy.tigert@gmail.com> Date: Tue Dec 12 14:14:59 2023 -0600 Update bug_report.md - added snap info for bug reports to delineate commit2973a76f2b
Merge:fb782a2
0d35746
Author: kz6fittycent <jimmy.tigert@gmail.com> Date: Tue Dec 12 14:06:44 2023 -0600 Merge branch 'aristocratos:main' into main commitfb782a2ab3
Author: kz6fittycent <jimmy.tigert@gmail.com> Date: Tue Dec 12 14:02:27 2023 -0600 Create test-snap-can-build.yml commit5902484f39
Author: masiboss <32394683+masiboss@users.noreply.github.com> Date: Thu Dec 7 21:42:11 2023 +0100 simplify removal of "Apple" commit5beb9e12e5
Author: masiboss <32394683+masiboss@users.noreply.github.com> Date: Thu Dec 7 20:56:40 2023 +0100 in case apple decides to add another suffix to the cpu name commit1b2f11b412
Author: masiboss <32394683+masiboss@users.noreply.github.com> Date: Thu Dec 7 20:49:34 2023 +0100 cut less of cpu name if frequency is not shown commitbcf4ad8ab6
Author: masiboss <32394683+masiboss@users.noreply.github.com> Date: Thu Dec 7 19:50:12 2023 +0100 fix array out of bounds on regular m chip commitaeefcacbc9
Author: masiboss <32394683+masiboss@users.noreply.github.com> Date: Thu Dec 7 19:34:11 2023 +0100 fix cpu version not included commit23698940df
Author: masiboss <32394683+masiboss@users.noreply.github.com> Date: Thu Dec 7 19:23:58 2023 +0100 strip "Apple" from name of Apple silicon chips commit8096433736
Author: Steffen Winter <steffen.winter@proton.me> Date: Tue Dec 5 02:34:24 2023 +0100 Fix printed model name for older Intel CPU commitf4b14ce97e
Author: Steffen Winter <steffen.winter@proton.me> Date: Tue Dec 5 01:00:14 2023 +0100 Add CMake compile instructions for macOS commit97b35d9720
Author: Steffen Winter <steffen.winter@proton.me> Date: Sat Dec 2 00:35:13 2023 +0100 Add cmake workflow for all platforms commite35538fa29
Author: Steffen Winter <steffen.winter@proton.me> Date: Sat Dec 2 00:34:32 2023 +0100 Patch RPATH on FreeBSD, support OSX and format commit0d357468b5
Merge:ebc46ca
00f58b6
Author: Jakob P. Liljenberg <admin@qvantnet.com> Date: Fri Dec 1 22:52:51 2023 +0100 Merge pull request #674 from imwints/bsd-workflow Provide FreeBSD static release binaries commit00f58b6228
Author: Steffen Winter <steffen.winter@proton.me> Date: Thu Nov 30 23:07:52 2023 +0100 Provide FreeBSD static release binaries Bumps vmaction@freesdb-vm to version 1 which runs on Linux and doesn't hang all the time. Also uses clang for full static compilation commitebc46ca12c
Author: Jakob P. Liljenberg <admin@qvantnet.com> Date: Mon Nov 27 18:21:42 2023 +0100 Clean up compile instructions commitd1384c9341
Merge:2b0cc37
6f12e35
Author: Jakob P. Liljenberg <admin@qvantnet.com> Date: Mon Nov 27 17:53:39 2023 +0100 Merge pull request #671 from imwints/cmake-gpu Bring GPU support to CMake and improve how Make handles the ROCm library build commit6f12e3555d
Author: Steffen Winter <steffen.winter@proton.me> Date: Mon Nov 27 00:33:11 2023 +0100 Properly invoke CMake to build ROCm * Build an optimized library by default * Only build the library target * ROCm is build with debug symbols when `make DEBUG=true` * Enable LTO * Use the more generic CMake build command instead of calling make directly, this always uses all cores by default and makes it easier to switch to another generator e.g. Ninja * Use a variable to store the ROCm source directory. The directory can be changed with `make ROCM_DIR=<dir>` * The static library is now directly linked by CMake and not created off of the object files from a shared library build * The C++ compiler used to compile btop is now used to compile ROCm to avoid name mangling when `CXX` from the environment and `make CXX=` differ * CMake is invoked from btop's root directory commit0585bc9cfb
Author: Steffen Winter <steffen.winter@proton.me> Date: Mon Nov 27 00:31:10 2023 +0100 Suppress all output from ROCm build Similar to including external include files with `-isystem`, ignore output from ROCm build since these warnings aren't a concern here commit831be262b0
Author: Steffen Winter <steffen.winter@proton.me> Date: Mon Nov 27 00:29:14 2023 +0100 Remove ROCm object files with `make clean/distclean` commit2f59e61d87
Author: Steffen Winter <steffen.winter@proton.me> Date: Sun Nov 26 22:56:58 2023 +0100 Add GPU options for cmake based builds commit7588d96dd4
Author: Steffen Winter <steffen.winter@proton.me> Date: Sun Nov 26 21:40:29 2023 +0100 Add check for <ranges> header commitebbb769a6a
Author: Steffen Winter <steffen.winter@proton.me> Date: Sun Nov 26 21:39:13 2023 +0100 Move calls to find_package to where they're required commited0fa34a9d
Author: Steffen Winter <steffen.winter@proton.me> Date: Sun Nov 26 19:39:29 2023 +0100 Bump required CMake version commit2b0cc37632
Author: Jakob P. Liljenberg <admin@qvantnet.com> Date: Sat Nov 25 23:11:54 2023 +0100 Update compile instructions for Gpu support commit359c67136b
Author: aristocratos <gnmjpl@gmail.com> Date: Sat Nov 25 22:49:26 2023 +0100 Update changelog commit5b01235315
Merge:0267eba
0bb8599
Author: Jakob P. Liljenberg <admin@qvantnet.com> Date: Sat Nov 25 21:57:32 2023 +0100 Merge pull request #529 from romner-set/main Add GPU monitoring support commit0bb8599a96
Merge:94d4502
0267eba
Author: Jakob P. Liljenberg <admin@qvantnet.com> Date: Sat Nov 25 21:51:09 2023 +0100 Merge branch 'main' into main commit94d4502901
Author: aristocratos <gnmjpl@gmail.com> Date: Sat Nov 25 21:48:50 2023 +0100 Readme update and Makfile fixes. commit19bcff894b
Author: aristocratos <gnmjpl@gmail.com> Date: Sat Nov 25 21:01:11 2023 +0100 Squashed commit of the following: commit0267eba2bb
Merge:50bbab0
e81cf2b
Author: Jakob P. Liljenberg <admin@qvantnet.com> Date: Wed Nov 15 21:43:18 2023 +0100 Merge pull request #659 from ivanp7/patch-1 Add alternative key codes for Delete, Insert, Home, End commit50bbab0512
Merge:9edbf27
5a14c7b
Author: Jakob P. Liljenberg <admin@qvantnet.com> Date: Wed Nov 15 21:35:50 2023 +0100 Merge pull request #660 from stradicat/feature/elementarish Elementarish theme: color update according to Elementary palette commit5a14c7b6fa
Merge:979506f
71eb414
Author: Dennis Mayr <dmayr.dev@gmail.com> Date: Wed Nov 15 17:27:34 2023 -0300 Merge branch 'main' of https://github.com/stradicat/btop commit979506f18e
Author: Dennis Mayr <dmayr.dev@gmail.com> Date: Wed Nov 8 11:17:47 2023 -0300 Elementarish theme: color update according to Elementary palette commit71eb4142e8
Author: Dennis Mayr <dmayr.dev@gmail.com> Date: Wed Nov 8 11:17:47 2023 -0300 Elementarish theme: color update according to Elementary palette commite81cf2b7ff
Author: vân <3432246+ivanp7@users.noreply.github.com> Date: Tue Nov 7 15:12:27 2023 +0000 Add alternative key codes for Insert, Home, End commitf9452ff6d5
Author: vân <3432246+ivanp7@users.noreply.github.com> Date: Mon Nov 6 13:31:53 2023 +0000 Add alternative Delete key code Delete key not always produces ^[[3~, on some terminals (like st) it produces ^[[P. commit9edbf27f1b
Merge:2a864f6
ff1f51c
Author: Jakob P. Liljenberg <admin@qvantnet.com> Date: Sat Oct 21 02:09:55 2023 +0200 Merge pull request #649 from nobounce/workflow-timeout Set FreeBSD workflow timeout commitff1f51ccbb
Author: Steffen Winter <steffen.winter@proton.me> Date: Wed Oct 18 22:26:36 2023 +0200 Set FreeBSD workflow timeout Recently the FreeBSD workflow has started to hang in a boot loop when the VM starts up. The issue is being tracked upstream but there is not response at the moment. To work around this set a timeout to not waste CI minutes. Other workflows might also want this change since they don't take 20 minutes anyway. commit2a864f6f2e
Merge:636eb25
b2bf8ef
Author: Jakob P. Liljenberg <admin@qvantnet.com> Date: Sat Oct 7 10:40:54 2023 +0200 Merge pull request #643 from DecklynKern/main Fix scrollbar not clearing sometimes. commitb2bf8ef504
Author: DecklynKern <DecklynKern@gmail.com> Date: Fri Oct 6 17:33:38 2023 -0600 Fix scrollbar not clearing sometimes. commit636eb25f5e
Merge:260c0f6
b5ba2fc
Author: Jakob P. Liljenberg <admin@qvantnet.com> Date: Sat Sep 30 19:51:03 2023 +0200 Merge pull request #623 from rahulaggarwal965/main Add keybind for toggling memory display mode in PROC box commitb5ba2fc963
Author: Rahul Aggarwal <rahulaggarwal965@gmail.com> Date: Wed Sep 20 22:55:56 2023 -0400 Add keybind for toggling memory display mode in PROC box commit260c0f6623
Merge:52bfff7
e6a06eb
Author: Jakob P. Liljenberg <admin@qvantnet.com> Date: Sat Sep 30 18:56:25 2023 +0200 Merge pull request #635 from lvxnull/editorconfig Add hpp files to .editorconfig commite6a06eb729
Author: lvxnull <86745229+lvxnull@users.noreply.github.com> Date: Thu Sep 28 19:44:47 2023 +0200 Add hpp files to .editorconfig commit52bfff7ceb
Merge:1f72e56
19dbbe1
Author: Jakob P. Liljenberg <admin@qvantnet.com> Date: Sat Sep 30 18:55:08 2023 +0200 Merge pull request #636 from nobounce/performance-iili Minor string initialization improvement commit19dbbe1a17
Author: nobounce <steffen.winter@proton.me> Date: Fri Sep 29 12:20:59 2023 +0200 Minor string initialization improvement commit1f72e56c7d
Merge:278a0e6
cdcf8bc
Author: Jakob P. Liljenberg <admin@qvantnet.com> Date: Fri Sep 29 10:43:21 2023 +0200 Merge pull request #633 from crestfallnatwork/main [fix] Made disks statvfs logic asynchronous. commitcdcf8bc929
Author: crestfalln <guptahiman01@gmail.com> Date: Fri Sep 29 09:07:27 2023 +0530 fixed bug where updated disks stats overrided disk io data commit9b4e85f08d
Author: crestfalln <no-reply@crestfalln.com> Date: Thu Sep 28 04:57:05 2023 +0530 fixed bug where updated disks stats overrided disk io data commit889623874e
Author: crestfalln <no-reply@crestfalln.com> Date: Wed Sep 27 23:57:06 2023 +0530 made disks stat logic async commit278a0e6b17
Merge:d16adc9
e89519f
Author: Jakob P. Liljenberg <admin@qvantnet.com> Date: Thu Sep 28 18:32:09 2023 +0200 Merge pull request #630 from lvxnull/signal-list Fix signal list on non-linux/weird linux platforms commite89519fbb2
Author: lvxnull <86745229+lvxnull@users.noreply.github.com> Date: Sun Sep 24 21:44:38 2023 +0200 Fix signal list on non-linux/weird linux platforms commitd16adc9fd0
Merge:2c3ac48
f34b408
Author: Jakob P. Liljenberg <admin@qvantnet.com> Date: Thu Sep 28 18:20:42 2023 +0200 Merge pull request #618 from nobounce/aggregate-child-processes Add option to accumulate a child's resources in parent in tree-view commitf34b40892f
Author: nobounce <steffen.winter@proton.me> Date: Sun Sep 24 16:34:50 2023 +0200 Make process thread count better readable when wider than 5 digits commit6027cedd42
Author: nobounce <steffen.winter@proton.me> Date: Thu Sep 14 23:27:05 2023 +0200 Add option to accumulate a child's resources in parent in tree-view commit2c3ac4855d
Merge:f90dc37
5c6a281
Author: Jakob P. Liljenberg <admin@qvantnet.com> Date: Wed Sep 13 21:14:56 2023 +0200 Merge pull request #589 from nobounce/cmake Add CMake support for Linux commitf90dc37c26
Merge:0cac861
68a49c1
Author: Jakob P. Liljenberg <admin@qvantnet.com> Date: Wed Sep 13 20:27:05 2023 +0200 Merge pull request #610 from SidVeld/feature/horizon-theme Horizon theme commit5c6a281002
Author: nobounce <steffen.winter@proton.me> Date: Tue Aug 29 20:39:00 2023 +0200 Add CMake support Linux is completly supported FreeBSD is not able to create a static executable for now. See https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=273398 MacOS was not tested commit68a49c10a6
Author: SidVeld <sidveld@gmail.com> Date: Wed Sep 6 18:03:31 2023 +0300 Add horizon theme commit0cac861910
Merge:31be436
f798acd
Author: Jakob P. Liljenberg <admin@qvantnet.com> Date: Tue Sep 5 19:27:38 2023 +0200 Merge pull request #609 from scorpion-26/byteconv Fix short conversion of 1000-1023 *iB commitf798acdaf7
Author: scorpion-26 <dev.scorpion26@gmail.com> Date: Tue Sep 5 18:00:47 2023 +0200 Fix short conversion of 1000-1023*iB floating_humanizer([1000-1024], true) with base 8 returns "2K", whereas it should return "1.0K" to align with other formats. The conversion is also broken for all other units(e.g. 1023M is also broken and returns "2G") commit31be4362ce
Author: aristocratos <gnmjpl@gmail.com> Date: Sun Aug 27 02:00:07 2023 +0200 FreeBSD Github action 13.1 -> 13.2 and static libgcc and libstdc++ commitfc523fd1d0
Author: aristocratos <gnmjpl@gmail.com> Date: Sun Aug 27 01:36:26 2023 +0200 Fix for FreeBSD github action not failing "correctly"... commitb87772611c
Author: aristocratos <gnmjpl@gmail.com> Date: Sat Nov 25 20:44:45 2023 +0100 Added definition GPU_SUPPORT to toggle GPU related code commit0267eba2bb
Merge:50bbab0
e81cf2b
Author: Jakob P. Liljenberg <admin@qvantnet.com> Date: Wed Nov 15 21:43:18 2023 +0100 Merge pull request #659 from ivanp7/patch-1 Add alternative key codes for Delete, Insert, Home, End commit50bbab0512
Merge:9edbf27
5a14c7b
Author: Jakob P. Liljenberg <admin@qvantnet.com> Date: Wed Nov 15 21:35:50 2023 +0100 Merge pull request #660 from stradicat/feature/elementarish Elementarish theme: color update according to Elementary palette commit5a14c7b6fa
Merge:979506f
71eb414
Author: Dennis Mayr <dmayr.dev@gmail.com> Date: Wed Nov 15 17:27:34 2023 -0300 Merge branch 'main' of https://github.com/stradicat/btop commit979506f18e
Author: Dennis Mayr <dmayr.dev@gmail.com> Date: Wed Nov 8 11:17:47 2023 -0300 Elementarish theme: color update according to Elementary palette commit71eb4142e8
Author: Dennis Mayr <dmayr.dev@gmail.com> Date: Wed Nov 8 11:17:47 2023 -0300 Elementarish theme: color update according to Elementary palette commite81cf2b7ff
Author: vân <3432246+ivanp7@users.noreply.github.com> Date: Tue Nov 7 15:12:27 2023 +0000 Add alternative key codes for Insert, Home, End commitf9452ff6d5
Author: vân <3432246+ivanp7@users.noreply.github.com> Date: Mon Nov 6 13:31:53 2023 +0000 Add alternative Delete key code Delete key not always produces ^[[3~, on some terminals (like st) it produces ^[[P. commit9edbf27f1b
Merge:2a864f6
ff1f51c
Author: Jakob P. Liljenberg <admin@qvantnet.com> Date: Sat Oct 21 02:09:55 2023 +0200 Merge pull request #649 from nobounce/workflow-timeout Set FreeBSD workflow timeout commitff1f51ccbb
Author: Steffen Winter <steffen.winter@proton.me> Date: Wed Oct 18 22:26:36 2023 +0200 Set FreeBSD workflow timeout Recently the FreeBSD workflow has started to hang in a boot loop when the VM starts up. The issue is being tracked upstream but there is not response at the moment. To work around this set a timeout to not waste CI minutes. Other workflows might also want this change since they don't take 20 minutes anyway. commit2a864f6f2e
Merge:636eb25
b2bf8ef
Author: Jakob P. Liljenberg <admin@qvantnet.com> Date: Sat Oct 7 10:40:54 2023 +0200 Merge pull request #643 from DecklynKern/main Fix scrollbar not clearing sometimes. commitb2bf8ef504
Author: DecklynKern <DecklynKern@gmail.com> Date: Fri Oct 6 17:33:38 2023 -0600 Fix scrollbar not clearing sometimes. commit636eb25f5e
Merge:260c0f6
b5ba2fc
Author: Jakob P. Liljenberg <admin@qvantnet.com> Date: Sat Sep 30 19:51:03 2023 +0200 Merge pull request #623 from rahulaggarwal965/main Add keybind for toggling memory display mode in PROC box commitb5ba2fc963
Author: Rahul Aggarwal <rahulaggarwal965@gmail.com> Date: Wed Sep 20 22:55:56 2023 -0400 Add keybind for toggling memory display mode in PROC box commit260c0f6623
Merge:52bfff7
e6a06eb
Author: Jakob P. Liljenberg <admin@qvantnet.com> Date: Sat Sep 30 18:56:25 2023 +0200 Merge pull request #635 from lvxnull/editorconfig Add hpp files to .editorconfig commite6a06eb729
Author: lvxnull <86745229+lvxnull@users.noreply.github.com> Date: Thu Sep 28 19:44:47 2023 +0200 Add hpp files to .editorconfig commit52bfff7ceb
Merge:1f72e56
19dbbe1
Author: Jakob P. Liljenberg <admin@qvantnet.com> Date: Sat Sep 30 18:55:08 2023 +0200 Merge pull request #636 from nobounce/performance-iili Minor string initialization improvement commit19dbbe1a17
Author: nobounce <steffen.winter@proton.me> Date: Fri Sep 29 12:20:59 2023 +0200 Minor string initialization improvement commit1f72e56c7d
Merge:278a0e6
cdcf8bc
Author: Jakob P. Liljenberg <admin@qvantnet.com> Date: Fri Sep 29 10:43:21 2023 +0200 Merge pull request #633 from crestfallnatwork/main [fix] Made disks statvfs logic asynchronous. commitcdcf8bc929
Author: crestfalln <guptahiman01@gmail.com> Date: Fri Sep 29 09:07:27 2023 +0530 fixed bug where updated disks stats overrided disk io data commit9b4e85f08d
Author: crestfalln <no-reply@crestfalln.com> Date: Thu Sep 28 04:57:05 2023 +0530 fixed bug where updated disks stats overrided disk io data commit889623874e
Author: crestfalln <no-reply@crestfalln.com> Date: Wed Sep 27 23:57:06 2023 +0530 made disks stat logic async commit278a0e6b17
Merge:d16adc9
e89519f
Author: Jakob P. Liljenberg <admin@qvantnet.com> Date: Thu Sep 28 18:32:09 2023 +0200 Merge pull request #630 from lvxnull/signal-list Fix signal list on non-linux/weird linux platforms commite89519fbb2
Author: lvxnull <86745229+lvxnull@users.noreply.github.com> Date: Sun Sep 24 21:44:38 2023 +0200 Fix signal list on non-linux/weird linux platforms commitd16adc9fd0
Merge:2c3ac48
f34b408
Author: Jakob P. Liljenberg <admin@qvantnet.com> Date: Thu Sep 28 18:20:42 2023 +0200 Merge pull request #618 from nobounce/aggregate-child-processes Add option to accumulate a child's resources in parent in tree-view commitf34b40892f
Author: nobounce <steffen.winter@proton.me> Date: Sun Sep 24 16:34:50 2023 +0200 Make process thread count better readable when wider than 5 digits commit6027cedd42
Author: nobounce <steffen.winter@proton.me> Date: Thu Sep 14 23:27:05 2023 +0200 Add option to accumulate a child's resources in parent in tree-view commit2c3ac4855d
Merge:f90dc37
5c6a281
Author: Jakob P. Liljenberg <admin@qvantnet.com> Date: Wed Sep 13 21:14:56 2023 +0200 Merge pull request #589 from nobounce/cmake Add CMake support for Linux commitf90dc37c26
Merge:0cac861
68a49c1
Author: Jakob P. Liljenberg <admin@qvantnet.com> Date: Wed Sep 13 20:27:05 2023 +0200 Merge pull request #610 from SidVeld/feature/horizon-theme Horizon theme commit5c6a281002
Author: nobounce <steffen.winter@proton.me> Date: Tue Aug 29 20:39:00 2023 +0200 Add CMake support Linux is completly supported FreeBSD is not able to create a static executable for now. See https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=273398 MacOS was not tested commit68a49c10a6
Author: SidVeld <sidveld@gmail.com> Date: Wed Sep 6 18:03:31 2023 +0300 Add horizon theme commit0cac861910
Merge:31be436
f798acd
Author: Jakob P. Liljenberg <admin@qvantnet.com> Date: Tue Sep 5 19:27:38 2023 +0200 Merge pull request #609 from scorpion-26/byteconv Fix short conversion of 1000-1023 *iB commitf798acdaf7
Author: scorpion-26 <dev.scorpion26@gmail.com> Date: Tue Sep 5 18:00:47 2023 +0200 Fix short conversion of 1000-1023*iB floating_humanizer([1000-1024], true) with base 8 returns "2K", whereas it should return "1.0K" to align with other formats. The conversion is also broken for all other units(e.g. 1023M is also broken and returns "2G") commit975525d38f
Author: aristocratos <gnmjpl@gmail.com> Date: Sun Aug 27 12:34:46 2023 +0200 Fix: Cpu gpu stats always shown when show_gpu_info is On and sizing issues commit08abf0b930
Author: aristocratos <gnmjpl@gmail.com> Date: Sun Aug 27 01:28:36 2023 +0200 Quickfixes for MacOS and FreeBSD compilation. commit7290109f80
Author: aristocratos <gnmjpl@gmail.com> Date: Sun Aug 27 00:58:30 2023 +0200 Merge fix commit283d463242
Merge:efddad4
c296ac1
Author: aristocratos <gnmjpl@gmail.com> Date: Sun Aug 27 00:56:22 2023 +0200 Merge branch 'main' into pr/romner-set/529 commitefddad42dc
Author: aristocratos <gnmjpl@gmail.com> Date: Sun Aug 27 00:39:57 2023 +0200 Changed: cpu_graph_lower Auto defaults to cpu_graph_upper when show_gpu_info is Off commita9bc0874d4
Author: aristocratos <gnmjpl@gmail.com> Date: Sun Aug 27 00:31:07 2023 +0200 Added show_gpu_info setting and Auto options for cpu graphs commitb3970ee19c
Author: aristocratos <gnmjpl@gmail.com> Date: Sat Aug 26 20:52:59 2023 +0200 Fixed: Key 5-0 gpu box toggle commitbd5d697830
Author: aristocratos <gnmjpl@gmail.com> Date: Sat Aug 26 20:29:43 2023 +0200 Squashed commit of the following: commitc296ac13cd
Merge:9a1e760
091c30a
Author: Jakob P. Liljenberg <admin@qvantnet.com> Date: Sat Aug 26 19:29:57 2023 +0200 Merge pull request #590 from nobounce/dangling-reference-config Convert parameters and config keys to std::string_view commit9a1e760a66
Merge:9c8af4d
22e64ca
Author: Jakob P. Liljenberg <admin@qvantnet.com> Date: Sat Aug 26 19:20:18 2023 +0200 Merge pull request #602 from jfouquart/main Fix getting zfs pool name with '.' char in freebsd commit9c8af4df43
Merge:8a49d8c
2217cbe
Author: Jakob P. Liljenberg <admin@qvantnet.com> Date: Sat Aug 26 19:18:55 2023 +0200 Merge pull request #601 from joske/cleanup [macos] don't check /sys on macos commit8a49d8cf45
Merge:1556388
008fcd8
Author: Jakob P. Liljenberg <admin@qvantnet.com> Date: Sat Aug 26 19:18:07 2023 +0200 Merge pull request #600 from joske/makefile [macos/freebsd] support gcc13 commit1556388c83
Merge:1b126f5
d17e1a2
Author: Jakob P. Liljenberg <admin@qvantnet.com> Date: Sat Aug 26 19:14:00 2023 +0200 Merge pull request #599 from joske/main [macos] fix temp sensor on system with many cores commitd17e1a2dac
Author: Jos Dehaes <jos.dehaes@gmail.com> Date: Fri Aug 25 16:18:39 2023 +0200 fix some warnings commit4d8aa6b118
Author: Jos Dehaes <jos.dehaes@gmail.com> Date: Fri Aug 25 15:52:58 2023 +0200 fix core check commit22e64caaff
Author: Jonathan Fouquart <jfouquart@hotmail.fr> Date: Fri Aug 25 09:37:49 2023 +0200 Fix getting zfs pool name with '.' char in freebsd commit2217cbe143
Author: Jos Dehaes <jos.dehaes@gmail.com> Date: Wed Aug 23 16:01:04 2023 +0200 [macos] don't check /sys on macos commit008fcd889e
Author: Jos Dehaes <jos.dehaes@gmail.com> Date: Wed Aug 23 16:05:00 2023 +0200 also add g++13 commit0fdca5eb03
Author: Jos Dehaes <jos.dehaes@gmail.com> Date: Wed Aug 23 15:54:07 2023 +0200 support gcc13 commitdcbdb7360d
Author: Jos Dehaes <jos.dehaes@gmail.com> Date: Wed Aug 23 15:46:47 2023 +0200 [macos] fix temp sensor on system with many cores commit1b126f55e3
Author: aristocratos <gnmjpl@gmail.com> Date: Fri Aug 4 01:08:27 2023 +0200 Update Makefile for partial static compilation on freebsd commitc8ec6bbb00
Author: aristocratos <gnmjpl@gmail.com> Date: Thu Aug 3 23:08:33 2023 +0200 Fix freebsd nullptr changes and makefile for gcc12 and newer commit8a33aab588
Merge:94e5c02
e4abcef
Author: Jakob P. Liljenberg <admin@qvantnet.com> Date: Sun Jul 30 13:21:48 2023 +0200 Merge pull request #539 from nobounce/replace-NULL-nullptr Modernize using nullptr. commit94e5c02d11
Author: aristocratos <gnmjpl@gmail.com> Date: Thu Jul 27 20:51:21 2023 +0200 Better text editing commit091c30ab2b
Author: nobounce <steffen.winter@proton.me> Date: Thu Jul 27 14:17:54 2023 +0200 Convert parameters and config keys to std::string_view Using std::string_view instead of std::string& silences a new warning from GCC 13, -Wdangling-reference Also switch return type of `getI` from int& to int, trivial types are cheaper to copy by value commite4abcefbf9
Author: nobounce <steffen.winter@proton.me> Date: Wed Jul 26 16:19:17 2023 +0200 Use nullptr instead of NULL. See https://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2431.pdf TLDR: NULL is of type int and relies on proper implicit pointer conversion which may lead to issues when using overloaded functions It is also considered a 'best practise' for modern C++ and conveys the programmers intention more precisly. commitd53307f14c
Author: nobounce <steffen.winter@proton.me> Date: Sun Jul 23 19:53:36 2023 +0200 Fix path to Linux CI file in itself The CI file has a list of dependent files including itself. The path was not updated when the CI was split into different files commit594f42b9eb
Merge:aca2e4b
53d6eba
Author: Jakob P. Liljenberg <admin@qvantnet.com> Date: Wed Jul 26 15:38:01 2023 +0200 Merge pull request #584 from nobounce/nb/fix-ci-path Fix path to Linux CI file in itself commitaca2e4be75
Author: aristocratos <gnmjpl@gmail.com> Date: Wed Jul 26 14:38:48 2023 +0200 Fix whitespace indent -> tab indent commit33faa01910
Author: aristocratos <gnmjpl@gmail.com> Date: Wed Jul 26 14:34:15 2023 +0200 Revert fmt submodule to static fmt folder in include commit53d6ebabc0
Author: nobounce <steffen.winter@proton.me> Date: Sun Jul 23 19:53:36 2023 +0200 Fix path to Linux CI file in itself The CI file has a list of dependent files including itself. The path was not updated when the CI was split into different files commit346c9e479b
Author: romner <roman@skotnica.com> Date: Wed Jul 19 16:53:58 2023 +0200 Fix GPU text overflow in CPU panel, again commit3a5e5fd5d3
Author: romner <roman@skotnica.com> Date: Wed Jul 19 16:22:45 2023 +0200 Improve 0-10 key input commit972b2b6a01
Author: romner <roman@skotnica.com> Date: Wed Jul 19 15:54:35 2023 +0200 Fix available boxes in menu & config description commit1f73453aec
Author: romner <roman@skotnica.com> Date: Wed Jul 19 15:34:23 2023 +0200 Fix crashes when trying to open nth GPU box with only n-1 GPUs in the system commit46c6be0a29
Author: romner <roman@skotnica.com> Date: Sun Jul 16 17:19:09 2023 +0200 Fix GPU horizontal text overflow in CPU panel commit85fb28cee6
Author: romner <roman@skotnica.com> Date: Fri Jul 14 02:39:44 2023 +0200 Fix RSMI_STATIC=true and add GPU section to README.md commit3fad8a6fde
Author: romner-set <roman@skotnica.com> Date: Mon Jun 26 13:10:31 2023 +0200 Add GPU options commit746f716a02
Author: romner-set <roman@skotnica.com> Date: Fri Jun 16 11:11:57 2023 +0200 Remove lib/rocm_smi_lib and add instructions for obtaining it to README commitd8ebbe1181
Author: romner <roman@skotnica.com> Date: Thu Jun 8 20:24:01 2023 +0200 Join NVML PCIe threads only if PCIe TX/RX is supported by GPU commitbe10989151
Author: romner <roman@skotnica.com> Date: Tue Jun 6 19:47:07 2023 +0200 Parallelize NVML PCIe TX/RX data collection commit85892a9fe3
Author: aristocratos <gnmjpl@gmail.com> Date: Mon Jun 5 21:59:26 2023 +0200 Fix type: ulong -> size_t and compare std::cmp_less commit85a10f0305
Author: romner <roman@skotnica.com> Date: Fri Jun 2 16:14:24 2023 +0200 Fix ROCm SMI makefile flags commitcd6979277d
Author: romner <roman@skotnica.com> Date: Fri Jun 2 15:44:44 2023 +0200 Fix error when ROCm SMI static compilation fails commitdaaa45324f
Author: romner <roman@skotnica.com> Date: Fri Jun 2 15:34:12 2023 +0200 Load ROCm SMI dynamically by default, optionally statically compile and link commit093edfe948
Author: aristocratos <gnmjpl@gmail.com> Date: Thu Jun 1 19:49:00 2023 +0200 Minor changes in wording... commitb9a4d31fa4
Author: aristocratos <gnmjpl@gmail.com> Date: Thu Jun 1 19:37:53 2023 +0200 Fix Makefile dependency order and layout commita0163ce220
Author: romner <roman@skotnica.com> Date: Thu Jun 1 16:42:02 2023 +0200 Statically link ROCm SMI commitb2df0696fd
Author: romner-set <roman@skotnica.com> Date: Thu Jun 1 03:41:56 2023 +0200 Dynamically load NVML commit547f17dda3
Author: romner-set <roman@skotnica.com> Date: Tue May 30 18:24:50 2023 +0200 Add more GPU graph types to the CPU panel commit842c761a73
Author: romner-set <roman@skotnica.com> Date: Mon May 22 09:46:20 2023 +0200 Fix crash when all GPU panels are open but the CPU panel is closed commit8c96bd51e9
Author: romner <roman@skotnica.com> Date: Sun May 21 20:34:47 2023 +0200 Handle GPUs which cannot report certain stats in GPU panel commit414d7eb94c
Author: romner <roman@skotnica.com> Date: Sun May 21 18:02:50 2023 +0200 Handle GPUs which cannot report certain stats in btop_collect.cpp and CPU panel commit005de97e6d
Author: aristocratos <gnmjpl@gmail.com> Date: Sun May 21 13:58:11 2023 +0200 Add missing fmt prefixes commit1fee2bc08b
Author: aristocratos <gnmjpl@gmail.com> Date: Sun May 21 13:52:19 2023 +0200 Add DebugTimer class and change some Logger::error calls to Logger::debug commit2e68c0b916
Author: aristocratos <gnmjpl@gmail.com> Date: Sat May 20 17:27:20 2023 +0200 Fixed key > gpu_names check commit04ed16a9f6
Author: aristocratos <gnmjpl@gmail.com> Date: Sat May 20 17:15:45 2023 +0200 Merged changes from main commit8c710a2b68
Author: aristocratos <gnmjpl@gmail.com> Date: Sat May 20 01:41:04 2023 +0200 Makefile auto detection and initial logic for excluding gpu code when libs are missing commit8bae1ec092
Author: aristocratos <gnmjpl@gmail.com> Date: Sat May 20 00:13:00 2023 +0200 Fixed debug timer for gpu commit01acfd603e
Author: romner-set <roman@skotnica.com> Date: Fri May 19 16:42:32 2023 +0200 Bind GPU panel to 5,6,7,8,9,0 and fully implement multi-GPU support commit22a463976d
Author: romner <roman@skotnica.com> Date: Thu May 18 16:07:05 2023 +0200 Add GPU info to CPU panel commitc352bf2613
Author: romner-set <roman@skotnica.com> Date: Mon May 15 19:42:55 2023 +0200 Add ROCm SMI backend for AMD GPU support commit917d568a77
Author: romner-set <roman@skotnica.com> Date: Mon May 15 13:58:54 2023 +0200 Add multi-GPU support for NVML data collection commit2d27f2ff61
Author: romner <roman@skotnica.com> Date: Sun May 14 17:40:50 2023 +0200 Fix crash when no nvidia GPU is detected commit0e0025a2c3
Author: romner <roman@skotnica.com> Date: Sun May 14 17:31:39 2023 +0200 Update makefile text, fix typo and adhere to contibuting guidelines commitbcffcdf19f
Author: romner <roman@skotnica.com> Date: Sun May 14 16:53:06 2023 +0200 Make GPU window's size dynamic and integrate it with the rest of btop commit95b3228308
Author: romner <roman@skotnica.com> Date: Sat May 13 19:41:51 2023 +0200 Improve GPU side panel commitadcdc583b0
Author: romner <roman@skotnica.com> Date: Sat May 13 00:27:23 2023 +0200 Add GPU side panel commitd522a91ef4
Author: romner <roman@skotnica.com> Date: Fri May 12 19:34:47 2023 +0200 Add rudimentary, fullscreen single-GPU NVML utilization graph
682 lines
24 KiB
C++
682 lines
24 KiB
C++
/* Copyright 2021 Aristocratos (jakob@qvantnet.com)
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
|
|
indent = tab
|
|
tab-size = 4
|
|
*/
|
|
|
|
#include <array>
|
|
#include <atomic>
|
|
#include <fstream>
|
|
#include <ranges>
|
|
#include <string_view>
|
|
#include <utility>
|
|
|
|
#include <fmt/core.h>
|
|
|
|
#include "btop_config.hpp"
|
|
#include "btop_shared.hpp"
|
|
#include "btop_tools.hpp"
|
|
|
|
using std::array;
|
|
using std::atomic;
|
|
using std::string_view;
|
|
|
|
namespace fs = std::filesystem;
|
|
namespace rng = std::ranges;
|
|
|
|
using namespace std::literals;
|
|
using namespace Tools;
|
|
|
|
//* Functions and variables for reading and writing the btop config file
|
|
namespace Config {
|
|
|
|
atomic<bool> locked (false);
|
|
atomic<bool> writelock (false);
|
|
bool write_new;
|
|
|
|
const vector<array<string, 2>> descriptions = {
|
|
{"color_theme", "#* Name of a btop++/bpytop/bashtop formatted \".theme\" file, \"Default\" and \"TTY\" for builtin themes.\n"
|
|
"#* Themes should be placed in \"../share/btop/themes\" relative to binary or \"$HOME/.config/btop/themes\""},
|
|
|
|
{"theme_background", "#* If the theme set background should be shown, set to False if you want terminal background transparency."},
|
|
|
|
{"truecolor", "#* Sets if 24-bit truecolor should be used, will convert 24-bit colors to 256 color (6x6x6 color cube) if false."},
|
|
|
|
{"force_tty", "#* Set to true to force tty mode regardless if a real tty has been detected or not.\n"
|
|
"#* Will force 16-color mode and TTY theme, set all graph symbols to \"tty\" and swap out other non tty friendly symbols."},
|
|
|
|
{"presets", "#* Define presets for the layout of the boxes. Preset 0 is always all boxes shown with default settings. Max 9 presets.\n"
|
|
"#* Format: \"box_name:P:G,box_name:P:G\" P=(0 or 1) for alternate positions, G=graph symbol to use for box.\n"
|
|
"#* Use whitespace \" \" as separator between different presets.\n"
|
|
"#* Example: \"cpu:0:default,mem:0:tty,proc:1:default cpu:0:braille,proc:0:tty\""},
|
|
|
|
{"vim_keys", "#* Set to True to enable \"h,j,k,l,g,G\" keys for directional control in lists.\n"
|
|
"#* Conflicting keys for h:\"help\" and k:\"kill\" is accessible while holding shift."},
|
|
|
|
{"rounded_corners", "#* Rounded corners on boxes, is ignored if TTY mode is ON."},
|
|
|
|
{"graph_symbol", "#* Default symbols to use for graph creation, \"braille\", \"block\" or \"tty\".\n"
|
|
"#* \"braille\" offers the highest resolution but might not be included in all fonts.\n"
|
|
"#* \"block\" has half the resolution of braille but uses more common characters.\n"
|
|
"#* \"tty\" uses only 3 different symbols but will work with most fonts and should work in a real TTY.\n"
|
|
"#* Note that \"tty\" only has half the horizontal resolution of the other two, so will show a shorter historical view."},
|
|
|
|
{"graph_symbol_cpu", "# Graph symbol to use for graphs in cpu box, \"default\", \"braille\", \"block\" or \"tty\"."},
|
|
#ifdef GPU_SUPPORT
|
|
{"graph_symbol_gpu", "# Graph symbol to use for graphs in gpu box, \"default\", \"braille\", \"block\" or \"tty\"."},
|
|
#endif
|
|
{"graph_symbol_mem", "# Graph symbol to use for graphs in cpu box, \"default\", \"braille\", \"block\" or \"tty\"."},
|
|
|
|
{"graph_symbol_net", "# Graph symbol to use for graphs in cpu box, \"default\", \"braille\", \"block\" or \"tty\"."},
|
|
|
|
{"graph_symbol_proc", "# Graph symbol to use for graphs in cpu box, \"default\", \"braille\", \"block\" or \"tty\"."},
|
|
|
|
{"shown_boxes", "#* Manually set which boxes to show. Available values are \"cpu mem net proc\" and \"gpu0\" through \"gpu5\", separate values with whitespace."},
|
|
|
|
{"update_ms", "#* Update time in milliseconds, recommended 2000 ms or above for better sample times for graphs."},
|
|
|
|
{"proc_sorting", "#* Processes sorting, \"pid\" \"program\" \"arguments\" \"threads\" \"user\" \"memory\" \"cpu lazy\" \"cpu direct\",\n"
|
|
"#* \"cpu lazy\" sorts top process over time (easier to follow), \"cpu direct\" updates top process directly."},
|
|
|
|
{"proc_reversed", "#* Reverse sorting order, True or False."},
|
|
|
|
{"proc_tree", "#* Show processes as a tree."},
|
|
|
|
{"proc_colors", "#* Use the cpu graph colors in the process list."},
|
|
|
|
{"proc_gradient", "#* Use a darkening gradient in the process list."},
|
|
|
|
{"proc_per_core", "#* If process cpu usage should be of the core it's running on or usage of the total available cpu power."},
|
|
|
|
{"proc_mem_bytes", "#* Show process memory as bytes instead of percent."},
|
|
|
|
{"proc_cpu_graphs", "#* Show cpu graph for each process."},
|
|
|
|
{"proc_info_smaps", "#* Use /proc/[pid]/smaps for memory information in the process info box (very slow but more accurate)"},
|
|
|
|
{"proc_left", "#* Show proc box on left side of screen instead of right."},
|
|
|
|
{"proc_filter_kernel", "#* (Linux) Filter processes tied to the Linux kernel(similar behavior to htop)."},
|
|
|
|
{"proc_aggregate", "#* In tree-view, always accumulate child process resources in the parent process."},
|
|
|
|
{"cpu_graph_upper", "#* Sets the CPU stat shown in upper half of the CPU graph, \"total\" is always available.\n"
|
|
"#* Select from a list of detected attributes from the options menu."},
|
|
|
|
{"cpu_graph_lower", "#* Sets the CPU stat shown in lower half of the CPU graph, \"total\" is always available.\n"
|
|
"#* Select from a list of detected attributes from the options menu."},
|
|
#ifdef GPU_SUPPORT
|
|
{"show_gpu_info", "#* If gpu info should be shown in the cpu box. Available values = \"Auto\", \"On\" and \"Off\"."},
|
|
#endif
|
|
{"cpu_invert_lower", "#* Toggles if the lower CPU graph should be inverted."},
|
|
|
|
{"cpu_single_graph", "#* Set to True to completely disable the lower CPU graph."},
|
|
|
|
{"cpu_bottom", "#* Show cpu box at bottom of screen instead of top."},
|
|
|
|
{"show_uptime", "#* Shows the system uptime in the CPU box."},
|
|
|
|
{"check_temp", "#* Show cpu temperature."},
|
|
|
|
{"cpu_sensor", "#* Which sensor to use for cpu temperature, use options menu to select from list of available sensors."},
|
|
|
|
{"show_coretemp", "#* Show temperatures for cpu cores also if check_temp is True and sensors has been found."},
|
|
|
|
{"cpu_core_map", "#* Set a custom mapping between core and coretemp, can be needed on certain cpus to get correct temperature for correct core.\n"
|
|
"#* Use lm-sensors or similar to see which cores are reporting temperatures on your machine.\n"
|
|
"#* Format \"x:y\" x=core with wrong temp, y=core with correct temp, use space as separator between multiple entries.\n"
|
|
"#* Example: \"4:0 5:1 6:3\""},
|
|
|
|
{"temp_scale", "#* Which temperature scale to use, available values: \"celsius\", \"fahrenheit\", \"kelvin\" and \"rankine\"."},
|
|
|
|
{"base_10_sizes", "#* Use base 10 for bits/bytes sizes, KB = 1000 instead of KiB = 1024."},
|
|
|
|
{"show_cpu_freq", "#* Show CPU frequency."},
|
|
|
|
{"clock_format", "#* Draw a clock at top of screen, formatting according to strftime, empty string to disable.\n"
|
|
"#* Special formatting: /host = hostname | /user = username | /uptime = system uptime"},
|
|
|
|
{"background_update", "#* Update main ui in background when menus are showing, set this to false if the menus is flickering too much for comfort."},
|
|
|
|
{"custom_cpu_name", "#* Custom cpu model name, empty string to disable."},
|
|
|
|
{"disks_filter", "#* Optional filter for shown disks, should be full path of a mountpoint, separate multiple values with whitespace \" \".\n"
|
|
"#* Begin line with \"exclude=\" to change to exclude filter, otherwise defaults to \"most include\" filter. Example: disks_filter=\"exclude=/boot /home/user\"."},
|
|
|
|
{"mem_graphs", "#* Show graphs instead of meters for memory values."},
|
|
|
|
{"mem_below_net", "#* Show mem box below net box instead of above."},
|
|
|
|
{"zfs_arc_cached", "#* Count ZFS ARC in cached and available memory."},
|
|
|
|
{"show_swap", "#* If swap memory should be shown in memory box."},
|
|
|
|
{"swap_disk", "#* Show swap as a disk, ignores show_swap value above, inserts itself after first disk."},
|
|
|
|
{"show_disks", "#* If mem box should be split to also show disks info."},
|
|
|
|
{"only_physical", "#* Filter out non physical disks. Set this to False to include network disks, RAM disks and similar."},
|
|
|
|
{"use_fstab", "#* Read disks list from /etc/fstab. This also disables only_physical."},
|
|
|
|
{"zfs_hide_datasets", "#* Setting this to True will hide all datasets, and only show ZFS pools. (IO stats will be calculated per-pool)"},
|
|
|
|
{"disk_free_priv", "#* Set to true to show available disk space for privileged users."},
|
|
|
|
{"show_io_stat", "#* Toggles if io activity % (disk busy time) should be shown in regular disk usage view."},
|
|
|
|
{"io_mode", "#* Toggles io mode for disks, showing big graphs for disk read/write speeds."},
|
|
|
|
{"io_graph_combined", "#* Set to True to show combined read/write io graphs in io mode."},
|
|
|
|
{"io_graph_speeds", "#* Set the top speed for the io graphs in MiB/s (100 by default), use format \"mountpoint:speed\" separate disks with whitespace \" \".\n"
|
|
"#* Example: \"/mnt/media:100 /:20 /boot:1\"."},
|
|
|
|
{"net_download", "#* Set fixed values for network graphs in Mebibits. Is only used if net_auto is also set to False."},
|
|
|
|
{"net_upload", ""},
|
|
|
|
{"net_auto", "#* Use network graphs auto rescaling mode, ignores any values set above and rescales down to 10 Kibibytes at the lowest."},
|
|
|
|
{"net_sync", "#* Sync the auto scaling for download and upload to whichever currently has the highest scale."},
|
|
|
|
{"net_iface", "#* Starts with the Network Interface specified here."},
|
|
|
|
{"show_battery", "#* Show battery stats in top right if battery is present."},
|
|
|
|
{"selected_battery", "#* Which battery to use if multiple are present. \"Auto\" for auto detection."},
|
|
|
|
{"log_level", "#* Set loglevel for \"~/.config/btop/btop.log\" levels are: \"ERROR\" \"WARNING\" \"INFO\" \"DEBUG\".\n"
|
|
"#* The level set includes all lower levels, i.e. \"DEBUG\" will show all logging info."},
|
|
#ifdef GPU_SUPPORT
|
|
|
|
{"nvml_measure_pcie_speeds",
|
|
"#* Measure PCIe throughput on NVIDIA cards, may impact performance on certain cards."},
|
|
|
|
{"gpu_mirror_graph", "#* Horizontally mirror the GPU graph."},
|
|
|
|
{"custom_gpu_name0", "#* Custom gpu0 model name, empty string to disable."},
|
|
{"custom_gpu_name1", "#* Custom gpu1 model name, empty string to disable."},
|
|
{"custom_gpu_name2", "#* Custom gpu2 model name, empty string to disable."},
|
|
{"custom_gpu_name3", "#* Custom gpu3 model name, empty string to disable."},
|
|
{"custom_gpu_name4", "#* Custom gpu4 model name, empty string to disable."},
|
|
{"custom_gpu_name5", "#* Custom gpu5 model name, empty string to disable."},
|
|
#endif
|
|
};
|
|
|
|
std::unordered_map<std::string_view, string> strings = {
|
|
{"color_theme", "Default"},
|
|
{"shown_boxes", "cpu mem net proc"},
|
|
{"graph_symbol", "braille"},
|
|
{"presets", "cpu:1:default,proc:0:default cpu:0:default,mem:0:default,net:0:default cpu:0:block,net:0:tty"},
|
|
{"graph_symbol_cpu", "default"},
|
|
{"graph_symbol_gpu", "default"},
|
|
{"graph_symbol_mem", "default"},
|
|
{"graph_symbol_net", "default"},
|
|
{"graph_symbol_proc", "default"},
|
|
{"proc_sorting", "cpu lazy"},
|
|
{"cpu_graph_upper", "Auto"},
|
|
{"cpu_graph_lower", "Auto"},
|
|
{"cpu_sensor", "Auto"},
|
|
{"selected_battery", "Auto"},
|
|
{"cpu_core_map", ""},
|
|
{"temp_scale", "celsius"},
|
|
{"clock_format", "%X"},
|
|
{"custom_cpu_name", ""},
|
|
{"disks_filter", ""},
|
|
{"io_graph_speeds", ""},
|
|
{"net_iface", ""},
|
|
{"log_level", "WARNING"},
|
|
{"proc_filter", ""},
|
|
{"proc_command", ""},
|
|
{"selected_name", ""},
|
|
#ifdef GPU_SUPPORT
|
|
{"custom_gpu_name0", ""},
|
|
{"custom_gpu_name1", ""},
|
|
{"custom_gpu_name2", ""},
|
|
{"custom_gpu_name3", ""},
|
|
{"custom_gpu_name4", ""},
|
|
{"custom_gpu_name5", ""},
|
|
{"show_gpu_info", "Auto"}
|
|
#endif
|
|
};
|
|
std::unordered_map<std::string_view, string> stringsTmp;
|
|
|
|
std::unordered_map<std::string_view, bool> bools = {
|
|
{"theme_background", true},
|
|
{"truecolor", true},
|
|
{"rounded_corners", true},
|
|
{"proc_reversed", false},
|
|
{"proc_tree", false},
|
|
{"proc_colors", true},
|
|
{"proc_gradient", true},
|
|
{"proc_per_core", false},
|
|
{"proc_mem_bytes", true},
|
|
{"proc_cpu_graphs", true},
|
|
{"proc_info_smaps", false},
|
|
{"proc_left", false},
|
|
{"proc_filter_kernel", false},
|
|
{"cpu_invert_lower", true},
|
|
{"cpu_single_graph", false},
|
|
{"cpu_bottom", false},
|
|
{"show_uptime", true},
|
|
{"check_temp", true},
|
|
{"show_coretemp", true},
|
|
{"show_cpu_freq", true},
|
|
{"background_update", true},
|
|
{"mem_graphs", true},
|
|
{"mem_below_net", false},
|
|
{"zfs_arc_cached", true},
|
|
{"show_swap", true},
|
|
{"swap_disk", true},
|
|
{"show_disks", true},
|
|
{"only_physical", true},
|
|
{"use_fstab", true},
|
|
{"zfs_hide_datasets", false},
|
|
{"show_io_stat", true},
|
|
{"io_mode", false},
|
|
{"base_10_sizes", false},
|
|
{"io_graph_combined", false},
|
|
{"net_auto", true},
|
|
{"net_sync", true},
|
|
{"show_battery", true},
|
|
{"vim_keys", false},
|
|
{"tty_mode", false},
|
|
{"disk_free_priv", false},
|
|
{"force_tty", false},
|
|
{"lowcolor", false},
|
|
{"show_detailed", false},
|
|
{"proc_filtering", false},
|
|
{"proc_aggregate", false},
|
|
#ifdef GPU_SUPPORT
|
|
{"nvml_measure_pcie_speeds", true},
|
|
{"gpu_mirror_graph", true},
|
|
#endif
|
|
};
|
|
std::unordered_map<std::string_view, bool> boolsTmp;
|
|
|
|
std::unordered_map<std::string_view, int> ints = {
|
|
{"update_ms", 2000},
|
|
{"net_download", 100},
|
|
{"net_upload", 100},
|
|
{"detailed_pid", 0},
|
|
{"selected_pid", 0},
|
|
{"selected_depth", 0},
|
|
{"proc_start", 0},
|
|
{"proc_selected", 0},
|
|
{"proc_last_selected", 0},
|
|
};
|
|
std::unordered_map<std::string_view, int> intsTmp;
|
|
|
|
bool _locked(const std::string_view name) {
|
|
atomic_wait(writelock, true);
|
|
if (not write_new and rng::find_if(descriptions, [&name](const auto& a) { return a.at(0) == name; }) != descriptions.end())
|
|
write_new = true;
|
|
return locked.load();
|
|
}
|
|
|
|
fs::path conf_dir;
|
|
fs::path conf_file;
|
|
|
|
vector<string> available_batteries = {"Auto"};
|
|
|
|
vector<string> current_boxes;
|
|
vector<string> preset_list = {"cpu:0:default,mem:0:default,net:0:default,proc:0:default"};
|
|
int current_preset = -1;
|
|
|
|
bool presetsValid(const string& presets) {
|
|
vector<string> new_presets = {preset_list.at(0)};
|
|
|
|
for (int x = 0; const auto& preset : ssplit(presets)) {
|
|
if (++x > 9) {
|
|
validError = "Too many presets entered!";
|
|
return false;
|
|
}
|
|
for (int y = 0; const auto& box : ssplit(preset, ',')) {
|
|
if (++y > 4) {
|
|
validError = "Too many boxes entered for preset!";
|
|
return false;
|
|
}
|
|
const auto& vals = ssplit(box, ':');
|
|
if (vals.size() != 3) {
|
|
validError = "Malformatted preset in config value presets!";
|
|
return false;
|
|
}
|
|
if (not is_in(vals.at(0), "cpu", "mem", "net", "proc", "gpu0", "gpu1", "gpu2", "gpu3", "gpu4", "gpu5")) {
|
|
validError = "Invalid box name in config value presets!";
|
|
return false;
|
|
}
|
|
if (not is_in(vals.at(1), "0", "1")) {
|
|
validError = "Invalid position value in config value presets!";
|
|
return false;
|
|
}
|
|
if (not v_contains(valid_graph_symbols_def, vals.at(2))) {
|
|
validError = "Invalid graph name in config value presets!";
|
|
return false;
|
|
}
|
|
}
|
|
new_presets.push_back(preset);
|
|
}
|
|
|
|
preset_list = std::move(new_presets);
|
|
return true;
|
|
}
|
|
|
|
//* Apply selected preset
|
|
void apply_preset(const string& preset) {
|
|
string boxes;
|
|
|
|
for (const auto& box : ssplit(preset, ',')) {
|
|
const auto& vals = ssplit(box, ':');
|
|
boxes += vals.at(0) + ' ';
|
|
}
|
|
if (not boxes.empty()) boxes.pop_back();
|
|
|
|
auto min_size = Term::get_min_size(boxes);
|
|
if (Term::width < min_size.at(0) or Term::height < min_size.at(1)) {
|
|
return;
|
|
}
|
|
|
|
for (const auto& box : ssplit(preset, ',')) {
|
|
const auto& vals = ssplit(box, ':');
|
|
if (vals.at(0) == "cpu") set("cpu_bottom", (vals.at(1) == "0" ? false : true));
|
|
else if (vals.at(0) == "mem") set("mem_below_net", (vals.at(1) == "0" ? false : true));
|
|
else if (vals.at(0) == "proc") set("proc_left", (vals.at(1) == "0" ? false : true));
|
|
set("graph_symbol_" + vals.at(0), vals.at(2));
|
|
}
|
|
|
|
if (check_boxes(boxes)) set("shown_boxes", boxes);
|
|
}
|
|
|
|
void lock() {
|
|
atomic_wait(writelock);
|
|
locked = true;
|
|
}
|
|
|
|
string validError;
|
|
|
|
bool intValid(const std::string_view name, const string& value) {
|
|
int i_value;
|
|
try {
|
|
i_value = stoi(value);
|
|
}
|
|
catch (const std::invalid_argument&) {
|
|
validError = "Invalid numerical value!";
|
|
return false;
|
|
}
|
|
catch (const std::out_of_range&) {
|
|
validError = "Value out of range!";
|
|
return false;
|
|
}
|
|
catch (const std::exception& e) {
|
|
validError = string{e.what()};
|
|
return false;
|
|
}
|
|
|
|
if (name == "update_ms" and i_value < 100)
|
|
validError = "Config value update_ms set too low (<100).";
|
|
|
|
else if (name == "update_ms" and i_value > 86400000)
|
|
validError = "Config value update_ms set too high (>86400000).";
|
|
|
|
else
|
|
return true;
|
|
|
|
return false;
|
|
}
|
|
|
|
bool stringValid(const std::string_view name, const string& value) {
|
|
if (name == "log_level" and not v_contains(Logger::log_levels, value))
|
|
validError = "Invalid log_level: " + value;
|
|
|
|
else if (name == "graph_symbol" and not v_contains(valid_graph_symbols, value))
|
|
validError = "Invalid graph symbol identifier: " + value;
|
|
|
|
else if (name.starts_with("graph_symbol_") and (value != "default" and not v_contains(valid_graph_symbols, value)))
|
|
validError = fmt::format("Invalid graph symbol identifier for {}: {}", name, value);
|
|
|
|
else if (name == "shown_boxes" and not value.empty() and not check_boxes(value))
|
|
validError = "Invalid box name(s) in shown_boxes!";
|
|
|
|
#ifdef GPU_SUPPORT
|
|
else if (name == "show_gpu_info" and not v_contains(show_gpu_values, value))
|
|
validError = "Invalid value for show_gpu_info: " + value;
|
|
#endif
|
|
|
|
else if (name == "presets" and not presetsValid(value))
|
|
return false;
|
|
|
|
else if (name == "cpu_core_map") {
|
|
const auto maps = ssplit(value);
|
|
bool all_good = true;
|
|
for (const auto& map : maps) {
|
|
const auto map_split = ssplit(map, ':');
|
|
if (map_split.size() != 2)
|
|
all_good = false;
|
|
else if (not isint(map_split.at(0)) or not isint(map_split.at(1)))
|
|
all_good = false;
|
|
|
|
if (not all_good) {
|
|
validError = "Invalid formatting of cpu_core_map!";
|
|
return false;
|
|
}
|
|
}
|
|
return true;
|
|
}
|
|
else if (name == "io_graph_speeds") {
|
|
const auto maps = ssplit(value);
|
|
bool all_good = true;
|
|
for (const auto& map : maps) {
|
|
const auto map_split = ssplit(map, ':');
|
|
if (map_split.size() != 2)
|
|
all_good = false;
|
|
else if (map_split.at(0).empty() or not isint(map_split.at(1)))
|
|
all_good = false;
|
|
|
|
if (not all_good) {
|
|
validError = "Invalid formatting of io_graph_speeds!";
|
|
return false;
|
|
}
|
|
}
|
|
return true;
|
|
}
|
|
|
|
else
|
|
return true;
|
|
|
|
return false;
|
|
}
|
|
|
|
string getAsString(const std::string_view name) {
|
|
if (bools.contains(name))
|
|
return (bools.at(name) ? "True" : "False");
|
|
else if (ints.contains(name))
|
|
return to_string(ints.at(name));
|
|
else if (strings.contains(name))
|
|
return strings.at(name);
|
|
return "";
|
|
}
|
|
|
|
void flip(const std::string_view name) {
|
|
if (_locked(name)) {
|
|
if (boolsTmp.contains(name)) boolsTmp.at(name) = not boolsTmp.at(name);
|
|
else boolsTmp.insert_or_assign(name, (not bools.at(name)));
|
|
}
|
|
else bools.at(name) = not bools.at(name);
|
|
}
|
|
|
|
void unlock() {
|
|
if (not locked) return;
|
|
atomic_wait(Runner::active);
|
|
atomic_lock lck(writelock, true);
|
|
try {
|
|
if (Proc::shown) {
|
|
ints.at("selected_pid") = Proc::selected_pid;
|
|
strings.at("selected_name") = Proc::selected_name;
|
|
ints.at("proc_start") = Proc::start;
|
|
ints.at("proc_selected") = Proc::selected;
|
|
ints.at("selected_depth") = Proc::selected_depth;
|
|
}
|
|
|
|
for (auto& item : stringsTmp) {
|
|
strings.at(item.first) = item.second;
|
|
}
|
|
stringsTmp.clear();
|
|
|
|
for (auto& item : intsTmp) {
|
|
ints.at(item.first) = item.second;
|
|
}
|
|
intsTmp.clear();
|
|
|
|
for (auto& item : boolsTmp) {
|
|
bools.at(item.first) = item.second;
|
|
}
|
|
boolsTmp.clear();
|
|
}
|
|
catch (const std::exception& e) {
|
|
Global::exit_error_msg = "Exception during Config::unlock() : " + string{e.what()};
|
|
clean_quit(1);
|
|
}
|
|
|
|
locked = false;
|
|
}
|
|
|
|
bool check_boxes(const string& boxes) {
|
|
auto new_boxes = ssplit(boxes);
|
|
for (auto& box : new_boxes) {
|
|
if (not v_contains(valid_boxes, box)) return false;
|
|
#ifdef GPU_SUPPORT
|
|
if (box.starts_with("gpu")) {
|
|
size_t gpu_num = stoi(box.substr(3));
|
|
if (gpu_num == 0) gpu_num = 5;
|
|
if (std::cmp_greater(gpu_num, Gpu::gpu_names.size())) return false;
|
|
}
|
|
#endif
|
|
}
|
|
current_boxes = std::move(new_boxes);
|
|
return true;
|
|
}
|
|
|
|
void toggle_box(const string& box) {
|
|
auto old_boxes = current_boxes;
|
|
auto box_pos = rng::find(current_boxes, box);
|
|
if (box_pos == current_boxes.end())
|
|
current_boxes.push_back(box);
|
|
else
|
|
current_boxes.erase(box_pos);
|
|
|
|
string new_boxes;
|
|
if (not current_boxes.empty()) {
|
|
for (const auto& b : current_boxes) new_boxes += b + ' ';
|
|
new_boxes.pop_back();
|
|
}
|
|
|
|
auto min_size = Term::get_min_size(new_boxes);
|
|
|
|
if (Term::width < min_size.at(0) or Term::height < min_size.at(1)) {
|
|
current_boxes = old_boxes;
|
|
return;
|
|
}
|
|
|
|
Config::set("shown_boxes", new_boxes);
|
|
}
|
|
|
|
void load(const fs::path& conf_file, vector<string>& load_warnings) {
|
|
if (conf_file.empty())
|
|
return;
|
|
else if (not fs::exists(conf_file)) {
|
|
write_new = true;
|
|
return;
|
|
}
|
|
std::ifstream cread(conf_file);
|
|
if (cread.good()) {
|
|
vector<string> valid_names;
|
|
for (auto &n : descriptions)
|
|
valid_names.push_back(n[0]);
|
|
if (string v_string; cread.peek() != '#' or (getline(cread, v_string, '\n') and not s_contains(v_string, Global::Version)))
|
|
write_new = true;
|
|
while (not cread.eof()) {
|
|
cread >> std::ws;
|
|
if (cread.peek() == '#') {
|
|
cread.ignore(SSmax, '\n');
|
|
continue;
|
|
}
|
|
string name, value;
|
|
getline(cread, name, '=');
|
|
if (name.ends_with(' ')) name = trim(name);
|
|
if (not v_contains(valid_names, name)) {
|
|
cread.ignore(SSmax, '\n');
|
|
continue;
|
|
}
|
|
cread >> std::ws;
|
|
|
|
if (bools.contains(name)) {
|
|
cread >> value;
|
|
if (not isbool(value))
|
|
load_warnings.push_back("Got an invalid bool value for config name: " + name);
|
|
else
|
|
bools.at(name) = stobool(value);
|
|
}
|
|
else if (ints.contains(name)) {
|
|
cread >> value;
|
|
if (not isint(value))
|
|
load_warnings.push_back("Got an invalid integer value for config name: " + name);
|
|
else if (not intValid(name, value)) {
|
|
load_warnings.push_back(validError);
|
|
}
|
|
else
|
|
ints.at(name) = stoi(value);
|
|
}
|
|
else if (strings.contains(name)) {
|
|
if (cread.peek() == '"') {
|
|
cread.ignore(1);
|
|
getline(cread, value, '"');
|
|
}
|
|
else cread >> value;
|
|
|
|
if (not stringValid(name, value))
|
|
load_warnings.push_back(validError);
|
|
else
|
|
strings.at(name) = value;
|
|
}
|
|
|
|
cread.ignore(SSmax, '\n');
|
|
}
|
|
|
|
if (not load_warnings.empty()) write_new = true;
|
|
}
|
|
}
|
|
|
|
void write() {
|
|
if (conf_file.empty() or not write_new) return;
|
|
Logger::debug("Writing new config file");
|
|
if (geteuid() != Global::real_uid and seteuid(Global::real_uid) != 0) return;
|
|
std::ofstream cwrite(conf_file, std::ios::trunc);
|
|
if (cwrite.good()) {
|
|
cwrite << "#? Config file for btop v. " << Global::Version;
|
|
for (auto [name, description] : descriptions) {
|
|
cwrite << "\n\n" << (description.empty() ? "" : description + "\n")
|
|
<< name << " = ";
|
|
if (strings.contains(name))
|
|
cwrite << "\"" << strings.at(name) << "\"";
|
|
else if (ints.contains(name))
|
|
cwrite << ints.at(name);
|
|
else if (bools.contains(name))
|
|
cwrite << (bools.at(name) ? "True" : "False");
|
|
}
|
|
}
|
|
}
|
|
}
|