zeldon
/
htop
mirror of https://github.com/xzeldon/htop.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,293 Commits 1 Branch 38 Tags 5.9 MiB
Commit Graph

1293 Commits

Author SHA1 Message Date
Nathan Scott 4597332959 Switch variable/field naming from WhiteList to MatchList 2020-09-09 19:38:15 +10:00
Nathan Scott c5808c56db Consolidate repeated macro definitions into one header 
The MIN, MAX, CLAMP, MINIMUM, and MAXIMUM macros appear
throughout the codebase with many re-definitions.  Make
a single copy of each in a common header file, and use
the BSD variants of MINIMUM/MAXIMUM due to conflicts in
the system <sys/param.h> headers.
 2020-09-09 16:56:04 +10:00
Nathan Scott 8ec5d4a3a0 Further, minor cleanups to headers post-MakeHeaders 
Remove leftover empty ifdef/endif pairs, whitespace.
The generated htop.h file was also unused - removed.
 2020-09-08 17:33:50 +10:00
Nathan Scott eede79b29a Merge branch 'noheadergen' of https://github.com/zevweiss/htop into zevweiss-noheadergen 2020-09-08 16:45:11 +10:00
Nathan Scott 85ff6960ed Merge branch 't6-patch-freebsd-ci' 2020-09-07 10:25:50 +10:00
Nathan Scott a1f2532630 Merge branch 'patch-freebsd-ci' of https://github.com/t6/htop-1 into t6-patch-freebsd-ci 2020-09-07 10:25:44 +10:00
Dominik Hassler 7805575114 fix for double symbol link error on solaris 2020-09-05 15:34:27 +10:00
Dominik Hassler f884beda97 htop should report the nice level properly 2020-09-05 15:29:15 +10:00
Nathan Scott 0750ff7e76 Fix regression in -u optional-argument handling 
Resolves https://github.com/htop-dev/htop/issues/91
 2020-09-04 09:50:18 +10:00
Zev Weiss 7758ffcdea Remove duplicate jail_errmsg declaration. 
Fixes: 11ecc65ebb
 2020-09-03 12:00:21 -05:00
Zev Weiss 7b7822b896 Remove superfluous 'extern's from function declarations. 
Applied via:

  $ find * -name '*.h' -exec sed -i -r 's/^extern (.+\()/\1/;' {} +

Suggested-by: Bert Wesarg <bert.wesarg@googlemail.com>
 2020-09-03 11:59:26 -05:00
Zev Weiss a1a027b9bd Axe automated header generation. 
Reasoning:
 - implementation was unsound -- broke down when I added a fairly
   basic macro definition expanding to a struct initializer in a *.c
   file.

 - made it way too easy (e.g. via otherwise totally innocuous git
   commands) to end up with timestamps such that it always ran
   MakeHeader.py but never used its output, leading to overbuild noise
   when running what should be a null 'make'.

 - but mostly: it's just an awkward way of dealing with C code.
 2020-09-03 11:58:58 -05:00
Tobias Kortkamp 35d7e42b88
Add FreeBSD to Travis 
Signed-off-by: Tobias Kortkamp <t@tobik.me>
 2020-09-03 09:00:17 +02:00
Nathan Scott 7734dfe55d
Merge pull request #86 from t6/patch-freebsd-fno-common 
Unbreak with -fno-common on FreeBSD
 2020-09-03 16:47:30 +10:00
Tobias Kortkamp 11ecc65ebb
Unbreak with -fno-common on FreeBSD 
GCC10 and Clang11 now default to -fno-common.

ld: error: duplicate symbol: jail_errmsg
>>> defined at Platform.c
>>>            freebsd/Platform.o:(jail_errmsg)
>>> defined at FreeBSDProcessList.c
>>>            freebsd/FreeBSDProcessList.o:(.bss+0x90)

Signed-off-by: Tobias Kortkamp <t@tobik.me>
 2020-09-03 08:42:18 +02:00
Nathan Scott dace850fa6 Bump version, changelog for minor htop-3.0.1 release 2020-09-03 13:23:43 +10:00
Nathan Scott 4f00a95364
Merge pull request #66 from ioquatix/patch-1 
Fix image logo and titles.
 2020-09-03 08:35:19 +10:00
Nathan Scott 0ab508e42b
Merge pull request #57 from matthiasbeyer/patch-1 
Do not link INSTALL file, because link target does not exist
 2020-09-03 08:20:36 +10:00
