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

216 Commits

Author SHA1 Message Date
Christian Göttsche b08b255b41 Drop unused Platform functions Platform_setTasksValues 2020-10-22 22:26:12 +02:00
Christian Göttsche f8208f2173 Drop tabs in source indentions 2020-10-20 21:43:36 +02:00
Daniel Lange 9f1a9ab2c2 Merge branch 'header_pause' of cgzones/htop 
Continue to update generic data in paused mode
 2020-10-20 10:17:58 +02:00
Christian Göttsche 96e2a4259e Continue to update generic data in paused mode 
Generic data, as CPU and memory usage, are used by Meters.
In paused mode they would stop receiving updates and especially Graph
Meters would stop showing continuous data.

Improves: #214
Closes: #253
 2020-10-19 14:45:39 +02:00
Christian Göttsche 361877454f Cache PAGE_SIZE 
man:sysconf(3) states:
    The values obtained from these functions are system configuration constants.
    They do not change during the lifetime of a process.
 2020-10-19 14:42:35 +02:00
Benny Baumann 0f5262917f Make all required includes explicit 
Information as seen by IWYU 0.12 + clang 9 on Linux
 2020-10-18 20:09:05 +02:00
Christian Göttsche 7cd093ce95 Add NetworkIOMeter 2020-10-16 20:00:14 +02:00
Christian Göttsche a63cfc8b7c Refactor generating starttime string into Process class 2020-10-16 19:23:40 +02:00
Christian Göttsche 7af06659e2 Mark remaining classes const 2020-10-13 14:56:01 +02:00
Benny Baumann 601480003f Centralise fault handling 
This should be done as all platforms essentially did the same anyway and there was nothing platform specific.
 2020-10-12 13:06:12 +02:00
