Build the mcrouter extension

mszabo-wikia · mszabo-wikia · commit 539ffa81ce96 · 2025-06-18T04:01:51.000+02:00
diff --git a/CMake/HPHPFindLibs.cmake b/CMake/HPHPFindLibs.cmake
@@ -291,6 +291,9 @@ if (PAM_INCLUDE_PATH)
   include_directories(${PAM_INCLUDE_PATH})
 endif()
 
+# Needed by fbthrift.
+find_package(Xxhash REQUIRED)
+
 include_directories(${HPHP_HOME}/hphp)
 
 macro(hphp_link target)
@@ -386,6 +389,8 @@ macro(hphp_link target)
 
   target_link_libraries(${target} ${VISIBILITY} ${LBER_LIBRARIES})
 
+  target_link_libraries(${target} ${VISIBILITY} ${Xxhash_LIBRARY})
+
   if (CRYPT_LIB)
     target_link_libraries(${target} ${VISIBILITY} ${CRYPT_LIB})
   endif()
diff --git a/CMake/Options.cmake b/CMake/Options.cmake
@@ -28,14 +28,7 @@ option(ENABLE_COTIRE "Speed up the build by precompiling headers" OFF)
 
 include(CheckCXXSymbolExists)
 
-# Mcrouter uses Folly's AtomicSharedPtr, which only supports libstdc++
-# See https://github.com/facebook/hhvm/blob/156a77d5a301033200601ddefb4dcaf26eb1ff9c/third-party/folly/src/folly/concurrency/detail/AtomicSharedPtr-detail.h#L28-L34
-check_cxx_symbol_exists(__GLIBCXX__ cstdlib DEFAULT_STDLIB_IS_LIBSTDCXX)
-if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND CLANG_FORCE_LIBSTDCXX OR DEFAULT_STDLIB_IS_LIBSTDCXX)
-  option(ENABLE_MCROUTER "Build the mcrouter library and extension" ON)
-else()
-  option(ENABLE_MCROUTER "Build the mcrouter library and extension" OFF)
-endif()
+option(ENABLE_MCROUTER "Build the mcrouter library and extension" OFF)
 
 option(ENABLE_PROXYGEN_SERVER "Build the Proxygen HTTP server" ON)
 
diff --git a/ci/ubuntu-24.04-noble/debian/rules b/ci/ubuntu-24.04-noble/debian/rules
@@ -18,7 +18,7 @@ override_dh_auto_configure:
 	-DFORCE_BUNDLED_LZ4=Off \
 	-DENABLE_XED=On \
 	-DENABLE_EXTENSION_MCRYPT=Off \
-	-DENABLE_MCROUTER=Off \
+	-DENABLE_MCROUTER=On \
 	-DENABLE_EXTENSION_IMAGICK=Off
 
 override_dh_auto_build:
