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

2287 Commits

Author SHA1 Message Date
Explorer09 7d3f67e822 Revert 5c593fae42 (xCalloc) 
calloc() allows 'nmemb' or 'size' to be zero, in which case NULL may be
returned. Letting htop die because of either argument being zero doesn't
make sense.

As a side note: As size_t is unsigned, compiler should be able to optimize
conditional (nmemb > 0 && size > 0) to (nmemb && size). This theorically
shouldn't increase code size too much.
 2016-03-11 10:43:31 +08:00
Hisham Muhammad 3283c6d23c Merge pull request #441 from Explorer09/issue-438 
Avoid overlapping key values defined by curses (Real fix).
 2016-03-09 02:03:11 -03:00
Explorer09 8a928c8b89 Avoid overlapping key values defined by curses (Real fix). 
Real fix for issue #438.
 2016-03-09 10:16:34 +08:00
Hisham f295a52ed9 Avoid overlapping key values defined by curses. 
Closes #438.
 2016-03-08 12:23:18 -03:00
Hisham e2ccc7b240 Prepare for release 2.0.1. 2016-03-07 18:32:06 -03:00
Hisham Muhammad ef1e62d1fa Merge branch 'juanfra684-openbsd-mem-used' 2016-03-07 15:03:50 -03:00
Hisham Muhammad 453105e77a Merge branch 'Sp1l-master' 2016-03-07 16:58:47 -03:00
Hisham Muhammad db80f202f2 Avoid global, as done by @gaod in #387. 2016-03-07 16:58:02 -03:00
Hisham Muhammad 98e43816a5 Merge branch 'master' of https://github.com/Sp1l/htop into Sp1l-master 2016-03-07 16:54:38 -03:00
Hisham Muhammad 694addceb5 Merge pull request #436 from mmcco/tuneup 
Misc. OpenBSD tuneup and improvement
 2016-03-07 16:38:39 -03:00
Hisham Muhammad 4623394456 Merge pull request #435 from mmcco/freebsd 
Improve error reporting on FreeBSD libkvm call
 2016-03-07 16:35:59 -03:00
Hisham Muhammad 4ad7aa6432 Merge branch 'openbsd-mem-used' of https://github.com/juanfra684/htop into juanfra684-openbsd-mem-used 2016-03-07 15:03:18 -03:00
Michael McConville 4b780a3499 A few more OpenBSD fixes 
Namely:

 o use malloc where an xCalloc slipped in

 o safeguard against an empty arg list - I don't think it's possible,
   but it would be potentially exploitable

 o we need to initialize the arg string to an empty string because we no
 longer use strlcpy(3)

 o annotate a tricky use of strlcpy(3)'s truncation
 2016-03-05 23:38:12 -05:00
Michael McConville b08cb7352e Misc. OpenBSD tuneup and improvement 
Including:

 o set *basenameEnd even in error cases (FreeBSD probably needs this)

 o use kvm_openfiles(3) rather than kvm_open(3) so that we can report
   errors (as with FreeBSD)

 o sanify the process argument list creation by using strlcat(3)

 o drop the pageSizeKb variable and use the PAGE_SIZE_KB macro directly,
   as the page size can't change anyway

 o clean up a few macros, add MINIMUM() and MAXIMUM() (should be
   mirrored to FreeBSD)

 o fix some syntax

 o add some useful comments
 2016-03-05 23:23:29 -05:00
Michael McConville b886ecc479 Improve error reporting on FreeBSD libkvm call 
This involves switching from kvm_open(3) to kvm_openfiles(3). The only
difference is that the latter has saner error reporting (see the man
page for details). We can now fatally report the error rather than just
calling assert(3).
 2016-03-05 22:59:39 -05:00
Hisham Muhammad 63c55854e5 Merge pull request #388 from mhinz/add-p-to-help 
Add "p" to Help
 2016-02-29 22:03:45 -03:00
Hisham 4f1bd232d8 Merge branch 'master' of https://github.com/hishamhm/htop 2016-02-29 21:57:47 -03:00
Hisham 84a69b1ea4 Release resource when using hwloc 2016-02-29 21:57:27 -03:00
Hisham e77811e99b any of these values may wrap 2016-02-29 21:57:03 -03:00
Marco Hinz 0a4a447d0d Add "p" to Help 2016-03-01 00:57:09 +01:00
Tim Creech cc8375f9ea FreeBSD: use KERN_PROC_PROC with kvm_getprocs to avoid erroneously combining LWPs 2016-02-28 22:41:50 -05:00
Hisham Muhammad 03af73bbc7 Merge pull request #427 from tcreech/master 
Fix low CPU usage reporting in FreeBSD
 2016-02-27 03:04:52 -03:00
Tim Creech 0cf3cfa3af Fix low CPU usage reporting in FreeBSD 2016-02-26 23:23:27 -05:00
Hisham 797bcd0961 Catch invalid IO values due to no permissions. 
Display them properly. Not fully convinced of the "no perm" message...
 2016-02-20 02:23:26 -02:00