Christian Göttsche 41eea8a355 Mark process argument of Process_isThread const 2020-10-09 10:18:40 +02:00
Benny Baumann 4a78f4bb92 Some more locations for ARRAYSIZE 2020-10-08 15:37:03 +02:00
Christian Göttsche ba282cfe19 Mark Object instances const 2020-10-07 13:01:53 +02:00
Christian Göttsche 08d85e6143 Mark Object classes and Object class fields const 2020-10-07 13:01:53 +02:00
Christian Göttsche db472075a4 Enable -Wcast-qual compiler warning 2020-10-06 11:20:07 +02:00
Nathan Scott e9fa290019 Merge branch 'update-license-and-copyright-info' 2020-10-06 10:27:38 +11:00
Michael F. Schönitzer d93cac12be
Add a date and datetime meter (#159) 
Add a date meter and sort header and source files in Makefile

Change the lists of header and source files sorted alphabetical and one
file per line. This way diffs become better readable and merges easier.
 2020-10-05 13:52:58 +02:00
Daniel Lange 079c2abf8e Update License consistently to GPLv2 as per COPYING file 2020-10-05 10:13:12 +02:00
Nathan Scott 576b82f86a Merge branch 'attr-nonnull' of https://github.com/BenBE/htop into BenBE-attr-nonnull 2020-10-05 15:57:52 +11:00
Christian Göttsche e518459981 Add DiskIOMeter for IO read/write usage 2020-10-03 19:01:38 +02:00
Benny Baumann dac1e05a2c Fix FreeBSD compile issue 
This issue was previously hidden as xSnprintf expanded to only one large command that didn't trigger the GCC formatting check.
 2020-09-29 17:41:31 +02:00
multi 9ee72568dc CPUMeter: add octuple-column CPU meters. 
This is a straightforward extension of the existing multi-column CPU meter
code, which now allows for up CPU meters to be displayed in up to 16 columns.

This also adds the meter declarations to all the platform-specific code.
 2020-09-28 14:35:35 +02:00
multi 491bf98b90 Add missing 4-column CPU meters to non-Linux platforms. 2020-09-28 14:35:35 +02:00
Christian Göttsche 4e282eb845 Add -Wmissing-prototypes compiler warning 2020-09-25 17:20:35 +02:00
Benny Baumann 3c65d78d77 Update CPU freq display to use NAN on error 2020-09-24 18:06:36 +02:00
Benny Baumann 47e2cefe02 Update battery API to use NAN on error 2020-09-24 18:06:36 +02:00
Christian Göttsche efb971f9df Fail travis CI on compiler warnings 2020-09-18 12:28:40 +02:00
Christian Göttsche 475f729a36 Resolve unused variable on FreeBSD 2020-09-18 12:28:40 +02:00
Christian Göttsche e719a85994 Mark noreturn functions 2020-09-18 12:28:40 +02:00
Christian Göttsche c3952e7c20 Use strict function prototypes 
int foo(); declares a function taking any number of arguments.
 2020-09-18 12:28:40 +02:00
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
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 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
Daniel Lange 45062b26d6 Merge branch 'patch-1' of https://github.com/ginggs/htop-1 into ginggs-patch-1 2020-08-22 15:35:55 +10:00
Graham Inggs 6aed2be247
Fix build on FreeBSD 2020-08-21 16:49:28 +02:00
Christian Göttsche b92f62f912 Remove trailing whitespaces 2020-08-21 10:37:33 +02:00
Nathan Scott 9a55efc8b5 Merge branch 'hishamhm-pull-920' 2020-08-20 18:24:35 +10:00
Nathan Scott 6b443c5da9 Merge branch 'hishamhm-pull-932' 2020-08-20 14:47:07 +10:00
Nathan Scott ab61ae3963 Merge branch 'hishamhm-pull-974' 2020-08-20 14:24:11 +10:00
Nathan Scott e833bf915f Merge branch 'hishamhm-pull-904' 2020-08-20 14:01:33 +10:00
Nathan Scott ed2b7791df Merge branch 'hishamhm-pull-871' 2020-08-20 09:53:39 +10:00
Robert Crowston 87c05ac136 Fix STARTTIME column on FreeBSD. 2019-12-31 19:28:23 +00:00
Ross Williams 613556faeb Support for ZFS Compressed ARC statistics 2019-09-03 18:44:19 +00:00
Ross Williams e450b58636 Refactor openzfs_sysctl_init() and ZfsArcMeter... 
openzfs_sysctl_init() now returns void instead of int.
The ZfsArcStats->enabled flag is set inside the init function
now, instead of having to be set from its return value.
Preparation for more flag setting in Compressed ARC commit.

ZfsArcMeter_readStats() added and all Meter->values[] setting
moved to it, eliminating duplicated code in
{darwin,freebsd,linux,solaris}/Platform.c.
 2019-09-03 18:21:33 +00:00
Arnavion 909bb86f05 Show N/A on unsupported platforms instead of 0KHz 2019-08-10 17:17:45 -07:00
Ross Williams 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
Ross Williams a93edde1a2 Support ZFS ARC stats on FreeBSD 
New meter displays same ARC stats as FreeBSD top(1).
Can be extended to other platforms that support ZFS.

Pulling kstat.zfs.misc.arcstats.c_max as the meter
total, so the meter has a meaningful value to work
up to.

The Text meter displays, first, the maximum
ARC size (Meter.total), then second, the total
ARC used, using the difference between Meter.maxItems
and Meter.curItems to "hide" the used value from the
Bar and Graph drawing functions by using an index
in Meter.values[] that is beyond curItems - 1, but
less than maxItems - 1.
 2019-07-07 22:52:04 -04:00
Ross Williams 92258e99e6 Specify correct MIB length 
Could have resulted in a buffer overflow if the
FreeBSD kernel returned more bytes than expected.
 2019-07-06 04:27:00 +00:00
Robert Crowston fabe75685a Truncate overwide jail names on BSD. 2019-04-17 10:07:13 +01:00
Tobias Kortkamp ecfd6f685e
Fix memory statistics display on FreeBSD/powerpc 
Use the appropriate types when calling sysctl().

Currently, `unsigned long long int` is used for all sizes and on
FreeBSD/powerpc this causes all sysctl() calls in scanMemoryInfo()
to fail as they are actually of different sizes on powerpc, where
(sizeof(unsigned long long int), sizeof(u_long)) == (8, 4)
vs (8, 8) on amd64.  This results in bogus memory sizes being
reported by htop.

Signed-off-by: Tobias Kortkamp <tobik@FreeBSD.org>
 2018-12-24 13:51:01 +01:00
Daniel Lange c34be41e1c Widen ST_UID (UID) column to 5 chars to allow UIDs > 9999 without breaking alignment 
Issue Github #841, Debian bug #910492
 2018-10-07 11:16:12 +02:00
Hisham Muhammad 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
Kamyar Rasta 3f6d1262c0 Issue #502 fix SID colunm header width 2017-02-05 00:10:29 +01:00
Kamyar Rasta 84bc00a275 Issue #502 update Session ID column 2017-02-01 00:03:55 +01:00
Hisham 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
Hisham 6d4df3d138 Merge branch 'master' of https://github.com/hishamhm/htop 2016-08-30 12:38:12 -03:00
Hisham d4a8023b72 Fix typos, by @Gelma. 
Closes #546.
 2016-08-30 12:37:31 -03:00
Explorer09 1f3d85b617 Mark signal tables 'const' 
Specifically, Platform_signals[] and Platform_numberOfSignals. Both are
not supposed to be mutable. Marking them 'const' puts them into rodata
sections in binary. And for Platform_numberOfSignals, this aids
optimization (aids only Link Time Optimization for now). :)