diff --git a/hphp/runtime/ext/mcrouter/config.cmake b/hphp/runtime/ext/mcrouter/config.cmake
@@ -1,4 +1,4 @@
-option(ENABLE_EXTENSION_MCROUTER "Build the imap extension" ${ENABLE_MCROUTER})
+option(ENABLE_EXTENSION_MCROUTER "Build the mcrouter extension" ${ENABLE_MCROUTER})
 
 HHVM_DEFINE_EXTENSION("mcrouter"
   SOURCES
diff --git a/third-party/mcrouter/CMakeLists.txt b/third-party/mcrouter/CMakeLists.txt
@@ -41,6 +41,7 @@ ExternalProject_Add(
     -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
     -DCMAKE_INSTALL_INCLUDEDIR=include
     -DCMAKE_INSTALL_LIBDIR=lib
+    -DCMAKE_MODULE_PATH=${CMAKE_SOURCE_DIR}/build/fbcode_builder/CMake
 
     -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
     -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
@@ -61,6 +62,7 @@ ExternalProject_Add(
     "-Dfizz_DIR=${FIZZ_INSTALL_DIR}/lib/cmake/fizz"
     "-DFBThrift_DIR=${THRIFT_INSTALL_DIR}/lib/cmake/fbthrift"
     "-Dwangle_DIR=${WANGLE_INSTALL_DIR}/lib/cmake/wangle"
+    "-Dmvfst_DIR=${MVFST_INSTALL_DIR}/lib/cmake/mvfst"
   DEPENDS ${MCROUTER_DEPS} ragel
   EXCLUDE_FROM_ALL
 )
@@ -76,10 +78,26 @@ target_include_directories(
   "${BINARY_DIR}"
   "${BINARY_DIR}/thrift-gen/src"
 )
+
+list(APPEND MCROUTER_INSTALL_TARGETS
+  mcrouter
+  mcrouter_memcache_service_thrift
+  mcrouter_memcache_thrift
+  mcrouter_common_thrift
+  mcrouter_carbon_result_thrift
+  mcrouter_carbon_thrift
+)
+
+foreach(target ${MCROUTER_INSTALL_TARGETS})
+  target_link_libraries(
+    mcrouter
+    INTERFACE
+    "${INSTALL_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}${target}${CMAKE_STATIC_LIBRARY_SUFFIX}"
+  )
+endforeach()
+
 target_link_libraries(
   mcrouter
   INTERFACE
-  "${INSTALL_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}mcrouter${CMAKE_STATIC_LIBRARY_SUFFIX}"
-  "${INSTALL_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}mcrouter_thrift_lib${CMAKE_STATIC_LIBRARY_SUFFIX}"
   mcrouter_deps
 )
diff --git a/third-party/mcrouter/mcrouter-CMakeLists.txt b/third-party/mcrouter/mcrouter-CMakeLists.txt
@@ -1,11 +1,10 @@
 cmake_minimum_required(VERSION 3.10)
 project(watchman CXX C)
 include(GNUInstallDirs)
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
-
 set(C_SOURCES)
 
 # TODO when Ubuntu 18.04 support is dropped:
@@ -102,12 +101,69 @@ find_package(wangle REQUIRED)
 
 find_path(JEMALLOC_INCLUDE_DIR NAMES jemalloc/jemalloc.h REQUIRED)
 
-include(mcrouter-thrift-codegen.cmake)
+include(FBThriftCppLibrary)
+set(THRIFT_OPTIONS stack_arguments sync_methods_return_try
+                   deprecated_terse_writes)
+
+add_fbthrift_cpp_library(mcrouter_carbon_result_thrift mcrouter/lib/carbon/carbon_result.thrift OPTIONS ${THRIFT_OPTIONS})
+add_fbthrift_cpp_library(mcrouter_carbon_thrift mcrouter/lib/carbon/carbon.thrift OPTIONS ${THRIFT_OPTIONS})
+add_fbthrift_cpp_library(mcrouter_common_thrift mcrouter/lib/network/gen/Common.thrift
+    OPTIONS ${THRIFT_OPTIONS}
+    DEPENDS
+        mcrouter_carbon_thrift
+        mcrouter_carbon_result_thrift
+)
+add_fbthrift_cpp_library(mcrouter_memcache_thrift mcrouter/lib/network/gen/Memcache.thrift
+    OPTIONS ${THRIFT_OPTIONS}
+    DEPENDS
+        mcrouter_carbon_thrift
+        mcrouter_carbon_result_thrift
+        mcrouter_common_thrift
+)
+add_fbthrift_cpp_library(mcrouter_memcache_service_thrift mcrouter/lib/network/gen/MemcacheService.thrift
+    OPTIONS ${THRIFT_OPTIONS}
+    DEPENDS
+        mcrouter_common_thrift
+        mcrouter_memcache_thrift
+    SERVICES
+        Memcache
+)
 
-target_link_libraries(mcrouter mcrouter_thrift_lib Folly::folly boost fizz fmt)
+target_link_libraries(
+    mcrouter
+    mcrouter_carbon_result_thrift
+    mcrouter_carbon_thrift
+    mcrouter_common_thrift
+    mcrouter_memcache_thrift
+    mcrouter_memcache_service_thrift
+    Folly::folly
+    boost
+    fizz
+    fmt
+    FBThrift::thriftcpp2
+    FBThrift::async
+    FBThrift::serverdbginfo
+    FBThrift::transport
+    FBThrift::thriftanyrep
+    FBThrift::thrifttype
+    FBThrift::thrifttyperep
+    FBThrift::thriftprotocol
+    FBThrift::rpcmetadata
+    FBThrift::thriftannotation
+    FBThrift::thriftmetadata
+    FBThrift::concurrency
+    FBThrift::runtime
+    FBThrift::thrift-core
+)
 target_include_directories(mcrouter PUBLIC "${CMAKE_CURRENT_BINARY_DIR}" "${JEMALLOC_INCLUDE_DIR}")
 
 install(
-  TARGETS mcrouter
+  TARGETS
+    mcrouter
+    mcrouter_carbon_result_thrift
+    mcrouter_carbon_thrift
+    mcrouter_common_thrift
+    mcrouter_memcache_thrift
+    mcrouter_memcache_service_thrift
   LIBRARY ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}
 )
diff --git a/third-party/mcrouter/mcrouter-thrift-codegen.cmake b/third-party/mcrouter/mcrouter-thrift-codegen.cmake
diff --git a/third-party/mcrouter/src/CMakeLists.txt b/third-party/mcrouter/src/CMakeLists.txt
@@ -0,0 +1 @@
+/home/catullus/data/hhvm/third-party/mcrouter/mcrouter-CMakeLists.txt
diff --git a/third-party/mcrouter/src/mcrouter-thrift-codegen.cmake b/third-party/mcrouter/src/mcrouter-thrift-codegen.cmake
@@ -0,0 +1 @@
+/home/catullus/data/hhvm/third-party/mcrouter/mcrouter-thrift-codegen.cmake
diff --git a/third-party/thrift/CMakeLists.txt b/third-party/thrift/CMakeLists.txt
@@ -84,50 +84,26 @@ target_include_directories(thrift INTERFACE "${INSTALL_DIR}/include")
 target_link_libraries(thrift INTERFACE ${THRIFT_DEPS} ${OPENSSL_LIBRARIES})
 set(THRIFT_INSTALL_DIR "${INSTALL_DIR}" PARENT_SCOPE)
 
-# ----- Export a single 'thrift' library target -----
-
-# Usage: thrift_lib NAME [DEP1 [DEP2...]]
-macro(thrift_lib NAME)
-  set(DEPENDENCIES)
-  foreach(DEP ${ARGN})
-    list(APPEND DEPENDENCIES "thrift_lib_${DEP}")
-  endforeach()
-  add_library("thrift_lib_${NAME}" STATIC IMPORTED)
-  set_target_properties(
-    "thrift_lib_${NAME}"
-    PROPERTIES
-    IMPORTED_LOCATION
-    "${INSTALL_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}${NAME}${CMAKE_STATIC_LIBRARY_SUFFIX}"
-  )
-
-  if(DEPENDENCIES)
-    # On newer versions of CMake, we can use `target_link_libraries()`, but this isn't supported
-    # on `IMPORTED` targets in the oldest versions we currently support.
-    set_target_properties(
-      "thrift_lib_${NAME}"
-      PROPERTIES
-      INTERFACE_LINK_LIBRARIES
-      "${DEPENDENCIES}"
-    )
-  endif()
-
-  target_link_libraries(thrift INTERFACE "thrift_lib_${NAME}")
-endmacro()
-
-thrift_lib(concurrency)
-thrift_lib(rpcmetadata)
-thrift_lib(thrift-core)
-thrift_lib(thriftmetadata)
-thrift_lib(thriftannotation)
-thrift_lib(thrifttype)
-thrift_lib(thrifttyperep thriftannotation)
-thrift_lib(thriftanyrep thriftannotation thrifttype)
+list(APPEND THRIFT_INSTALL_TARGETS
+  thriftcpp2
+  async
+  serverdbginfo
+  transport
+  thriftanyrep
+  thrifttype
+  thrifttyperep
+  thriftprotocol
+  rpcmetadata
+  thriftannotation
+  thriftmetadata
+  concurrency
+  runtime
+  thrift-core
+)
 
-thrift_lib(transport concurrency thrift-core rpcmetadata)
-thrift_lib(async concurrency transport)
-thrift_lib(thriftprotocol thrift-core)
-thrift_lib(thriftfrozen2 thriftmetadata thriftprotocol)
-thrift_lib(thriftcpp2 rpcmetadata thriftmetadata thriftannotation thriftanyrep thrifttyperep thriftfrozen2 thriftprotocol transport async)
+foreach (target ${THRIFT_INSTALL_TARGETS})
+  target_link_libraries(thrift INTERFACE "${INSTALL_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}${target}${CMAKE_STATIC_LIBRARY_SUFFIX}")
+endforeach()
 
 # ----- Export the thrift compiler as a target -----
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-option(ENABLE_EXTENSION_MCROUTER "Build the imap extension" ${ENABLE_MCROUTER})`
	`1`	`+option(ENABLE_EXTENSION_MCROUTER "Build the mcrouter extension" ${ENABLE_MCROUTER})`
`2`	`2`
`3`	`3`	`HHVM_DEFINE_EXTENSION("mcrouter"`
`4`	`4`	`SOURCES`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+/home/catullus/data/hhvm/third-party/mcrouter/mcrouter-CMakeLists.txt`