Upstream htop code sync#2476
Merged
natoscott merged 3 commits intoperformancecopilot:mainfrom Feb 1, 2026
Merged
Conversation
…8211b102c1 8211b102c1 Merge branch 'runlevel5-fix/screens-panel-rename-function-bar' 828aab4c47 Merge branch 'fix/screens-panel-rename-function-bar' of github.com:runlevel5/htop into runlevel5-fix/screens-panel-rename-function-bar 9863d78ff5 Minor code style fix 6fb75e1251 Explicitly check for write permission of htoprc 35e1536069 Consolidate DateMeter and DateTimeMeter into common source files bb9ea5b5d6 Merge branch 'powerpellet1077-main' f600e98034 Merge branch 'main' of github.com:powerpellet1077/htop_utpr into powerpellet1077-main 347084b8b8 Merge pull request performancecopilot#1828 from tslmy/ios6 755b873fd5 Merge pull request performancecopilot#1866 from Explorer09/htoprc-owner-check 6baa059ec4 Fix function bar labels in Screens panel rename mode b22258988d Merge pull request performancecopilot#1878 from BarbUk/k10temp_Tctl dbe751408c Merge pull request performancecopilot#1876 from BenBE/no-color-env df72bec547 Ensure CRT_colorScheme is valid 896a6bacc3 Don't let '--no-color' affect htoprc 4d0360c8a7 Remove redundant store to CRT_colorScheme in CRT_init() a3d6521340 Implement explicit NO_COLOR env support e400c6e66e Don't write to htoprc file if it's not owned by EUID 8ebbf3c363 README.md: drop quickstart formatting, suggestion from explorer09 67bb1d3f66 README.md: different markdown renderers behave differently, sigh 2fce713dec Follow-up formatting tweak on recent README.md change e70a38a36a Minor consistency tweaks to the README quick start section 2d5c91f641 Merge branch 'patch-1' of github.com:VNel/htop into VNel-patch-1 1417fc4fe2 Add Tctl temperature reading 4c79d64d8d Add SecondsUptimeMeter 2b3b151db1 Merge pull request performancecopilot#1873 from KhooHaoYit/main 62a6ef12c5 improve htop bootup time by caching all getpwuid result 70f873ed01 Fix possible NULL pointer dereference eda4f742fe Handle include order constraints 483a7643dd Handle legacy references to kIOMainPortDefault c69c3b10e4 Handle when external/compressed page counts are unavailable 92b065fafd Fix a small file descriptor leak in Settings_write() ab3192edf9 Merge pull request performancecopilot#1851 from Explorer09/typo-fixes dbb865b89d Fix whitespace in a LinuxProcess code comment 36592ac189 solaris: Fix typo in code comments f1de636520 Typographical error fixes in configure.ac 150e43e617 Merge pull request performancecopilot#1856 from shatyuka/gpu-statistics-darwin cc7c2ed2d7 Merge pull request performancecopilot#1857 from Explorer09/table-bsearch-overflow 8f299ec644 Avoid binary search arithmetic overflow in Table.c 2cf3ba86f1 Simplify PerformanceStatistics property code 9270bbc8a0 Merge branch 'typo-fix' d4a9354a05 Typographical Fixes 9a32590917 Updates for 2026. Happy New Year! f90805aff9 Merge pull request performancecopilot#1846 from Explorer09/pcp-dynamic-code-improve 2bb1d49b02 Merge pull request performancecopilot#1845 from Explorer09/pcp-dynamic-column-parser 80198b61ee PCPDynamicMeter & PCPDynamicScreen parser code shrink 50b27a7a06 Fix PCPDynamicColumn parsing after a bad section name c53e2916c1 Add Quick Start section to README 92697f88ec Merge pull request performancecopilot#1837 from Explorer09/crt-c-include 1823bf0b29 Merge pull request performancecopilot#1835 from fraggerfox/ci-upgrade-freebsd-15 de7cd11950 Fix missing include in CRT.c (sys/stat.h) e58c507f90 ci: Bump FreeBSD to 15.0. 6cf1097f46 Merge branches 'policy-updates' and 'compat-refactor' 272f4b087c Move the filesystem API backwards-compatibility code 3956cff00e Transition readfile/readfileat routines into Compat 1982af08e4 Refactor Compat.h into two parts - filesystem and assert bafba6d8e8 Merge pull request performancecopilot#1831 from oxyzenQ/main 382d9f50f1 fix: correct typos in docs and build comment 1159bec28c Rearrange sections in CONTRIBUTORS.md to assist new contributors 92af1a4d6b Add a section on the use of AI tools to the contributors guide ab685b2bea Add a Code of Conduct document for the project 33fa6e0312 Merge pull request performancecopilot#1827 from Explorer09/sysconf-pagesize d358b669e3 Improve the page size retrieval code via sysconf(3) 27a71f30fd Merge pull request performancecopilot#1822 from fraggerfox/ci-bump-bsd-version 444c9f2466 Bump BSD versions in ci. 8824b37249 Fix warnings for FreeBSD / OpenBSD. 1673edf80a Merge pull request performancecopilot#1826 from Explorer09/configure-finite-math-only 6c5120abf1 build: Fix '-ffinite-math-only' configure warning 8a87d3e661 Merge pull request performancecopilot#1823 from htop-dev/dependabot/github_actions/actions/checkout-6 1ced15dc95 Bump actions/checkout from 5 to 6 6d19dddad6 Merge pull request performancecopilot#1813 from Explorer09/get-release-api 4beefe2baa Improve Generic_unameRelease() related code a8f22a6cee Darwin: Rewrite & improve Platform_getOSRelease() code 1b6d54d49d SysArchMeter: Remove cached string pointer 676ce304a4 Simplify Platform_getRelease() API fdf8894411 Merge pull request performancecopilot#1819 from Explorer09/network-io-pkt-per-sec eeffaa07b0 Add NetworkIOMeter description 1edb7f50c8 Merge pull request performancecopilot#1804 from Explorer09/network-io-pkt-per-sec d549a280fb Change NetworkIOMeter "packets per second" display git-subtree-dir: vendor/github.com/htop-dev/htop git-subtree-split: 8211b102c10ab0e06b35a0578ccf29cfe99f0c1c
Contributor
|
It's interesting that PCP is vendoring in various dependencies. Ideally, once the Nix pull request is merged ( #2444 ), then it would be possible to use the nixpkgs version of htop, for example, and so PCP could benefit automatically from the changes in nixpkgs The nixpkg htop seems to be tracking 3.4.1 Build via Nix will essentially mean if it builds once with Nix on any operating system, then it will work on all the other operating systems |
Member
Author
|
@randomizedcoder I don't know anything about Nix, but I think the situation is more subtle here. While htop is vendored, its not a traditional dependency like a library - there is substantial amounts of PCP code in the 'upstream' htop which allows the pcp-htop binary to be build from the same code base as htop itself. This results in two different binaries - pcp-htop uses the PMAPI (hence offers UI for many thousands of metrics not supported by regular htop, distributed operation, etc), and htop uses syscalls directly to query fixed kernel metrics. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.