]> granicus.if.org Git - procps-ng/commitdiff
top: add the major version to dlopen of libnuma soname
authorJim Warner <james.warner@comcast.net>
Thu, 6 Jun 2013 05:00:00 +0000 (00:00 -0500)
committerCraig Small <csmall@enc.com.au>
Mon, 10 Jun 2013 05:43:12 +0000 (15:43 +1000)
When the plug-in approach to NUMA support was added, I
carelessly employed the compile-time linker convention
for naming the library. Technically this then required
the 'devel' package for NUMA support to be present for
the unqualified soname symlink to be available. Either
that or one must have manually created such a symlink.

This commit adds the missing major version to dlopen()
of libnuma.so.1 so simply having a more likely package
such as 'numactl' will enable both '2' & '3' commands.

References(s):
http://www.freelists.org/post/procps/top-NUMA-node-CPU-utilization-support,25
. initial dlopen support
commit edba932a7e9b950dd91bc486e107788e977a5186

Signed-off-by: Jim Warner <james.warner@comcast.net>
top/top.c

index 2b05a6015eadaab2ae5d289ec1822903a5bb4df0..0d7ee2d423aa59f2f8a0e2c0a2b817d7b60fbd8b 100644 (file)
--- a/top/top.c
+++ b/top/top.c
@@ -3246,7 +3246,7 @@ static void before (char *me) {
 #if defined(PRETEND_NUMA) || defined(PRETEND8CPUS)
    Numa_node_tot = Numa_max_node() + 1;
 #else
-   Libnuma_handle = dlopen("libnuma.so", RTLD_LAZY);
+   Libnuma_handle = dlopen("libnuma.so.1", RTLD_LAZY);
    if (Libnuma_handle) {
       Numa_max_node = dlsym(Libnuma_handle, "numa_max_node");
       Numa_node_of_cpu = dlsym(Libnuma_handle, "numa_node_of_cpu");