Merge pull request #3281 from vespa-engine/balder/give-vespamallocxx-their-old-names-back

Give the libvespamallocXXX back their old names.

12 files changed, 20 insertions, 20 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/AbstractService.java b/config-model/src/main/java/com/yahoo/vespa/model/AbstractService.java
index 6d4945f23ad..38e417aca9e 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/AbstractService.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/AbstractService.java
@@ -45,7 +45,7 @@ public abstract class AbstractService extends AbstractConfigProducer<AbstractCon
 
     /** The optional PRELOAD libraries for this Service. */
     // Please keep non-null, as passed to command line in service startup
-    private String preload = Defaults.getDefaults().underVespaHome("lib64/vespa/malloc/libvespamalloc.so");
+    private String preload = Defaults.getDefaults().underVespaHome("lib64/vespa/malloc/libvespamallocd.so");
 
     // If larger or equal to 0 it mean that explicit mmaps shall not be included in coredump.
     private long mmapNoCoreLimit = -1l;
diff --git a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
index 63d5d37598b..98f599769c0 100644
--- a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
+++ b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
@@ -110,9 +110,9 @@ public class ModelProvisioningTest {
         assertThat(model.getContainerClusters().get("mydisc").getContainers().get(0).getJvmArgs(), is(""));
         assertThat(model.getContainerClusters().get("mydisc").getContainers().get(1).getJvmArgs(), is(""));
         assertThat(model.getContainerClusters().get("mydisc").getContainers().get(2).getJvmArgs(), is(""));
-        assertThat(model.getContainerClusters().get("mydisc").getContainers().get(0).getPreLoad(), is(getDefaults().underVespaHome("lib64/vespa/malloc/libvespamalloc.so")));
-        assertThat(model.getContainerClusters().get("mydisc").getContainers().get(1).getPreLoad(), is(getDefaults().underVespaHome("lib64/vespa/malloc/libvespamalloc.so")));
-        assertThat(model.getContainerClusters().get("mydisc").getContainers().get(2).getPreLoad(), is(getDefaults().underVespaHome("lib64/vespa/malloc/libvespamalloc.so")));
+        assertThat(model.getContainerClusters().get("mydisc").getContainers().get(0).getPreLoad(), is(getDefaults().underVespaHome("lib64/vespa/malloc/libvespamallocd.so")));
+        assertThat(model.getContainerClusters().get("mydisc").getContainers().get(1).getPreLoad(), is(getDefaults().underVespaHome("lib64/vespa/malloc/libvespamallocd.so")));
+        assertThat(model.getContainerClusters().get("mydisc").getContainers().get(2).getPreLoad(), is(getDefaults().underVespaHome("lib64/vespa/malloc/libvespamallocd.so")));
         assertThat(model.getContainerClusters().get("mydisc").getMemoryPercentage(), is(Optional.empty()));
 
         assertThat(model.getContainerClusters().get("mydisc2").getContainers().get(0).getJvmArgs(), is("-verbosegc"));
diff --git a/vespamalloc/src/tests/allocfree/CMakeLists.txt b/vespamalloc/src/tests/allocfree/CMakeLists.txt
index cf0aab705a3..52c0c03d079 100644
--- a/vespamalloc/src/tests/allocfree/CMakeLists.txt
+++ b/vespamalloc/src/tests/allocfree/CMakeLists.txt
@@ -25,4 +25,4 @@ vespa_add_executable(vespamalloc_linklist_test_app
 )
 vespa_add_test(NAME vespamalloc_allocfree_shared_test_app NO_VALGRIND COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/allocfree_test.sh BENCHMARK
                DEPENDS vespamalloc_realloc_test_app vespamalloc_allocfree_shared_test_app vespamalloc_linklist_test_app
-                       vespamalloc vespamalloc_vespamallocd)
+                       vespamalloc vespamallocd)
diff --git a/vespamalloc/src/tests/allocfree/allocfree_test.sh b/vespamalloc/src/tests/allocfree/allocfree_test.sh
index d52bec12bd9..810a66f632b 100755
--- a/vespamalloc/src/tests/allocfree/allocfree_test.sh
+++ b/vespamalloc/src/tests/allocfree/allocfree_test.sh
@@ -5,7 +5,7 @@ set -e
 TIME=/usr/bin/time
 
 VESPA_MALLOC_SO=../../../src/vespamalloc/libvespamalloc.so
-VESPA_MALLOC_SO_D=../../../src/vespamalloc/libvespamalloc_vespamallocd.so
+VESPA_MALLOC_SO_D=../../../src/vespamalloc/libvespamallocd.so
 
 LD_PRELOAD=$VESPA_MALLOC_SO ./vespamalloc_realloc_test_app
 LD_PRELOAD=$VESPA_MALLOC_SO_D ./vespamalloc_realloc_test_app
