Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'reuse-comm' | Hisham | 2016-02-02 | 1 | -8/+17 |
|\ | |||||
| * | Reuse comm object if possible, avoid useless repetitions of free+strdup. | Hisham | 2016-02-02 | 1 | -8/+17 |
| | | |||||
* | | Check for failure in allocations. | Hisham | 2016-02-02 | 4 | -9/+9 |
|/ | |||||
* | Introduce CLAMP macro. Unify all MIN(MAX(a,b),c) uses. | Explorer09 | 2016-01-15 | 4 | -2/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | 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--) . | ||||
* | Merge remote-tracking branch 'upstream/master' into envscreen | Michael Klein | 2016-01-06 | 3 | -15/+23 |
|\ | |||||
| * | Merge branch 'master' of https://github.com/hishamhm/htop | Hisham Muhammad | 2016-01-03 | 1 | -1/+1 |
| |\ | |||||
| | * | Fix spelling of "maintainer" | Michael McConville | 2016-01-02 | 1 | -1/+1 |
| | | | |||||
| * | | Extend buffer for reading lines from /proc. | Hisham Muhammad | 2015-12-14 | 2 | -14/+22 |
| |/ | | | | | | | | | 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 | ||||
* / | Add Platform_getProcessEnv | Michael Klein | 2015-12-03 | 2 | -0/+30 |
|/ | | | | - currently implemented for darwin and linux | ||||
* | Cached memory calculations, take 2. | Hisham Muhammad | 2015-11-29 | 1 | -6/+2 |
| | | | | Thanks to @OmegaPhil for discussion and reviewing. | ||||
* | Account unreclaimable slab and shmem as used memory, | Hisham Muhammad | 2015-11-28 | 1 | -15/+27 |
| | | | | | | | | 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. | ||||
* | Merge pull request #298 from patrickmarlier/issue202 | Hisham Muhammad | 2015-10-26 | 1 | -5/+7 |
|\ | | | | | Fix a case where the usertime calculation can overflow (see issue #202) | ||||
| * | Fix a case where the usertime calculation can overflow (see issue #202) | Patrick Marlier | 2015-09-14 | 1 | -5/+7 |
| | | |||||
* | | Calculate CPU averages on Darwin (See #295). | Hisham Muhammad | 2015-10-23 | 1 | -8/+8 |
| | | |||||
* | | fixed broken merge, where I forgot to check linux/Platform.c so that it ↵ | Martin "eto" Misuth | 2015-10-06 | 1 | -5/+0 |
| | | | | | | | | matches upstream | ||||
* | | Added platform dependent DEFAULT_SIGNAL define, for now for: | Martin "eto" Misuth | 2015-10-06 | 1 | -2/+7 |
| | | | | | | | | | | | | FreeBSD Linux Other platforms will have it undefined for now. | ||||
* | | Move list of signals to platform-specific code. | Hisham Muhammad | 2015-10-06 | 2 | -0/+45 |
|/ | | | | | 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. | ||||
* | fix calloc() calls | Christian Hesse | 2015-09-07 | 1 | -1/+1 |
| | | | | | | | * 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) | ||||
* | Reduce scope of variables. | Hisham Muhammad | 2015-08-20 | 1 | -8/+7 |
| | |||||
* | Make column width calculation dynamic. | Hisham Muhammad | 2015-08-20 | 2 | -38/+14 |
| | | | | Closes #228. | ||||
* | Rename String to StringUtils. | David Hunt | 2015-08-19 | 2 | -2/+2 |
| | | | | | | | | | 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 | ||||
* | Merge pull request #230 from maksqwe/cstime_fix | Hisham Muhammad | 2015-08-12 | 1 | -1/+1 |
|\ | | | | | Fix sort by cstime | ||||
| * | Fix sort by cstime | Maks Naumov | 2015-07-23 | 1 | -1/+1 |
| | | |||||
* | | Fix typo in comment | peter-warhzner | 2015-08-04 | 1 | -1/+1 |
|/ | |||||
* | fix compiler warnings | Christian Hesse | 2015-05-15 | 2 | -2/+4 |
| | | | | | | | | | 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. | ||||
* | Fix compilation of OpenVZ support. | Hisham Muhammad | 2015-05-13 | 1 | -14/+15 |
| | | | | | Closes #185. Closes #190. | ||||
* | Enable OOM support unconditionally on Linux. | Hisham Muhammad | 2015-04-09 | 4 | -34/+9 |
| | | | | | Read OOM data only if column is enabled. Make sort ordering more consistent. Closes #182. | ||||
* | Fixes to use platform-specific compare routines. | Hisham Muhammad | 2015-04-09 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' into wip | Hisham Muhammad | 2015-04-02 | 3 | -8/+20 |
|\ | | | | | | | | | | | | | | | | | | | Conflicts: Process.c Process.h htop.c linux/LinuxProcess.c linux/LinuxProcess.h test_spec.lua | ||||
| * | Fixes to subclassing Process. | Hisham Muhammad | 2015-03-31 | 2 | -3/+16 |
| | | |||||
* | | Simplify constructors. | Hisham Muhammad | 2015-03-23 | 1 | -6/+1 |
| | | |||||
* | | Move FunctionBar inside Panel | Hisham Muhammad | 2015-03-23 | 2 | -3/+7 |
| | | |||||
* | | Build fixes to resync with FreeBSD changes. | Hisham Muhammad | 2015-03-16 | 4 | -17/+7 |
| | | |||||
* | | Major advances in FreeBSD port. | Hisham Muhammad | 2015-03-16 | 3 | -77/+28 |
| | | |||||
* | | Linux build fixes. | Hisham Muhammad | 2015-03-16 | 4 | -16/+7 |
| | | |||||
* | | Merge branch 'master' into wip | Hisham Muhammad | 2015-03-16 | 3 | -13/+20 |
|\| | | | | | | | | | | | | | | | | | | | | | Conflicts: Process.c Process.h linux/LinuxProcess.c linux/LinuxProcess.h linux/LinuxProcessList.c unsupported/Platform.c unsupported/Platform.h | ||||
| * | Improve reading of cgroups. | Hisham Muhammad | 2015-03-08 | 1 | -13/+18 |
| | | |||||
| * | Fix deletion of processes. Closes #172. | Hisham Muhammad | 2015-03-08 | 1 | -1/+1 |
| | | |||||
| * | Merge fixes | Hisham Muhammad | 2015-02-23 | 3 | -5/+5 |
| | | |||||
| * | Fix allocation of processes. Closes #166. | Hisham Muhammad | 2015-02-23 | 5 | -2/+27 |
| | | | | | | | | | | | | | | | | | | Conflicts: Process.c Process.h ProcessList.c ScreenManager.c linux/LinuxProcessList.c | ||||
| * | Remove bogus assertion. Closes #159. | Hisham Muhammad | 2015-01-23 | 1 | -1/+0 |
| | | |||||
* | | Get FreeBSD tree to compile again with latest changes. | Hisham Muhammad | 2015-03-16 | 2 | -11/+1 |
| | | |||||
* | | Isolate portable and Linux-specific process fields. | Hisham Muhammad | 2015-03-16 | 5 | -166/+437 |
| | | |||||
* | | Move more Linux-specific code into Linux subdir. | Hisham Muhammad | 2015-03-15 | 5 | -6/+202 |
| | | |||||
* | | Fix deletion of processes. Closes #172. | Hisham Muhammad | 2015-03-08 | 1 | -2/+2 |
| | | | | | | | | | | Conflicts: linux/LinuxProcess.c | ||||
* | | Silence warnings reported in #70. | Hisham Muhammad | 2015-02-23 | 3 | -5/+8 |
| | | |||||
* | | Fix allocation of processes. Closes #166. | Hisham Muhammad | 2015-02-20 | 5 | -2/+27 |
| | | |||||
* | | Another mega-patch for the refactoring process. | Hisham Muhammad | 2015-01-23 | 4 | -137/+198 |
| | | | | | | | | | | Kinda runs, but functionality from the original main loop is still missing. Patience. | ||||
* | | Sorry about the mega-patch. | Hisham Muhammad | 2015-01-21 | 6 | -57/+234 |
|/ | | | | | This is a work-in-progress, code is currently broken. (Some actions, and notably, the header, are missing.) | ||||
* | Fix initialization of cpuData structure. Closes #159. | Hisham Muhammad | 2015-01-19 | 1 | -1/+1 |
| |