Fix OSS build

Summary:
- Add magic_enum manifest & add it as a dependency to cachelib
- Fix folly exception tracer library names and add magic_enum library to cachelib_common target
- Add folly::Subprocess dependency in benchmark targets
- Fix compiler error in cachebench/binary_trace_gen.cpp
- Add in AggregateStats.cpp to cachebench CMakeLists

Reviewed By: pbhandar2

Differential Revision: D92866330

fbshipit-source-id: 855a0bbbb3380b46496971b50dfb60ae81230a60

Author: rlyerly

build/fbcode_builder/manifests/cachelib

@@ -25,6 +25,7 @@ zstd
 mvfst
 numa
 libaio
+magic_enum
 # cachelib also depends on openssl but since the latter requires a platform-
 # specific configuration we rely on the folly manifest to provide this
 # dependency to avoid duplication.

build/fbcode_builder/manifests/magic_enum

@@ -0,0 +1,14 @@
+[manifest]
+name = magic_enum
+
+[download]
+url = https://github.com/Neargye/magic_enum/releases/download/v0.9.7/magic_enum-v0.9.7.tar.gz
+sha256 = c047bc7ca0b76752168140e7ae9a4a30d72bf6530c196fdfbf5105a39d40cc46
+
+[build]
+builder = cmake
+
+[cmake.defines]
+MAGIC_ENUM_OPT_BUILD_EXAMPLES = OFF
+MAGIC_ENUM_OPT_BUILD_TESTS = OFF
+MAGIC_ENUM_OPT_INSTALL = ON

cachelib/CMakeLists.txt

@@ -122,6 +122,7 @@ find_package(Zstd REQUIRED)
 find_package(FBThrift REQUIRED) # must come after wangle
 find_package(NUMA REQUIRED)
 find_package(Sparsemap REQUIRED)
+find_package(magic_enum CONFIG REQUIRED)
 
 find_package(uring)
 if (NOT uring_FOUND)

cachelib/benchmarks/CMakeLists.txt

@@ -24,6 +24,7 @@ if (BUILD_TESTS)
     cachelib_datatype
     cachelib_allocator
     Folly::follybenchmark
+    Folly::folly_subprocess
     glog::glog
     gflags
     GTest::gtest

cachelib/cachebench/CMakeLists.txt

@@ -29,6 +29,7 @@ add_library (cachelib_cachebench
   ./runner/ProgressTracker.cpp
   ./runner/Runner.cpp
   ./runner/Stressor.cpp
+  ./util/AggregateStats.cpp
   ./util/CacheConfig.cpp
   ./util/Config.cpp
   ./util/NandWrites.cpp

cachelib/cachebench/binary_trace_gen.cpp

@@ -58,8 +58,8 @@ int main(int argc, char** argv) {
   std::cout << "Binary Trace Generator" << std::endl;
 
   try {
-    auto generator =
-        std::make_unique<KVReplayGenerator>(config.getStressorConfig());
+    auto generator = std::make_unique<KVReplayGenerator>(
+        config.getStressorConfig(/* instanceId */ 0));
   } catch (const std::exception& e) {
     std::cout << "Invalid configuration. Exception: " << e.what() << std::endl;
     return 1;

cachelib/common/CMakeLists.txt

@@ -40,12 +40,14 @@ target_link_libraries(cachelib_common PUBLIC
   Threads::Threads
   FBThrift::thriftcpp2
   FBThrift::thriftprotocol
+  FBThrift::thrift_dynamic_value
   Folly::folly
   Folly::follybenchmark
-  Folly::folly_exception_tracer
-  Folly::folly_exception_tracer_base
-  Folly::folly_exception_counter
+  Folly::folly_debugging_exception_tracer_exception_tracer
+  Folly::folly_debugging_exception_tracer_exception_tracer_base
+  Folly::folly_debugging_exception_tracer_exception_counter
   GTest::gtest
+  magic_enum::magic_enum
   ${XXHASH_LIBRARY}
 )