diff --git a/vespamalloc/src/tests/doubledelete/CMakeLists.txt b/vespamalloc/src/tests/doubledelete/CMakeLists.txt
index c6fe46be614..2017a242d1b 100644
--- a/vespamalloc/src/tests/doubledelete/CMakeLists.txt
+++ b/vespamalloc/src/tests/doubledelete/CMakeLists.txt
@@ -11,4 +11,4 @@ vespa_add_executable(vespamalloc_expectsignal_app
 )
 vespa_add_test(NAME vespamalloc_doubledelete_test_app NO_VALGRIND COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/doubledelete_test.sh
                DEPENDS vespamalloc_doubledelete_test_app vespamalloc_expectsignal_app
-                       vespamalloc vespamalloc_vespamallocd)
+                       vespamalloc vespamallocd)
diff --git a/vespamalloc/src/tests/doubledelete/doubledelete_test.sh b/vespamalloc/src/tests/doubledelete/doubledelete_test.sh
index 7bea46f6a57..ab0b4943b11 100755
--- a/vespamalloc/src/tests/doubledelete/doubledelete_test.sh
+++ b/vespamalloc/src/tests/doubledelete/doubledelete_test.sh
@@ -5,4 +5,4 @@ set -e
 LD_PRELOAD=../../../src/vespamalloc/libvespamalloc.so ./vespamalloc_doubledelete_test_app
 
 ulimit -c 0 
-./vespamalloc_expectsignal_app 6 "LD_PRELOAD=../../../src/vespamalloc/libvespamalloc_vespamallocd.so ./vespamalloc_doubledelete_test_app"
+./vespamalloc_expectsignal_app 6 "LD_PRELOAD=../../../src/vespamalloc/libvespamallocd.so ./vespamalloc_doubledelete_test_app"
diff --git a/vespamalloc/src/tests/overwrite/CMakeLists.txt b/vespamalloc/src/tests/overwrite/CMakeLists.txt
index 5855b35ada9..29b6ac46eb4 100644
--- a/vespamalloc/src/tests/overwrite/CMakeLists.txt
+++ b/vespamalloc/src/tests/overwrite/CMakeLists.txt
@@ -12,4 +12,4 @@ vespa_add_executable(vespamalloc_expectsignal-overwrite_app
 )
 vespa_add_test(NAME vespamalloc_overwrite_test_app NO_VALGRIND COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/overwrite_test.sh
                DEPENDS vespamalloc_overwrite_test_app vespamalloc_expectsignal-overwrite_app
-                       vespamalloc vespamalloc_vespamallocd)
+                       vespamalloc vespamallocd)
diff --git a/vespamalloc/src/tests/overwrite/overwrite_test.sh b/vespamalloc/src/tests/overwrite/overwrite_test.sh
index 9d7de928a75..05b1836e94e 100755
--- a/vespamalloc/src/tests/overwrite/overwrite_test.sh
+++ b/vespamalloc/src/tests/overwrite/overwrite_test.sh
@@ -3,8 +3,8 @@
 set -e
 
 LD_PRELOAD=../../../src/vespamalloc/libvespamalloc.so ./vespamalloc_overwrite_test_app
-LD_PRELOAD=../../../src/vespamalloc/libvespamalloc_vespamallocd.so ./vespamalloc_overwrite_test_app testmemoryfill
+LD_PRELOAD=../../../src/vespamalloc/libvespamallocd.so ./vespamalloc_overwrite_test_app testmemoryfill
 ulimit -c 0; 
