refactoring structure to make it more in userver-style

Author: hzhdlrp

cmake/modules/Findboost.cmake

@@ -1,32 +1,23 @@
 project(userver-multi-index-lru CXX)
 
-find_package(Boost REQUIRED) 
-
-
-if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/src/multi_index_lru.cpp")
-    file(WRITE "${CMAKE_CURRENT_SOURCE_DIR}/src/multi_index_lru.cpp"
-        "// MultiIndex LRU header-only lib\n"
-        "// This file exists only to satisfy CMake target requirements\n"
-        "namespace userver::lru_boost_list { const char* multi_index_lru_version = \"1.0\"; }\n")
-endif()
+find_package(Boost REQUIRED)
 
 userver_module(
     multi-index-lru
     SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}"
-    UTEST_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/tests/main.cpp"
+    UTEST_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src/*_test.cpp"
+    UBENCH_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src/*_benchmark.cpp"
     DEPENDS core
 )
 
 target_include_directories(userver-multi-index-lru
-    PUBLIC ${Boost_INCLUDE_DIRS}
+    PUBLIC
+        ${Boost_INCLUDE_DIRS}
+        "${CMAKE_CURRENT_SOURCE_DIR}/tests/"
 )
 
 _userver_directory_install(
     COMPONENT multi-index-lru
     FILES "${USERVER_ROOT_DIR}/cmake/modules/Findboost.cmake"
     DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/userver/modules"
-)
-
-# if(USERVER_FEATURE_UTEST)
-    add_subdirectory(tests)
-# endif()
+)

libraries/multi_index_lru/CMakeLists.txt

@@ -6,16 +6,12 @@
 #include <boost/multi_index/hashed_index.hpp>
 #include <boost/multi_index/mem_fun.hpp>
 
-#include <list>
-#include <functional>
-#include <unordered_set>
-#include <iostream>
-
 USERVER_NAMESPACE_BEGIN
 
-namespace lru_boost_list {
+namespace multi_index_lru {
 using namespace boost::multi_index;
 
+namespace impl {
 template<typename Value>
 struct ValueWithHook
 {
@@ -62,15 +58,16 @@ struct ValueWithHook
 };
 
 struct internal_ptr_tag {};
+} // namespace impl
 
 template<
     typename Value,
     typename IndexSpecifierList,
-    typename Allocator = std::allocator<ValueWithHook<Value>>
+    typename Allocator = std::allocator<impl::ValueWithHook<Value>>
 >
 class LRUCacheContainer {
 private:
-    using CacheItem = ValueWithHook<Value>;
+    using CacheItem = impl::ValueWithHook<Value>;
     using List =  boost::intrusive::list<
                         CacheItem,
                         boost::intrusive::member_hook<
@@ -83,7 +80,7 @@ class LRUCacheContainer {
     using ExtendedIndexSpecifierList = typename boost::mpl::push_back<
         IndexSpecifierList,
         hashed_unique<
-            tag<internal_ptr_tag>,
+            tag<impl::internal_ptr_tag>,
             const_mem_fun<CacheItem, const CacheItem*, &CacheItem::GetPointerToSelf>
         >
     >::type;
@@ -187,10 +184,10 @@ class LRUCacheContainer {
         if (!usage_list.empty()) {
             CacheItem *ptr_to_erase = &*usage_list.begin();
             usage_list.erase(usage_list.begin());
-            container.template get<internal_ptr_tag>().erase(ptr_to_erase);
+            container.template get<impl::internal_ptr_tag>().erase(ptr_to_erase);
         }
     }
 };
-}
+} // namespace multi_index_lru
 
 USERVER_NAMESPACE_END

libraries/multi_index_lru/include/userver/multi_index_lru/lru_boost_list_container.h

@@ -1,4 +1,3 @@
-#include "tests/lru_basic_tests.h"
 #include "benchmarks/lru_basic_benchmarks.h"
 #include "benchmarks/lru_google_benchmarks.h"
 
@@ -8,10 +7,6 @@
 using namespace USERVER_NAMESPACE;
 
 int main() {
-    test_lru_users<lru_boost_list::LRUCacheContainer>();
-    test_lru_products<lru_boost_list::LRUCacheContainer>();
-    std::cout << "all tests success" << std::endl; 
-
     benchmarks::simple_benchmark<lru_boost_list::LRUCacheContainer>("boost_list_output.txt");
     benchmarks::google_benchmark<lru_boost_list::LRUCacheContainer>();
 

libraries/multi_index_lru/tests/main.cpp renamed to libraries/multi_index_lru/src/main_benchmark.cpp

@@ -0,0 +1,13 @@
+#include "tests/lru_basic_tests.h"
+
+// #define LRU_CONTAINER_DEBUG__
+#include <userver/multi_index_lru/lru_boost_list_container.h>
+
+using namespace USERVER_NAMESPACE;
+
+int main() {
+    test_lru_users<lru_boost_list::LRUCacheContainer>();
+    test_lru_products<lru_boost_list::LRUCacheContainer>();
+    std::cout << "all tests success" << std::endl; 
+    return 0;
+}

libraries/multi_index_lru/src/main_test.cpp

@@ -1,3 +1,3 @@
-// MultiIndex LRU header-only lib
-// This file exists only to satisfy CMake target requirements
-namespace userver::lru_boost_list { const char* multi_index_lru_version = "1.0"; }
+#include <userver/multi_index_lru/lru_boost_list_container.h>
+
+namespace userver::multi_index_lru { const char* multi_index_lru_version = "1.0"; }