Nathan Scott f79591ef1b Merge branch 'eworm-de-unicode-runtime' 2020-09-02 15:09:58 +10:00
Samuel Williams 746a5f279a
Fix image logo and titles. 2020-09-02 11:54:17 +12:00
Matthias Beyer 8ee7d58cb0
Do not link INSTALL file, because link target does not exist 2020-09-01 14:47:00 +02:00
Christian Hesse db5adbeae0 add option (-U, --no-unicode) to disable unicode at runtime 2020-09-01 10:09:00 +02:00
Nathan Scott f5b3e8d2a3 Merge branch 'cgzones-oom2' 2020-09-01 15:17:32 +10:00
Nathan Scott 809e4db672 Merge branch 'oom2' of https://github.com/cgzones/htop into cgzones-oom2 2020-09-01 15:17:23 +10:00
Bert Wesarg e1e60f38dc CRT: note about possible use of replacement for `+` glyph in tree 2020-08-31 22:35:09 +02:00
Bert Wesarg 19359cec5a affinity panel: use the tree collapsing as in the process list 
With one exception, the root node does also have a `-`/`+` as a prefix.
 2020-08-31 22:22:22 +02:00
Bert Wesarg b0f1336f79 affinity panel: show CPUs in the topology tree as `CPU x` 
As it is in the non-topology list.
 2020-08-31 22:18:18 +02:00
Bert Wesarg f861a2c616 Revert "Use UTF-8 for check buttons and tree open/closed" 
This reverts commit 5d5913d355b3a9f03da589b3542b8f55467b4ed6.
 2020-08-31 22:12:46 +02:00
Christian Göttsche e7f6d1ce5f Reduce oom cast from long to int 
Oom values should never be greater then INT_MAX, they should be in the
range 0 - 1000.

Improves: d9a5dd4b91
 2020-08-31 11:55:53 +02:00
Nathan Scott 47a7d0bd74 Merge branch 'configure' of https://github.com/cgzones/htop into cgzones-configure 2020-08-31 17:13:37 +10:00
Nathan Scott b321177b08 Merge branch 'master' of github.com:htop-dev/htop 2020-08-31 16:57:46 +10:00
Nathan Scott 800d8c735d Merge branch 'cov_fixes' of https://github.com/cgzones/htop into cgzones-cov_fixes 2020-08-31 16:56:32 +10:00
Daniel Lange f14173038e Merge branch 'oom' of https://github.com/cgzones/htop 
Closes: #18, #22
 2020-08-31 08:32:39 +02:00
Nathan Scott fdf8a28e60 Merge branch 'Ckath-vim_mode_setting' 2020-08-31 16:14:48 +10:00
Nathan Scott 244630f67f Merge branch 'vim_mode_setting' of https://github.com/Ckath/htop into Ckath-vim_mode_setting 2020-08-31 16:14:40 +10:00
Nathan Scott 0a835e13bf Simplify the --version output, old dates are confusing people 
Drop the copyright notice from the version output as a number
of people seem to be confused by what this means, and we can
do without all the (well intentioned) bug reports.
 2020-08-31 16:14:23 +10:00
Nathan Scott 4bd0859b80 Add a badge/link to the released source tarballs 2020-08-31 16:12:44 +10:00
ckath 338bd829b0 add toggle for vim mode in options 2020-08-29 15:15:52 +02:00
Christian Göttsche 5c99c6e942 Check btime sscanf parse from /proc/stat 
Found by Coverity
 2020-08-28 16:46:50 +02:00
Christian Göttsche a850d81bf5 Avoid use of uninitialized variables 
Found by Coverity
 2020-08-28 16:46:50 +02:00
Christian Göttsche 05a5fdc47f Ignore sscanf return value of /proc/stat 
Found by Coverity
 2020-08-28 16:46:50 +02:00
Christian Göttsche af84d3dfa9 Fail on out-of-range CPU number 
Found by Coverity
 2020-08-28 16:46:50 +02:00
Christian Göttsche df41979afc Ignore wmove return value 
Found by Coverity
 2020-08-28 16:46:50 +02:00
Christian Göttsche d9a5dd4b91 Improve OOM output 
* Fix sort by adding cast
* Shrink column size to 4
* Drop unnecessary maximum field width specifier in sscanf
 2020-08-28 14:24:59 +02:00
Christian Göttsche a48ce9d103 Really tell gcc to ignore return value of fscanf 2020-08-28 13:10:41 +02:00
Christian Göttsche 3f5784a3f0 Convert hwlock CI run to a full featured one 2020-08-28 13:10:41 +02:00
Christian Göttsche 3b084db1c4 Print configured state 2020-08-28 13:10:41 +02:00
Christian Göttsche 979d004214 Improve indent 2020-08-28 13:10:16 +02:00
Christian Göttsche 5bee902665 Drop configure option --enable-proc 
Move to HTOP_LINUX, as --enable-proc implies my_htop_platform=linux, and
the Linux features do not work without a proc fs.
 2020-08-28 13:10:16 +02:00
Nathan Scott 2d14269bcd
Merge pull request #14 from zdykstra/master 
Normalize ZFS ARC caption
 2020-08-28 16:58:06 +10:00