-./vespamalloc_expectsignal-overwrite_app 6 "LD_PRELOAD=../../../src/vespamalloc/libvespamalloc_vespamallocd.so ./vespamalloc_overwrite_test_app prewrite"
-./vespamalloc_expectsignal-overwrite_app 6 "LD_PRELOAD=../../../src/vespamalloc/libvespamalloc_vespamallocd.so ./vespamalloc_overwrite_test_app postwrite"
-./vespamalloc_expectsignal-overwrite_app 6 "LD_PRELOAD=../../../src/vespamalloc/libvespamalloc_vespamallocd.so ./vespamalloc_overwrite_test_app writeafterfree"
+./vespamalloc_expectsignal-overwrite_app 6 "LD_PRELOAD=../../../src/vespamalloc/libvespamallocd.so ./vespamalloc_overwrite_test_app prewrite"
+./vespamalloc_expectsignal-overwrite_app 6 "LD_PRELOAD=../../../src/vespamalloc/libvespamallocd.so ./vespamalloc_overwrite_test_app postwrite"
+./vespamalloc_expectsignal-overwrite_app 6 "LD_PRELOAD=../../../src/vespamalloc/libvespamallocd.so ./vespamalloc_overwrite_test_app writeafterfree"
diff --git a/vespamalloc/src/tests/stacktrace/CMakeLists.txt b/vespamalloc/src/tests/stacktrace/CMakeLists.txt
index 1259f52c326..491b0d4089e 100644
--- a/vespamalloc/src/tests/stacktrace/CMakeLists.txt
+++ b/vespamalloc/src/tests/stacktrace/CMakeLists.txt
@@ -8,5 +8,5 @@ vespa_add_executable(vespamalloc_stacktrace_test_app TEST
 vespa_add_test(
     NAME vespamalloc_stacktrace_test_app
     NO_VALGRIND COMMAND vespamalloc_stacktrace_test_app
-    ENVIRONMENT "LD_PRELOAD=${CMAKE_CURRENT_BINARY_DIR}/../../vespamalloc/libvespamalloc_vespamallocdst16.so"
+    ENVIRONMENT "LD_PRELOAD=${CMAKE_CURRENT_BINARY_DIR}/../../vespamalloc/libvespamallocdst16.so"
     NO_VALGRIND)
diff --git a/vespamalloc/src/tests/thread/CMakeLists.txt b/vespamalloc/src/tests/thread/CMakeLists.txt
index 2be281a6bd0..53d61f4aa76 100644
--- a/vespamalloc/src/tests/thread/CMakeLists.txt
+++ b/vespamalloc/src/tests/thread/CMakeLists.txt
@@ -9,4 +9,4 @@ vespa_add_executable(vespamalloc_racemanythreads_test_app
 )
 vespa_add_test(NAME vespamalloc_thread_test_app NO_VALGRIND COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/thread_test.sh
                DEPENDS vespamalloc_thread_test_app vespamalloc_racemanythreads_test_app
-                       vespamalloc vespamalloc_vespamallocd)
+                       vespamalloc vespamallocd)
diff --git a/vespamalloc/src/tests/thread/thread_test.sh b/vespamalloc/src/tests/thread/thread_test.sh
index 8b3d94e922d..b06c27e4a17 100755
--- a/vespamalloc/src/tests/thread/thread_test.sh
+++ b/vespamalloc/src/tests/thread/thread_test.sh
@@ -15,7 +15,7 @@ else
 fi
 
 VESPA_MALLOC_SO=../../../src/vespamalloc/libvespamalloc.so
-VESPA_MALLOC_SO_D=../../../src/vespamalloc/libvespamalloc_vespamallocd.so
+VESPA_MALLOC_SO_D=../../../src/vespamalloc/libvespamallocd.so
 
 LD_PRELOAD=$VESPA_MALLOC_SO ./vespamalloc_thread_test_app return 20
 LD_PRELOAD=$VESPA_MALLOC_SO ./vespamalloc_thread_test_app exit 20
diff --git a/vespamalloc/src/vespamalloc/CMakeLists.txt b/vespamalloc/src/vespamalloc/CMakeLists.txt
index b065df672dd..d43d779217d 100644
--- a/vespamalloc/src/vespamalloc/CMakeLists.txt
+++ b/vespamalloc/src/vespamalloc/CMakeLists.txt
@@ -7,7 +7,7 @@ vespa_add_library(vespamalloc
     DEPENDS
     dl
 )
-vespa_add_library(vespamalloc_vespamallocd
+vespa_add_library(vespamallocd
     SOURCES
     $<TARGET_OBJECTS:vespamalloc_mallocd>
     $<TARGET_OBJECTS:vespamalloc_util>
@@ -15,7 +15,7 @@ vespa_add_library(vespamalloc_vespamallocd
     DEPENDS
     dl
 )
-vespa_add_library(vespamalloc_vespamallocdst16
+vespa_add_library(vespamallocdst16
     SOURCES
     $<TARGET_OBJECTS:vespamalloc_mallocdst16>
     $<TARGET_OBJECTS:vespamalloc_util>
@@ -23,7 +23,7 @@ vespa_add_library(vespamalloc_vespamallocdst16
     DEPENDS
     dl
 )
-vespa_add_library(vespamalloc_vespamallocdst16_nl
+vespa_add_library(vespamallocdst16_nl
     SOURCES
     $<TARGET_OBJECTS:vespamalloc_mallocdst16_nl>
     $<TARGET_OBJECTS:vespamalloc_util>
@@ -31,7 +31,7 @@ vespa_add_library(vespamalloc_vespamallocdst16_nl
     DEPENDS
     dl
 )
-vespa_add_library(vespamalloc_vespammap
+vespa_add_library(vespammap
     SOURCES
     $<TARGET_OBJECTS:vespamalloc_mmap>
     INSTALL lib64/vespa/malloc