af84d3dfa9
Fail on out-of-range CPU number
...
Found by Coverity
2020-08-28 16:46:50 +02:00
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
a48ce9d103
Really tell gcc to ignore return value of fscanf
2020-08-28 13:10:41 +02:00
4e2b9f0965
Avoid shadowing warnings
2020-08-25 12:01:56 +02:00
3856bf574b
Introduce xAsprintf as checked version of asprintf
2020-08-21 10:37:29 +02:00
9a55efc8b5
Merge branch 'hishamhm-pull-920'
2020-08-20 18:24:35 +10:00
fed14a584d
Merge branch 'hishamhm-pull-970'
2020-08-20 15:33:30 +10:00
6b443c5da9
Merge branch 'hishamhm-pull-932'
2020-08-20 14:47:07 +10:00
a82fd262d7
Merge branch 'hishamhm-pull-960'
2020-08-20 14:19:53 +10:00
45ae6191c1
Merge branch 'hishamhm-pull-866'
2020-08-20 12:29:25 +10:00
eef6bc447d
Correction to smaps buffer size passed to smaps path snprintf
2020-08-19 17:50:43 +10:00
88c9ebb8f7
Properly identify zombie processes
...
This closes issue #930 .
2019-12-14 11:47:03 +01:00
dd33444f7e
Clean up existing whitespace
2019-10-31 11:39:12 -05:00
a267003f2f
Linux fixes
2019-09-03 19:56:38 +00:00
613556faeb
Support for ZFS Compressed ARC statistics
2019-09-03 18:44:19 +00:00
81b64691a7
Move sysfs-reading code to LinuxProcessList.c and add average frequency.
...
This way the frequency is read from sysfs only once per update cycle
instead of every time the UI is redrawn.
This also changes the code to read from /proc/cpuinfo instead. This is because
reading from scaling_cur_freq stalls for 10ms if the previous read for the file
was more than one second ago. [1] Since htop's update cycle is
longer than that, it would cause the read of each CPU's scaling_cur_freq file
to block the UI for 20ms. This easily led to a noticeable half-second lag on
a 20+ CPU machine.
/proc/cpuinfo also has a 10ms delay, but this applies for the whole file
so the delay does not scale with the number of CPUs. [2]
[1]: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=4815d3c56d1e10449a44089a47544d9ba84fad0d
[2]: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=7d5905dc14a87805a59f3c5bf70173aac2bb18f8
2019-08-10 22:19:32 -07:00
a88d2e313d
Refactor common OpenZFS sysctl access
...
Darwin and FreeBSD export zfs kstats through the
same APIs, so moving functions into a common file.
2019-07-07 23:10:54 -04:00
070fe90461
ZFS arcstats for Linux
...
If no pools are imported (ARC size == 0) or the
ZFS module is not in the kernel (/proc/spl/kstat/zfs/arcstats
does not exist), then the Meter reports "Unavailable".
2019-07-07 22:57:15 -04:00
078c2ddde5
Linux: Use /proc/*/smaps_rollup for improved PSS parsing speed
2019-03-20 17:00:49 +01:00
fc0bf546c3
Linux: Add PSS (proportional set size), Swap and SwapPSS calculation
...
Original code was written by *Craig M. Brandenburg* for htop 1.0.2
Many performance improvements by GitHub user *linvinus*, ported to htop 2.0.2
2019-03-20 17:00:41 +01:00
402e46bb82
Linting changes
...
as reported by lgtm.com
2019-02-10 14:16:46 +01:00
41754e5632
Remove unnecessary HAVE_SYS_SYSMACROS_H check
...
HAVE_SYS_SYSMACROS_H is always true if MAJOR_IN_SYSMACROS.
This way of checking is recommended in autoconf 2.70 documentation:
https://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=blobdiff;f=doc/autoconf.texi;h=4f041bd4e;hp=9ad7dc1c5f02c8ba25b2fe1218bf931c7113a5d5;hb=e17a30e987d7ee695fb4294a82d987ec3dc9b974;hpb=565a6dc50cfa01cec2fb4db894026689cdf4970c
NOTE: currently
https://www.gnu.org/software/autoconf/manual/autoconf.html is the
doc for autoconf 2.69.
2018-12-15 22:10:06 +09:00
bae27054e6
Linux: fix CPU count
2018-08-24 18:38:06 -03:00
8d01ae2054
Linux: remove warnings of unused variables
2018-08-24 18:38:06 -03:00
bd1d719a61
Linux: add process->starttime and use it for STARTTIME column ( #700 )
...
this way a remount of /proc will not reset starttimes
and we can also see startup times for processes started before the mount
of /proc
also record btime (boot time in seconds since epoch) as Linux semi-global
2018-08-19 01:29:03 -03:00
d74b6dc8e0
Fix process name updates for shorter strings ( #812 )
...
When a process name changes from a long string to a short string,
truncate instead of just overwriting the beginning.
2018-07-28 00:08:40 -03:00
47cf1532b0
Linux: change how kernel threads are detected
...
Use the same method that ps and top use to determine if a
process is a kernel thread on Linux: check if cmdline is empty.
Thanks to @wangqr's investigation reported here:
https://github.com/hishamhm/htop/issues/761#issuecomment-375306069
Fixes #761 .
2018-03-25 15:26:05 -03:00
c01f40eb3e
Fix build failure ('major' undefined) in glibc 2.28. ( #746 )
...
glibc 2.28 no longer defines 'major' and 'minor' in <sys/types.h> and
requires us to include <sys/sysmacros.h>. (glibc 2.25 starts
deprecating the macros in <sys/types.h>.) Now do include the latter if
found on the system.
At the moment, let's also utilize AC_HEADER_MAJOR in configure script.
However as Autoconf 2.69 has not yet updated the AC_HEADER_MAJOR macro
to reflect the glibc change [1], so add a workaround code.
Fixes #663 . Supersedes pull request #729 .
Reference:
[1] https://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=commit;h=e17a30e987d7ee695fb4294a82d987ec3dc9b974
Signed-off-by: Kang-Che Sung <explorer09@gmail.com>
2018-02-26 10:15:05 -03:00
6dda8d2586
linux/LinuxProcessList.c: Fix indentation.
2018-02-17 20:52:46 -02:00
70ed51a303
linux/LinuxProcessList: fix reading of number of read syscalls of process
...
The "if" tests if the character at index "5" is 'r', as a first quick
check. However at index "5" will always be a colon ":". This patch fixes
the off-by-one error. htop now shows proper values in the RD_SYSC
column.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
2018-02-17 16:14:34 -02:00
b7b66b76a5
Adds support for linux delay accounting ( #667 )
...
Adds support for showing columns with linux delay accounting.
This information can be read from the netlink interface, and thus we set up a socket to read from that when initializing the LinuxProcessList (LinuxProcessList_initNetlinkSocket). After that, for each process we call LinuxProcessList_readDelayAcctData, which sends a message thru the socket after setting up a callback to get the answer from the Kernel. That callback sets the process total delay time attribute. We then set the delay percent as the percentage of time process cpu time since last scan.
2017-12-04 00:15:29 -02:00
9487bda330
Do not use xSnprintf when the result is used. Fixes #662 .
2017-08-01 15:48:43 -07:00
09e241fb12
Security review: check results of snprintf.
...
Calls marked with xSnprintf shouldn't fail.
Abort program cleanly if any of them does.
2017-07-27 16:07:50 -03:00
e940aecfb9
Add "no perm" status when other fields fail due to lack of permission.
...
Thanks @Sworddragon for the heads up.
See #88 .
2017-07-10 20:57:34 -03:00
8af4d9f453
Interpret TTY_NR column on Linux,
...
translate dev_t to major:minor on other platforms.
Closes #316 .
2016-10-01 03:09:04 -03:00
bd5d37f297
Return when reading cmdline fails (e.g. zombie process)
2016-08-24 18:11:10 -03:00
1a13b4d0f4
Don't store invisible trailing whitespace
2016-06-15 12:41:50 -03:00
e77811e99b
any of these values may wrap
2016-02-29 21:57:03 -03:00
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
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
0b70439316
Fix buffer reuse.
2016-02-13 02:18:28 -02:00
b2c2b2bfb3
Merge branch 'reuse-comm'
2016-02-02 15:58:50 +01:00
1cfcc42a8f
Reuse comm object if possible, avoid useless repetitions of free+strdup.
2016-02-02 15:56:52 +01:00
b54d2dde40
Check for failure in allocations.
2016-02-02 15:53:02 +01:00
6dae8108f8
Introduce CLAMP macro. Unify all MIN(MAX(a,b),c) uses.
...
With the CLAMP macro replacing the combination of MIN and MAX, we will
have at least two advantages:
1. It's more obvious semantically.
2. There are no more mixes of confusing uses like MIN(MAX(a,b),c) and
MAX(MIN(a,b),c) and MIN(a,MAX(b,c)) appearing everywhere. We unify
the 'clamping' with a single macro.
Note that the behavior of this CLAMP macro is different from
the combination `MAX(low,MIN(x,high))`.
* This CLAMP macro expands to two comparisons instead of three from
MAX and MIN combination. In theory, this makes the code slightly
smaller, in case that (low) or (high) or both are computed at
runtime, so that compilers cannot optimize them. (The third
comparison will matter if (low)>(high); see below.)
* CLAMP has a side effect, that if (low)>(high) it will produce weird
results. Unlike MIN & MAX which will force either (low) or (high) to
win. No assertion of ((low)<=(high)) is done in this macro, for now.
This CLAMP macro is implemented like described in glib
<http://developer.gnome.org/glib/stable/glib-Standard-Macros.html >
and does not handle weird uses like CLAMP(a++, low++, high--) .
2016-01-15 20:26:01 +08:00
802e216870
Extend buffer for reading lines from /proc.
...
Apparently a line longer than 255 chars was spotted in the wild:
http://serverfault.com/questions/577939/linux-ps-htop-show-processes-running-for-hundreds-or-thousands-of-days-though-h#comment676098_577939
2015-12-14 13:27:11 -02:00
a84aa2e782
Cached memory calculations, take 2.
...
Thanks to @OmegaPhil for discussion and reviewing.
2015-11-29 23:55:31 -02:00
5bc1f5ed04
Account unreclaimable slab and shmem as used memory,
...
reclaimable slab as cached memory.
Hopefully this presents a more truthful representation of
available vs. used memory on Linux.
See brndnmtthws/conky#82, #242 , #67 , #263 .
2015-11-28 22:22:00 -02:00
b37d4f172f
Fix a case where the usertime calculation can overflow (see issue #202 )
2015-09-14 22:51:14 +02:00
5e4f1e46cc
Reduce scope of variables.
2015-08-20 01:12:34 -03:00
5e602f18d5
Rename String to StringUtils.
...
Fixes building on case-insensitive filesystems where String.h gets confused with <string.h>.
From d734dacea0a10d0465dad4e95b3421511e7da112 Mon Sep 17 00:00:00 2001
From: David Hunt <dhunt@iolanthe.attlocal.net>
Date: Sat, 11 Jul 2015 20:56:31 -0500
Subject: [PATCH 1/8] Rename String to StringUtils
2015-08-19 13:45:20 -03:00
6f6f0e36ad
Fix typo in comment
2015-08-04 18:48:34 +05:00
08829cbc3b
fix compiler warnings
...
gcc gives warnings like this:
warning: ignoring return value of ‘fscanf’, declared with attribute
warn_unused_result
Assign value to a variable, cast to (void) to discard it.
2015-05-15 11:33:25 +02:00
f4f6d54ffd
Fix compilation of OpenVZ support.
...
Closes #185 .
Closes #190 .
2015-05-13 15:00:58 -03:00
2f45008477
Enable OOM support unconditionally on Linux.
...
Read OOM data only if column is enabled.
Make sort ordering more consistent. Closes #182 .
2015-04-09 15:41:21 -03:00
b291fba02b
Fixes to use platform-specific compare routines.
2015-04-09 15:40:46 -03:00
d880def0e9
Merge branch 'master' into wip
...
Conflicts:
Process.c
Process.h
htop.c
linux/LinuxProcess.c
linux/LinuxProcess.h
test_spec.lua
2015-04-02 01:57:37 -03:00
4e064e0db7
Build fixes to resync with FreeBSD changes.
2015-03-16 23:03:40 -03:00
272e2d9b34
Major advances in FreeBSD port.
2015-03-16 23:02:03 -03:00
7fd4af80ff
Linux build fixes.
2015-03-16 03:25:43 -03:00
5c8b83405b
Merge branch 'master' into wip
...
Conflicts:
Process.c
Process.h
linux/LinuxProcess.c
linux/LinuxProcess.h
linux/LinuxProcessList.c
unsupported/Platform.c
unsupported/Platform.h
2015-03-16 03:22:33 -03:00
adbfe3c3f1
Get FreeBSD tree to compile again with latest changes.
2015-03-16 03:14:20 -03:00
be1700cf94
Isolate portable and Linux-specific process fields.
2015-03-16 01:43:04 -03:00
e3fe3962cb
Move more Linux-specific code into Linux subdir.
2015-03-15 20:29:13 -03:00
a4b03e8875
Improve reading of cgroups.
2015-03-08 19:47:49 -03:00
0a184b769f
Merge fixes
2015-02-23 03:53:36 -03:00
50000d808e
Silence warnings reported in #70 .
2015-02-23 03:34:06 -03:00
9780c312f4
Fix allocation of processes. Closes #166 .
...
Conflicts:
Process.c
Process.h
ProcessList.c
ScreenManager.c
linux/LinuxProcessList.c
2015-02-23 01:13:40 -03:00
6f868b00c0
Fix allocation of processes. Closes #166 .
2015-02-20 14:52:10 -02:00
83a829a286
Remove bogus assertion. Closes #159 .
2015-01-23 11:22:55 -02:00
3383d8e556
Sorry about the mega-patch.
...
This is a work-in-progress, code is currently broken.
(Some actions, and notably, the header, are missing.)
2015-01-21 23:27:31 -02:00
36b7832884
Fix initialization of cpuData structure. Closes #159 .
2015-01-19 16:24:56 -02:00
cda6bdd56b
Add ProcessList_delete to the variable interface.
2014-11-27 17:48:38 -02:00
ff4d1b466f
Build fixes.
2014-11-27 16:31:42 -02:00
6afacee50d
A little refactoring
2014-11-27 16:28:32 -02:00
aaaaf063a1
Builds on Linux again!
2014-11-24 19:22:50 -02:00
26422af608
Files moved and added for supporting separate platforms.
2014-11-24 18:55:49 -02:00
Christian Göttsche