Signed-off-by: Kang-Che Sung <explorer09@gmail.com>
 2016-08-30 20:41:17 +08:00
Hisham Muhammad 6028e1b4c4 Merge pull request #496 from tcreech/lwp_hack 
FreeBSD: fix multithreaded CPU% in process list
 2016-05-19 15:44:57 -03:00
Andy Pilate 5776cb56b4 Revert "Fix FreeBSD CPU% calculation" 
This reverts commit f554f08fa9.
 2016-04-28 21:42:18 +02:00
Hisham e2ccc7b240 Prepare for release 2.0.1. 2016-03-07 18:32:06 -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
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
Tim Creech cc8375f9ea FreeBSD: use KERN_PROC_PROC with kvm_getprocs to avoid erroneously combining LWPs 2016-02-28 22:41:50 -05:00
Tim Creech 0cf3cfa3af Fix low CPU usage reporting in FreeBSD 2016-02-26 23:23:27 -05: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
Hung-Yi Chen c66ac09a66 Add MEM% for processes in process list on FreeBSD. 2016-02-13 23:24:57 +08:00
Hung-Yi Chen cc4267cc5c Suppress compiler warnings. 2016-02-13 02:09:50 +08:00
Greg V bb0333e45d fix process memory on FreeBSD 2016-02-11 15:52:39 +03:00
Greg V f1d1d6e0d6 add FreeBSD battery support 2016-02-11 13:42:37 +03:00
Hisham ffcf48fb74 Merge branch 'xalloc' 2016-02-02 15:58:45 +01:00
Hisham b54d2dde40 Check for failure in allocations. 2016-02-02 15:53:02 +01:00
Hisham 21da044fb4 Add generated header. 2016-01-31 17:41:55 +01:00
Explorer09 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
Michael Klein b10e54cdee Merge remote-tracking branch 'upstream/master' into envscreen 2016-01-06 22:39:57 +01:00
Hisham Muhammad f342a9eb83 Merge branch 'freebsd-free' of https://github.com/mmcco/htop into mmcco-freebsd-free 2016-01-04 18:08:51 -02:00
Hisham Muhammad c5b9045f18 Plug leak in FreeBSD backend, as noted by @mmcco in #334. 2016-01-04 18:04:50 -02:00
Michael McConville 61f2d674b0 Remove NULL-checks before free() 
These are never necessary when using the standard library.
 2016-01-03 16:59:44 -05:00
Michael McConville 7170382706 Fix spelling of "maintainer" 2016-01-02 12:11:26 -05:00
Martin "eto" Misuth c67e482c67 fixed bug with PPID of parent not being set on first process list scan pass. 
this caused htop to show processes as if freebsd kernel was their parent.
on next pass reparenting code took chance to run, and that caused process to jump around.
this fixed behaviour should be the correct one
 2015-12-17 08:48:53 +01:00
Martin "eto" Misuth e0b6e2eef2 enabled swap meter 2015-12-13 04:16:06 +01:00
Martin "eto" Misuth 9d55c56f26 added Support for memory meter, and slightly adjusted process monitor logic 2015-12-13 04:11:35 +01:00
Martin "eto" Misuth 80f594f314 added CPU% for processes in process list 2015-12-13 01:39:54 +01:00
Martin "eto" Misuth c2769985cc added cpu monitoring for both single core and smp systems, some notes in process monitor 2015-12-13 00:21:02 +01:00
Martin "eto" Misuth bc84920b91 added support for effective UID/username change detection 2015-12-11 11:01:24 +01:00
Michael Klein cc23d13f87 Add Platform_getProcessEnv 
- currently implemented for darwin and linux
 2015-12-03 22:23:40 +01:00
Hisham Muhammad 78f2933e2b Regenerate platform-dependent headers. 
Closes #293.
 2015-10-19 17:22:54 -02:00
