zeldon/htop
1
0
Fork 0
mirror of https://github.com/xzeldon/htop.git synced 2024-12-25 23:35:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,685 Commits 1 Branch 38 Tags 6 MiB
7044d546ea
Commit Graph

2685 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nathan Scott
8ac8542b6e Handle interrupted sampling from within libpcp PDU transfers 
This situation can arise if pcp-htop screen is resized right
at the same time sampling from pmcd(1) is happening.  Have a
couple more goes at it before giving up entirely; once there
is no data available though we cannot proceed into accessing
the sample result data structure (segv will result) so a new
short-circuit guard is added there also.
 2021-10-05 15:53:18 +11:00
Benny Baumann
f75a8bc3a1 Memory leak on OpenBSD when querying full command line 2021-10-03 19:18:25 +02:00
Benny Baumann
d520199e62 Memory leak on NetBSD when querying full command line 2021-10-03 19:18:25 +02:00
Benny Baumann
9d8d87e1d5 Memory leak on DragonFlyBSD when querying full command line 2021-10-03 19:18:25 +02:00
Benny Baumann
57c1538887 Don't force allocation, as failure is handled 2021-10-03 19:18:25 +02:00
Ximalas
9eb52d5932 Release memory for cmdline when Process_updateCmdline() returns. 
This closes a nasty memory leak. There is at least another leak looming somewhere when Disk I/O is shown in the header area. That could very well be an issue within libdevstat native to FreeBSD.
 2021-10-03 19:18:11 +02:00
Christian Göttsche
970885edc3 Linux: improve tryRead macro safety 
Add an explicit else clause so a following else branch for a prior if
condition does not get mixed up.

Also force a trailing semicolon and thereby silence current
-Wextra-semi-stmt warnings.

Improve readability of the hwloc_bitmap_foreach_begin loop macro.
 2021-10-01 18:36:35 +02:00
Christian Göttsche
ae1816e563 Settings: use size_t for meter count in header 
Header.c:150:26: error: implicit conversion loses integer precision: 'int' to 'uint8_t' (aka 'unsigned char') [-Werror,-Wimplicit-int-conversion]
          colSettings->len = len;
                           ~ ^~~
 2021-10-01 18:36:35 +02:00
Christian Göttsche
53732ab0bb Resolve -Wimplicit-int-conversion warnings 
Panel.c:414:49: error: implicit conversion loses integer precision: 'int' to 'short' [-Werror,-Wimplicit-int-conversion]
      this->scrollH = MAXIMUM(this->selectedLen - this->w, 0);
                    ~         ~~~~~~~~~~~~~~~~~~^~~~~~~~~
./Macros.h:11:54: note: expanded from macro 'MAXIMUM'
#define MAXIMUM(a, b)                  ((a) > (b) ? (a) : (b))
                                                     ^

IncSet.c:159:38: error: implicit conversion loses integer precision: 'int' to 'char' [-Werror,-Wimplicit-int-conversion]
         mode->buffer[mode->index] = ch;
                                   ~ ^~

Panel.c:456:24: error: implicit conversion loses integer precision: 'int' to 'char' [-Werror,-Wimplicit-int-conversion]
         buffer[len] = ch;
                     ~ ^~
Panel.c:473:22: error: implicit conversion loses integer precision: 'int' to 'char' [-Werror,-Wimplicit-int-conversion]
         buffer[0] = ch;
                   ~ ^~
 2021-10-01 18:36:35 +02:00
Sohaib Mohamed
8932efece9 astyle: Add --pad-header option 
Insert space padding between a header (e.g. 'if', 'for', 'while'...) and the
following paren. ex:

if(isFoo((a+2), b))
    bar(a, b);

becomes:

if (isFoo((a+2), b))
    bar(a, b);

Link: http://astyle.sourceforge.net/astyle.html#_pad-paren
Signed-off-by: Sohaib Mohamed <sohaib.amhmd@gmail.com>
 2021-10-01 15:01:51 +02:00
fraggerfox
d23627fda9 Adds a missing HAVE_GETMOUSE check. 
Fixes builds failing with error
MainPanel.c:65:62: error: 'Settings {aka struct Settings_}' has no member named 'enableMouse'
    if (ch != ERR && (ch != KEY_MOUSE || this->state->settings->enableMouse))
 2021-09-29 22:21:53 +02:00
Nathan Scott
4c846921a6 Improve configuration file version diagnostic formatting slightly 2021-09-27 15:13:01 +10:00
Nathan Scott
c5e789db1b Prepare changelog contents for the 3.1.1 bugfix release 2021-09-27 13:33:48 +10:00
Nathan Scott
eb94c4f9c9 Merge branch 'amomchilov-workaround-for-FB9546856' 2021-09-27 13:15:58 +10:00
Nathan Scott
8361c6c1ae Merge branch 'workaround-for-FB9546856' of https://github.com/amomchilov/htop into amomchilov-workaround-for-FB9546856 2021-09-27 13:15:50 +10:00
Nathan Scott
07f934ccfb Update the README to drop now redundant glibc version requirement 2021-09-27 13:14:23 +10:00
Nathan Scott
6f751d5929 Merge branch 'o_path' of https://github.com/cgzones/htop into cgzones-o_path 2021-09-27 13:13:13 +10:00
Alexander Momchilov
e26a2cf431 Workaround for Rosetta 2 on Darwin 
rdar://FB9546856

https://openradar.appspot.com/radar?id=5055988478509056
 2021-09-26 10:58:47 -04:00
