diff options
| author | Hisham Muhammad <hisham@gobolinux.org> | 2011-11-21 02:52:41 +0000 |
|---|---|---|
| committer | Hisham Muhammad <hisham@gobolinux.org> | 2011-11-21 02:52:41 +0000 |
| commit | bc87a8ff8c5b6374a00a950cd15e1b290d6c5e06 (patch) | |
| tree | 616bbb782feaabc04d48c963ff1b4b1cfec5b267 /htop.c | |
| parent | 7ca10817122d3b7b30fabb1cadb75e5ee14b364e (diff) | |
Remove bundled hwloc-1.2.1. Use either native Linux affinity support or an external libhwloc.
(for details see https://sourceforge.net/mailarchive/forum.php?thread_name=CAJpkDYeZpwqcWxZ77wq6bMrnhn-KzkU1xAqb3cU0drfnA3n9FQ%40mail.gmail.com&forum_name=htop-general )
Diffstat (limited to 'htop.c')
| -rw-r--r-- | htop.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -123,7 +123,7 @@ static void showHelp(ProcessList* pl) { mvaddstr(15, 0, " F9 k: kill process/tagged processes P: sort by CPU%"); mvaddstr(16, 0, " ] F7: higher priority (root only) M: sort by MEM%"); mvaddstr(17, 0, " [ F8: lower priority (+ nice) T: sort by TIME"); -#ifdef HAVE_HWLOC +#if (HAVE_LIBHWLOC || HAVE_NATIVE_AFFINITY) if (pl->cpuCount > 1) mvaddstr(18, 0, " a: set CPU affinity I: invert sort order"); else @@ -144,7 +144,7 @@ static void showHelp(ProcessList* pl) { mvaddstr(16, 0, " ] F7"); mvaddstr(16,40, " M"); mvaddstr(17, 0, " [ F8"); mvaddstr(17,40, " T"); mvaddstr(18,40, " F4 I"); -#if HAVE_HWLOC +#if (HAVE_LIBHWLOC || HAVE_NATIVE_AFFINITY) if (pl->cpuCount > 1) mvaddstr(18, 0, " a:"); #endif @@ -773,7 +773,7 @@ int main(int argc, char** argv) { refreshTimeout = 0; break; } -#if (HAVE_HWLOC || HAVE_NATIVE_AFFINITY) +#if (HAVE_LIBHWLOC || HAVE_NATIVE_AFFINITY) case 'a': { if (pl->cpuCount == 1) |