Martin "eto" Misuth 23bf564d73 Fixed reparenting issue. PPID should be updated each refresh as any process can get reparented to either 
PID1 or even any other PID (if there are custom reapers in the system).
Similar issue with jails, elevated process can ask kernel to attach itself into any jail at any time,
thus JID and jail name can change each refresh cycle.
 2015-10-06 19:50:19 +02:00
Martin "eto" Misuth 3ea7b34735 attempt to return to upstream/master 2015-10-06 19:39:01 +02:00
Martin "eto" Misuth 2379835910 Added platform dependent DEFAULT_SIGNAL define, for now for: 
FreeBSD
Linux
Other platforms will have it undefined for now.
 2015-10-06 14:04:22 +02:00
Martin "eto" Misuth 86417e4157 Unless I move signal definitions into the comment used for header generation, 
htop fails to compile with:

```text
SignalsPanel.c:32:49: error: use of undeclared identifier 'Platform_signals'
      Panel_set(this, i, (Object*) ListItem_new(Platform_signals[i].name, Platform_signals[i].number));
                                                ^
1 error generated.
*** Error code 1
```
 2015-10-06 12:46:37 +02:00
Hisham Muhammad 3fe2f3e28e Move list of signals to platform-specific code. 
Implementations for Linux (tested) and FreeBSD (still untested, thanks to @etosan for providing the table).
Darwin and OpenBSD(ping @mmcco) builds should be broken now, pending their own tables.
 2015-10-06 03:02:49 -03:00
Hisham Muhammad bf276a0993 Merge pull request #274 from mmcco/master 
Cleanup and initial OpenBSD support
 2015-10-05 11:22:50 -03:00
Martin "eto" Misuth 8c00fa4582 Added preliminary attempt at jails support on FreeBSD - JID and JAIL (name) columns, somewhat more correct kernel "thread" detection. 
Seems FreeBSD kernel can spawn both kernel processes (what is what htop currently sees) and kernel threads.
For now let's consider kernel processes kernel "threads".
 2015-09-30 22:04:26 +02:00
Michael McConville 445222e48c Clean up some needless malloc casts, convert some mallocs to callocs, and fix some style 2015-09-16 23:42:36 -04:00
Christian Hesse e8970b6f32 fix calloc() calls 
* size_t nmemb (number of elements) first, then size_t size
* do not assume char is size 1 but use sizeof()
* allocate for char, not pointer to char (found by Michael McConville,
  fixes #261)
 2015-09-07 07:52:39 +02:00
Hisham Muhammad 9428010121 Make column width calculation dynamic. 
Closes #228.
 2015-08-20 00:32:47 -03:00
Lance Chen 5a5dc71770
Cast FreeBSDProcess_new to Process_New 
`Process_new_fn` had been renamed to `Process_New` in
d880def0e9
 2015-06-07 17:31:05 +08:00
Lance Chen 1efa544e1b
Re-run MakeHeader.py on freebsd/FreeBSDProcess.c 
Several functions and struct had changed in
b291fba02b
 2015-06-07 17:30:55 +08:00
Hisham Muhammad b291fba02b Fixes to use platform-specific compare routines. 2015-04-09 15:40:46 -03:00
Hisham Muhammad 272e2d9b34 Major advances in FreeBSD port. 2015-03-16 23:02:03 -03:00
Hisham Muhammad adbfe3c3f1 Get FreeBSD tree to compile again with latest changes. 2015-03-16 03:14:20 -03:00
Hisham Muhammad c29e53c5d5 Add a stub for the battery meter. 2014-11-27 21:07:42 -02:00
Hisham Muhammad f4c49ff92e "get max pid" for FreeBSD 2014-11-27 20:18:01 -02:00
Hisham Muhammad 6d92d7f73d Load averages for FreeBSD! 2014-11-27 20:03:29 -02:00
Hisham Muhammad 3ba3d6fa6f Add uptime calculation code. 2014-11-27 19:44:20 -02:00
Hisham Muhammad a9f05c2a8b Uptime meter for FreeBSD. 
This will produce too much replicated code.
I think I'll use a lighter abstraction in things like this.
 2014-11-27 19:33:37 -02:00
Hisham Muhammad 0aa485cf47 Reading swap data! 2014-11-27 18:31:39 -02:00
Hisham Muhammad 28712f22b1 Reading first bits of data! 2014-11-27 17:44:55 -02:00
Hisham Muhammad 8915b29395 Beginnings of FreeBSD port! 2014-11-27 16:27:34 -02:00