Alexander Momchilov
d527bc9132 Refactor Platform_CompareKernelVersion API 2021-09-26 10:58:47 -04:00
Alexander Momchilov
dadcb87ad0 Extract Darwin "PlatformHelpers" 2021-09-26 10:58:47 -04:00
Christian Göttsche
754c0d6bb9 Linux: always compute procExeDeleted if already set 
A process, whose executable has been replaced and thus marked by htop,
can be re-executed with the replaced executable, with the same PID, in
two ways: the Linux feature checkpoint/restore or re-execution of PID 1.
The actual check is just a string comparison, like the dropped
condition, leading to (almost) no computation overhead.
 2021-09-24 22:03:16 +02:00
Daniel Lange
9f4a4faab9 Merge branch 'license' of cgzones/htop 2021-09-24 21:25:00 +02:00
Christian Göttsche
a710deeaa7 Linux: define O_PATH if not defined 
Defining O_PATH if not defined by <fcntl.h> does not really add any
maintenance cost and might improve some portability.

Related: #804
 2021-09-24 20:31:48 +02:00
Christian Göttsche
466d6f99e2 Update remaining license headers to explicitly say GPLv2+ 
Also change ReadMe badge.
 2021-09-24 20:28:26 +02:00
Nathan Scott
1601931bbf Merge branch 'fasterit-clarify-license' 2021-09-24 11:59:41 +10:00
Nathan Scott
41f9c0ab77 Merge branch 'clarify-license' of https://github.com/fasterit/htop into fasterit-clarify-license 2021-09-24 11:59:32 +10:00
Nathan Scott
e28d022716 Merge branch 'automake-compat' 2021-09-24 11:59:09 +10:00
Nathan Scott
d5ac75a5c7 Merge branch 'fasterit-fix-mouse-wheel' 2021-09-24 11:58:03 +10:00
Nathan Scott
2ba7d5ff36 Merge branch 'fix-mouse-wheel' of https://github.com/fasterit/htop into fasterit-fix-mouse-wheel 2021-09-24 11:57:52 +10:00
Daniel Lange
3d99c306b9 Document minimum versions for glibc and libcap. Thank you to James Brown (Roguelazer). 
Closes #804
 2021-09-23 18:10:51 +02:00
Nathan Scott
3d3474b3fc Adjust Makefile.am macro definitions for older automake versions 
Fixes: #803
 2021-09-23 10:06:38 +10:00
Daniel Lange
94ad111391 Update license headers to explicitly say GPLv2+ 2021-09-22 14:28:19 +02:00
Daniel Lange
976fa3b121 Make the "Released under the GNU GPLv2+. See 'man' page for more info." from ScreenManager.c valid 2021-09-22 14:23:49 +02:00
Daniel Lange
61227793de Clarify licensing 
htop has been licensed as GPLv2 but there was inconsistency regarding the
option to choose "any later version" as granted by the license.

This commit clarifies the htop dev team is fine with that choice.
 2021-09-22 14:23:38 +02:00
Daniel Lange
e6ded48d1a Update version to 3.1.1-dev 2021-09-22 11:49:25 +02:00
Daniel Lange
87c992739b Fix mouse wheel collision with autogroups nice adjustment 
Fixes #805
 2021-09-22 09:00:31 +02:00
Christian Göttsche
29e1fcfa05 Use libunwind for printing backtrace 2021-09-21 09:06:30 +02:00
Nathan Scott
29983ff83a Release 3.1.0 2021-09-21 16:30:46 +10:00
Benny Baumann
36b7f57200 Some minor editorial changes to the readme 2021-09-20 16:48:39 +02:00
Nathan Scott
c5fe142256 Bump to rc3, likely final release commits for 3.1.0 2021-09-20 16:34:39 +10:00
Nathan Scott
691b7dd5af Merge branch 'cgzones-readme' 2021-09-20 16:31:31 +10:00
Nathan Scott
ad0f9c58bf Merge branch 'readme' of https://github.com/cgzones/htop into cgzones-readme 2021-09-20 16:31:24 +10:00
Nathan Scott
a8d0f2a7fe Merge branch 'cgzones-multicolumn' 2021-09-20 16:30:18 +10:00
Nathan Scott
e6596cbd69 Merge branch 'multicolumn' of https://github.com/cgzones/htop into cgzones-multicolumn 2021-09-20 16:29:44 +10:00
Nathan Scott
40c9f89971 Merge branch 'cgzones-mouse' 2021-09-20 16:29:17 +10:00
Nathan Scott
09ad8067f4 Merge branch 'mouse' of https://github.com/cgzones/htop into cgzones-mouse 2021-09-20 16:29:05 +10:00
Christian Göttsche
bda3ee2b81 Update ReadMe 
Add license and repology badge, improve several wording, improve
several sections.

[skip ci]
 2021-09-19 14:47:32 +02:00
Christian Göttsche
bdb015ffa3 Header: do not let multi-column meters expand to empty neighbors 
Extending to right neighbors is intended for text meters with an
overlong content, so the whole text is shown if possible.
Multi column meters, like the combined memory and swap meter, position
its text depending on the given total width; keep the position to the
original assigned header slot.

Short term resolution for #796
 2021-09-18 17:21:32 +02:00
Christian Göttsche
80a515abcc Fix typo 2021-09-18 15:55:21 +02:00
Benny Baumann
5000cefc13 Fix typo in gettime implementation on darwin 2021-09-18 14:14:23 +02:00