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

811 Commits

Author SHA1 Message Date
Michael McConville 0fb9a8c389 Remove a debugging print 2015-11-01 13:19:01 -05:00
Hisham Muhammad b669540e4e Merge pull request #298 from patrickmarlier/issue202 
Fix a case where the usertime calculation can overflow (see issue #202)
 2015-10-26 17:55:13 -04:00
Hisham Muhammad ea8a8b2d6b Merge pull request #296 from hishamhm/darwin-cpu-average 
Darwin cpu average
 2015-10-24 23:29:47 -04:00
Hisham Muhammad bd93b2e1d7 Initialize variables, silence warnings. 2015-10-24 23:28:29 -04:00
Hisham Muhammad 71190654bc Calculate CPU averages on Darwin (See #295). 2015-10-23 13:46:21 -02:00
Hisham Muhammad 9c146393a3 Improve prose a bit. 2015-10-19 17:26:53 -02:00
Hisham Muhammad 57333d8a47 Merge pull request #280 from eworm-de/man-htoprc 
add hint about system configuration file
 2015-10-19 17:26:22 -02:00
Hisham Muhammad 78f2933e2b Regenerate platform-dependent headers. 
Closes #293.
 2015-10-19 17:22:54 -02:00
Michael McConville 8673a84e5f Remove some trailing whitespace 2015-10-13 11:05:52 -04:00
Michael McConville 9f1884c28f Fix generation of openbsd/Platform.h and replace a vestigial dummy CPU utilization value 2015-10-09 14:57:01 -04:00
Hisham Muhammad e906c0dddb Merge pull request #287 from etosan/master 
PPID and JID update fix
 2015-10-07 20:48:46 -03:00
Martin "eto" Misuth 93f05b459f fixed broken merge, where I forgot to check linux/Platform.c so that it matches upstream 2015-10-06 20:05:55 +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 214d0cff0d merge with 'upstream/master' 2015-10-06 19:39:12 +02:00
Martin "eto" Misuth 3ea7b34735 attempt to return to upstream/master 2015-10-06 19:39:01 +02:00
Hisham Muhammad cc0fc3655d Add Darwin signals (same as FreeBSD) 
https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man3/signal.3.html
 2015-10-06 13:03:47 -03:00
Hisham Muhammad 56193323ce let's let the user find SIGIOT if the look for it :) 2015-10-06 12:58:53 -03:00
Hisham Muhammad ee0d602a47 Merge branch 'master' of https://github.com/hishamhm/htop 2015-10-06 12:52:48 -03:00
Hisham Muhammad 125c23ef23 Fix build in FreeBSD, and make sure SIGTERM is always the default. 2015-10-06 12:50:31 -03:00
Hisham Muhammad 384c92f7e4 Merge pull request #286 from mmcco/master 
Add OpenBSD signals
 2015-10-06 12:42:13 -03:00
Michael McConville c4eb99f264 Add header file reference for OpenBSD signals 2015-10-06 11:32:40 -04:00
Michael McConville 77f12bbecd Add OpenBSD signals 2015-10-06 11:25:16 -04: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
Christian Hesse 7859857fdd add hint about system configuration file 2015-10-06 08:18:56 +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 fbb4c49edd gcc warning cleanups. 2015-10-05 11:27:44 -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
Hisham Muhammad 5c2b0a6bbc Merge pull request #283 from eworm-de/editorconfig 
add editorconfig file to give hints to editors
 2015-10-05 11:19:59 -03:00
Christian Hesse 1cda2d7397 add editorconfig file to give hints to editors 
We use an unusual indent of three spaces. Let's give editors a hint
about that.
 2015-10-05 11:13:17 +02:00
Hisham Muhammad 68c3270be8 Merge pull request #281 from etosan/master 
Added preliminary attempt at jails support on FreeBSD - JID and JAIL (name) columns
 2015-09-30 22:28:40 -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
Hisham Muhammad 2d1507ad5a Merge pull request #275 from trebmuh/patch-1 
Update htop.desktop (FR l10n)
 2015-09-21 14:17:21 -03:00
Michael McConville 6a21d2f3a6 Fix enumeratoin of on-CPU processes in OpenBSD 2015-09-19 12:45:22 -04:00
Michael McConville ad1a0ad08d Replace some remaining tabs 2015-09-19 12:21:22 -04:00
Michael McConville 571cbc0aa1 Change more fprintf(stderr, ...); exit(...); to err[x](...). Tweak a few existing ones and fix some style. 2015-09-19 12:15:26 -04:00
Michael McConville e2bbd5cfa4 Change some tabs to three spaces 2015-09-19 12:08:34 -04:00
trebmuh c5d725daf9 Update htop.desktop 
fix
 2015-09-19 00:12:41 +02:00
Hisham Muhammad 9c14fa6fad Merge pull request #273 from kaefer/fix-glibtoolize-detection 
Mac build fixes
 2015-09-18 15:41:41 -03:00
Michael McConville a9a5a539cf (Very) initial working OpenBSD port 2015-09-18 00:46:48 -04:00
trebmuh b0e074f6b6 Update htop.desktop 
This one is adding FR localisation to the desktop file.
Cheers.
 2015-09-17 20:04:18 +02:00
kaefer 02727bda81 ignore which errors 2015-09-17 08:44:34 +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
Patrick Marlier b37d4f172f Fix a case where the usertime calculation can overflow (see issue #202) 2015-09-14 22:51:14 +02:00
kaefer 40525d85bc removing unnecessary include, which on top breaks compiling 2015-09-14 16:18:51 +02:00
kaefer 661a4cec4a fix glibtoolize detection 2015-09-14 10:03:17 +02:00
Hisham Muhammad 1d805b36b4 Bring changelog up-to-date :) 2015-09-11 16:29:19 -03:00
Hisham Muhammad 8e81119c33 Merge branch 'master' of https://github.com/hishamhm/htop 2015-09-11 13:42:04 -03:00
Hisham Muhammad 0c2ccde306 Detect when libtoolize is called glibtoolize. 
It's the case on Darwin, and might be in other BSDs as well.
As referred in #268.
Supersedes PR #269.
 2015-09-11 13:39:06 -03:00
Hisham Muhammad a92f803903 Merge pull request #268 from jweyrich/darwin-fixes 
Darwin fixes - duplicate & conflicting decls
 2015-09-10 16:41:53 -03:00