diff --git a/docs/installation/source.en.md b/docs/installation/source.en.md index 41823af8..fa7d609a 100644 --- a/docs/installation/source.en.md +++ b/docs/installation/source.en.md @@ -16,8 +16,7 @@ designated initializers support from C++20 - CMake - jerasure headers and libraries -- ISA-L, libibverbs and librdmacm headers and libraries (optional) -- tcmalloc (google-perftools-dev) +- ISA-L, libibverbs, librdmacm, libnl3 headers and libraries (optional) ## Basic instructions diff --git a/docs/installation/source.ru.md b/docs/installation/source.ru.md index 13493758..e41c4085 100644 --- a/docs/installation/source.ru.md +++ b/docs/installation/source.ru.md @@ -16,8 +16,7 @@ назначенных инициализаторов (designated initializers) из C++20 - CMake - Заголовки и библиотеки jerasure -- Опционально - заголовки и библиотеки ISA-L, libibverbs, librdmacm -- tcmalloc (google-perftools-dev) +- Опционально - заголовки и библиотеки ISA-L, libibverbs, librdmacm, libnl3 ## Базовая инструкция diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt index c7dcd06a..d08d4bc0 100644 --- a/src/client/CMakeLists.txt +++ b/src/client/CMakeLists.txt @@ -52,9 +52,6 @@ if (${WITH_FIO}) ../util/rw_blocking.cpp ../util/addr_util.cpp ) - target_link_libraries(fio_vitastor_sec - tcmalloc_minimal - ) endif (${WITH_FIO}) # vitastor-nbd diff --git a/src/disk_tool/CMakeLists.txt b/src/disk_tool/CMakeLists.txt index 0e11f91b..093bd55a 100644 --- a/src/disk_tool/CMakeLists.txt +++ b/src/disk_tool/CMakeLists.txt @@ -11,7 +11,6 @@ add_executable(vitastor-disk ../blockstore/blockstore_disk.cpp ../blockstore/blockstore_heap.cpp ../blockstore/multilist.cpp ) target_link_libraries(vitastor-disk - tcmalloc_minimal ${LIBURING_LIBRARIES} ${ISAL_LIBRARIES} ) diff --git a/src/osd/CMakeLists.txt b/src/osd/CMakeLists.txt index d6714f8f..b4596771 100644 --- a/src/osd/CMakeLists.txt +++ b/src/osd/CMakeLists.txt @@ -19,20 +19,19 @@ target_link_libraries(vitastor-osd # osd_rmw_test add_executable(osd_rmw_test EXCLUDE_FROM_ALL osd_rmw_test.cpp ../util/allocator.cpp) -target_link_libraries(osd_rmw_test Jerasure ${ISAL_LIBRARIES} tcmalloc_minimal) +target_link_libraries(osd_rmw_test Jerasure ${ISAL_LIBRARIES}) add_dependencies(build_tests osd_rmw_test) add_test(NAME osd_rmw_test COMMAND osd_rmw_test) if (ISAL_LIBRARIES) add_executable(osd_rmw_test_je EXCLUDE_FROM_ALL osd_rmw_test.cpp ../util/allocator.cpp) target_compile_definitions(osd_rmw_test_je PUBLIC -DNO_ISAL) - target_link_libraries(osd_rmw_test_je Jerasure tcmalloc_minimal) + target_link_libraries(osd_rmw_test_je Jerasure) add_dependencies(build_tests osd_rmw_test_je) add_test(NAME osd_rmw_test_jerasure COMMAND osd_rmw_test_je) endif (ISAL_LIBRARIES) # osd_peering_pg_test add_executable(osd_peering_pg_test EXCLUDE_FROM_ALL osd_peering_pg_test.cpp osd_peering_pg.cpp) -target_link_libraries(osd_peering_pg_test tcmalloc_minimal) add_dependencies(build_tests osd_peering_pg_test) add_test(NAME osd_peering_pg_test COMMAND osd_peering_pg_test) diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt index 0c4eb630..6d9765f6 100644 --- a/src/test/CMakeLists.txt +++ b/src/test/CMakeLists.txt @@ -6,11 +6,8 @@ project(vitastor) # stub_osd, stub_bench, osd_test add_executable(stub_osd stub_osd.cpp ../util/rw_blocking.cpp ../util/addr_util.cpp) -target_link_libraries(stub_osd tcmalloc_minimal) add_executable(stub_bench stub_bench.cpp ../util/rw_blocking.cpp ../util/addr_util.cpp) -target_link_libraries(stub_bench tcmalloc_minimal) add_executable(osd_test osd_test.cpp ../util/rw_blocking.cpp ../util/addr_util.cpp) -target_link_libraries(osd_test tcmalloc_minimal) # bindiff add_executable(bindiff @@ -26,7 +23,6 @@ target_link_libraries(stub_uring_osd ${LIBURING_LIBRARIES} ${IBVERBS_LIBRARIES} ${RDMACM_LIBRARIES} - tcmalloc_minimal ) # test_allocator