Hisham baec4bdcb0 Try to retain last full name of a zombie process. 
Once a process goes zombie on Linux, /proc/PID/cmdline
gets empty. So, when we detect it is a zombie we stop
reading this file.
For processes that were zombies before htop started,
there's no way to get the full name.
Closes #49.
 2016-02-19 20:51:57 -02:00
Hisham a8a5e62760 Force -lgcov harder when running `make coverage`. 
Shouldn't be needed, but I had to make this tweak to make this work again.
 2016-02-19 13:40:21 -02:00
Hisham f5ddb974a1 Tweaks on the test suite, still problematic. 2016-02-19 13:40:00 -02:00
Hisham 565101234a Remove old commented code. 2016-02-19 13:39:38 -02:00
Hisham d4741d5410 Fix error test — looks like nobody bumped into this one! 2016-02-19 13:39:16 -02:00
Hisham 9668cd11ed Merge branch 'master' of https://github.com/hishamhm/htop 2016-02-19 13:38:54 -02:00
Hisham c23d4f12d1 Fix behavior of ESC key, getting rid of the annoying delay. 
Thank you @Explorer09 for the push!
Closes #417.
 2016-02-19 13:38:02 -02:00
Hisham Muhammad 34431dc7fd Merge branch 'master' of https://github.com/hishamhm/htop 2016-02-18 23:46:36 -02:00
Hisham Muhammad 42c4459375 Run through all command line arguments on Darwin. 
Also fixes the basename offset for highlighting the basename.
Closes #379.
 2016-02-18 23:45:17 -02:00
Hisham 48254f92e4 Fix behavior of Panel on empty lists. 
Closes #370.
 2016-02-18 17:45:04 -02:00
Hisham Muhammad 5ee6715843 Scan threads for process state information. 
Based on: http://stackoverflow.com/questions/6788274/ios-mac-cpu-usage-for-thread
and       e86692e869/ProcessList.c
This should be a fix for #361.
 2016-02-18 14:57:09 -02:00
Hisham Muhammad c18309466d Pre-reset 'show' for process. 
This simplifies the protocol between the platform-independent
and platform-specific parts. The platform-specific parts
were supposed to re-determine the value of process->show
on each iteration, and the Darwin subsystem wasn't doing that.
Instead of adding the code to the Darwin part, I lifted the
burden of the OS-specific of resetting process->show: now
they can choose to hide a process if they want to (e.g.
detecting kernel threads) but are not required to
(e.g. on Darwin where we're not listing threads separately (yet?)).
Fixes tree view collapsing/expanding on OSX. Closes #416.
 2016-02-18 14:32:49 -02:00
Hisham Muhammad fe0ad86e6d Fix tree organization on OSX. 
Closes #393.
 2016-02-18 14:14:45 -02:00
Hisham Muhammad dc4f145629 Merge pull request #413 from koresar/master 
(Regression) Typo in the word "prority" -> "priority"
 2016-02-17 10:38:38 -02:00
Vasyl Boroviak d43e709364 Typo in the word "priority" 2016-02-17 13:44:07 +11:00
Hisham 0627a5f0e9 Merge branch 'master' of https://github.com/hishamhm/htop 2016-02-16 14:52:08 -02:00
Hisham Muhammad d10f4f615a Merge pull request #391 from gaod/master 
Add MEM% for processes in process list on FreeBSD.
 2016-02-16 14:52:02 -02:00
Hisham e0c364b9cc Fix reading of io_syscr and io_syscw. 
Issue noticed by GCC6 -Wmisleading-indentation.
Thanks @JIghtuse and @Explorer09!
Closes #409.
 2016-02-16 14:34:25 -02:00
Hisham Muhammad fd216309d9 Merge pull request #380 from fingolfin/patch-1 
Simplify autogen.sh
 2016-02-14 21:17:19 -02:00
Hisham 474d26cea8 Portable affinity using hwloc 2016-02-14 19:57:29 -02:00
Max Horn 471cd60635 Simplify autogen.sh 
Make use of the autoreconf tool
 2016-02-14 22:36:40 +01:00
Bernard Spil f554f08fa9 Fix FreeBSD CPU% calculation 2016-02-14 22:21:11 +01:00
Bernard Spil d753996b96 Fix memory percentage display on FreeBSD 2016-02-14 21:48:36 +01:00
Bernard Spil b10278318b Merge branch 'master' of https://github.com/hishamhm/htop 2016-02-14 17:47:29 +01:00
Hisham 35657208d7 Disable the syscall on systems that don't have it. 
Got a report in #397 that htop runs in NetBSD
masquerading as Linux and using a compatibility /proc
(like we used to in FreeBSD) and that it builds fine
apart from this syscall.
 2016-02-14 12:05:35 -02:00
Hisham ae823c375a Make unsupported platform build again. 
(Thanks @coypoop at #397 for the heads up!)
 2016-02-14 11:45:47 -02:00