From e7a5b4263ef54596d37a5b48a89a3079660bb7ba Mon Sep 17 00:00:00 2001
From: Winchell <cw20050111@gmail.com>
Date: Wed, 12 Aug 2026 18:01:41 +0800
Subject: [PATCH 01/16] fix: address review comments on naming, IOBuf sizing
 and UMDK pinning

- Rename ack_bit_is_rdma_ok to ack_bit_is_urma_ok.
- Replace hard-coded IOBuf block header size with sizeof(butil::IOBuf::Block).
- Pin UMDK dependency to a specific commit instead of a mutable tag.
---
 MODULE.bazel                    | 2 +-
 WORKSPACE                       | 2 +-
 src/brpc/urma/urma_endpoint.cpp | 2 +-
 src/brpc/urma/urma_helper.cpp   | 3 +--
 test/brpc_urma_unittest.cpp     | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/MODULE.bazel b/MODULE.bazel
index 657b7ceb43..391b8c2784 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -61,5 +61,5 @@ git_repository(
     name = 'umdk',
     build_file = '//bazel/third_party/umdk:umdk.BUILD',
     remote = 'https://atomgit.com/openeuler/umdk.git',
-    tag = 'v26.06.0_CAM',
+    commit = '564ee727a55523d4351a8fb3c94292b388ebb924',  # v26.06.0_CAM
 )
diff --git a/WORKSPACE b/WORKSPACE
index b197d666f6..22fc411b32 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -283,7 +283,7 @@ git_repository(
     name = "umdk",
     build_file = "//bazel/third_party/umdk:umdk.BUILD",
     remote = "https://atomgit.com/openeuler/umdk.git",
-    tag = "v26.06.0_CAM",
+    commit = "564ee727a55523d4351a8fb3c94292b388ebb924",  # v26.06.0_CAM
 )
 
 # Header-only JSON library used by iobuf_unittest's IOBuf<->std::iostream
diff --git a/src/brpc/urma/urma_endpoint.cpp b/src/brpc/urma/urma_endpoint.cpp
index bb8914d7d2..78aa225989 100644
--- a/src/brpc/urma/urma_endpoint.cpp
+++ b/src/brpc/urma/urma_endpoint.cpp
@@ -72,7 +72,7 @@ DECLARE_bool(urma_poller_yield);
 static const int WAIT_TIMEOUT_MS = 50;
 static const size_t HELLO_ACK_LEN = 4;
 static const uint32_t HELLO_ACK_URMA_OK = 0x1;
-static const size_t IOBUF_BLOCK_HEADER_LEN = 32;  // matches butil IOBuf
+static const size_t IOBUF_BLOCK_HEADER_LEN = sizeof(butil::IOBuf::Block);
 
 // ---- Globals: prepared jetty pool + poller groups ----
 struct PreparedJetty {
diff --git a/src/brpc/urma/urma_helper.cpp b/src/brpc/urma/urma_helper.cpp
index ceeeae9a1b..648316f1ae 100644
--- a/src/brpc/urma/urma_helper.cpp
+++ b/src/brpc/urma/urma_helper.cpp
@@ -100,7 +100,6 @@ DEFINE_bool(urma_poller_yield, false,
             "Yield (bthread_yield) in the busy poll loop to let other "
             "bthreads run");
 
-constexpr size_t kIOBufBlockHeaderLen = 32;
 
 // Set to true to skip real URMA hardware initialization (unit tests). When
 // true, GlobalUrmaInitializeOrDie() returns without touching liburma and the
@@ -581,7 +580,7 @@ static bool GlobalUrmaInitializeImpl() {
     }
     g_recv_block_size =
         static_cast<size_t>(FLAGS_urma_buffer_size) -
-        kIOBufBlockHeaderLen;
+        sizeof(butil::IOBuf::Block);
 
     // User-segment table.
     g_user_segs_lock = new (std::nothrow) butil::Mutex;
diff --git a/test/brpc_urma_unittest.cpp b/test/brpc_urma_unittest.cpp
index de3ce31228..d05784d009 100644
--- a/test/brpc_urma_unittest.cpp
+++ b/test/brpc_urma_unittest.cpp
@@ -198,7 +198,7 @@ TEST(UrmaHandshakeTest, client_handshake_factory_respects_flag) {
 // ---------------------------------------------------------------------------
 // 4-byte ACK: HELLO_ACK_URMA_OK bit.
 // ---------------------------------------------------------------------------
-TEST(UrmaHandshakeTest, ack_bit_is_rdma_ok) {
+TEST(UrmaHandshakeTest, ack_bit_is_urma_ok) {
     // The ACK is a 4-byte big-endian flags word; bit 0 means "I want URMA".
     // Verify the round-trip: host -> net -> host preserves the bit.
     uint32_t flags = 0x1;  // HELLO_ACK_URMA_OK

From e548bdd21385b843a5bd44c68dc251233704bf0b Mon Sep 17 00:00:00 2001
From: Winchell <cw20050111@gmail.com>
Date: Fri, 14 Aug 2026 16:24:16 +0800
Subject: [PATCH 02/16] docs(urma): add Bazel build section and document its
 limitations

Reviewer noted docs/cn/urma.md only covered the CMake build and that
DOWNLOAD_URMA_HEADERS has no Bazel equivalent. Document the Bazel
build command and clarify that Bazel always fetches UMDK headers from
the pinned git_repository commit and always links the mock backend
(no real-liburma detection yet), and that urma_performance has no
Bazel target.
---
 docs/cn/urma.md | 15 +++++++++++++++
 docs/en/urma.md | 17 +++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/docs/cn/urma.md b/docs/cn/urma.md
index a9be634ec7..2c31b0d9a3 100644
--- a/docs/cn/urma.md
+++ b/docs/cn/urma.md
@@ -36,6 +36,21 @@ UMDK，可通过 `DOWNLOAD_URMA_HEADERS=OFF` 禁止下载。找到 `liburma` 时
 真实硬件数据通路，否则链接 brpc 的 mock，使 URMA 代码和测试仍可在无硬件
 环境编译。
 
+### Bazel 编译
+
+```bash
+# 带 URMA 支持编译 brpc
+bazel build --define=BRPC_WITH_URMA=true //:brpc
+```
+
+Bazel 下的 URMA 头文件来自 `WORKSPACE` / `MODULE.bazel` 中固定 commit 的
+`umdk` `git_repository`，没有 CMake `DOWNLOAD_URMA_HEADERS` 那样的开关：
+既不能改用系统已安装的 SDK 头文件，也无法禁止下载。此外 Bazel 构建目前
+未提供检测/链接真实 `liburma` 的逻辑，`src/brpc/urma/mock_urma.cpp` 会
+无条件编入，因此 Bazel 构建的 URMA 始终使用 mock 数据通路；如需链接真实
+硬件，请使用 CMake 或 Make 构建。`urma_performance` 示例目前也只有
+CMake/Make 构建脚本，尚无对应的 Bazel target。
+
 ## 使用
 
 通过在 channel / server 上设置 `socket_mode` 选择传输层：
diff --git a/docs/en/urma.md b/docs/en/urma.md
index 964f648bd2..ee38eb6359 100644
--- a/docs/en/urma.md
+++ b/docs/en/urma.md
@@ -38,6 +38,23 @@ When `liburma` is found it is linked for the hardware data path. Otherwise,
 brpc uses its link-time mock so URMA code and tests can still be built without
 hardware.
 
+### Build with Bazel
+
+```bash
+# Build brpc with URMA support
+bazel build --define=BRPC_WITH_URMA=true //:brpc
+```
+
+Bazel fetches the UMDK headers from the `umdk` `git_repository` pinned to a
+fixed commit in `WORKSPACE` / `MODULE.bazel`. There is no Bazel equivalent of
+CMake's `DOWNLOAD_URMA_HEADERS`: Bazel can neither use a locally installed SDK
+nor disable the download. Bazel builds also have no detection/linking logic
+for a real `liburma` yet — `src/brpc/urma/mock_urma.cpp` is compiled in
+unconditionally, so a Bazel build of URMA always uses the mock data path. Use
+CMake or Make to link against real hardware. The `urma_performance` example
+currently only has CMake/Make build files; there is no Bazel target for it
+yet.
+
 ## Usage
 
 Select the transport by setting `socket_mode` on the channel / server:

From 0fb5d79ffdd4799d21d955e4971f03c2e9a0387d Mon Sep 17 00:00:00 2001
From: Winchell <cw20050111@gmail.com>
Date: Fri, 14 Aug 2026 16:45:57 +0800
Subject: [PATCH 03/16] fix(bazel): add missing package marker for umdk
 third-party build file

bazel/third_party/umdk only contained umdk.BUILD, unlike every other
bazel/third_party/<dep> directory which pairs its <dep>.BUILD with an
empty BUILD.bazel marking the directory as a package. Without it,
resolving the git_repository(build_file = "//bazel/third_party/umdk:umdk.BUILD")
label fails once the umdk repo is actually fetched:

  Error in read: Unable to load package for //bazel/third_party/umdk:umdk.BUILD:
  BUILD file not found ...

This broke `bazel build --define=BRPC_WITH_URMA=true //:brpc` on both
x86_64 and arm64 (confirmed via GitHub Actions CI on ubuntu-22.04 and
ubuntu-24.04-arm).
---
 bazel/third_party/umdk/BUILD.bazel | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 bazel/third_party/umdk/BUILD.bazel

diff --git a/bazel/third_party/umdk/BUILD.bazel b/bazel/third_party/umdk/BUILD.bazel
new file mode 100644
index 0000000000..fefa6c3fea
--- /dev/null
+++ b/bazel/third_party/umdk/BUILD.bazel
@@ -0,0 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# Thie empty BUILD.bazel file is required to make Bazel treat
+# this directory as a package.

From 1cc8848405541b9772b22e9f12b79dfa39222591 Mon Sep 17 00:00:00 2001
From: Winchell <cw20050111@gmail.com>
Date: Fri, 14 Aug 2026 17:04:32 +0800
Subject: [PATCH 04/16] fix(bazel): strip upstream src/urma/BUILD.bazel so umdk
 headers glob works

The umdk repo ships its own src/urma/BUILD.bazel, which makes Bazel
treat src/urma/ as a separate package. glob() in our umdk.BUILD
(rooted at the umdk repo root) can't cross that boundary, so
hdrs = glob(["src/urma/lib/urma/**/include/*.h"]) silently resolved to
an empty list. The cc_library then exported no header inputs, so
compiling anything that #includes urma_api.h failed with "No such
file or directory" even though the -isystem path was correct and the
file existed on disk.

Confirmed via GitHub Actions on both ubuntu-22.04 (x86_64) and
ubuntu-24.04-arm (arm64): `bazel build --define=BRPC_WITH_URMA=true //:brpc`
failed identically on both before this patch_cmds fix.
---
 MODULE.bazel | 8 ++++++++
 WORKSPACE    | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/MODULE.bazel b/MODULE.bazel
index 391b8c2784..21a0684422 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -62,4 +62,12 @@ git_repository(
     build_file = '//bazel/third_party/umdk:umdk.BUILD',
     remote = 'https://atomgit.com/openeuler/umdk.git',
     commit = '564ee727a55523d4351a8fb3c94292b388ebb924',  # v26.06.0_CAM
+    # umdk ships its own src/urma/BUILD.bazel, which turns src/urma into a
+    # separate Bazel package and silently empties the glob() in umdk.BUILD
+    # (glob cannot cross package boundaries). Drop it so the headers under
+    # src/urma/lib/urma/**/include stay part of this repository's root
+    # package.
+    patch_cmds = [
+        'rm -f src/urma/BUILD.bazel',
+    ],
 )
diff --git a/WORKSPACE b/WORKSPACE
index 22fc411b32..fcb1e97533 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -284,6 +284,14 @@ git_repository(
     build_file = "//bazel/third_party/umdk:umdk.BUILD",
     remote = "https://atomgit.com/openeuler/umdk.git",
     commit = "564ee727a55523d4351a8fb3c94292b388ebb924",  # v26.06.0_CAM
+    # umdk ships its own src/urma/BUILD.bazel, which turns src/urma into a
+    # separate Bazel package and silently empties the glob() in umdk.BUILD
+    # (glob cannot cross package boundaries). Drop it so the headers under
+    # src/urma/lib/urma/**/include stay part of this repository's root
+    # package.
+    patch_cmds = [
+        "rm -f src/urma/BUILD.bazel",
+    ],
 )
 
 # Header-only JSON library used by iobuf_unittest's IOBuf<->std::iostream

From ddc3c0993851331da00ab6fd739495ab995f303e Mon Sep 17 00:00:00 2001
From: Winchell <cw20050111@gmail.com>
Date: Mon, 17 Aug 2026 15:04:08 +0800
Subject: [PATCH 05/16] fix(urma): require explicit opt-in for the URMA
 link-time mock

Reviewer dwh110 pointed out that src/brpc/urma/mock_urma.cpp had no
independent feature switch: whenever liburma wasn't found, CMake/Make
silently linked the mock, which can produce a binary that looks
URMA-capable but can't reach real hardware.

Add WITH_URMA_MOCK (CMake) / --with-urma-mock (config_brpc.sh),
default OFF. When WITH_URMA is enabled and liburma isn't found, the
build now fails with a clear message unless the mock is explicitly
requested, instead of substituting it implicitly. Document the new
flag in docs/en/urma.md and docs/cn/urma.md.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
---
 CMakeLists.txt  | 14 ++++++++++++--
 config_brpc.sh  | 11 ++++++++---
 docs/cn/urma.md | 17 ++++++++++++++---
 docs/en/urma.md | 20 ++++++++++++++++----
 4 files changed, 50 insertions(+), 12 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 10e9052dcb..a2838bceaa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,6 +31,9 @@ option(WITH_URMA "With URMA (openEuler Unified Remote Memory Access)" OFF)
 option(DOWNLOAD_URMA_HEADERS
        "Download UMDK headers when WITH_URMA is enabled and headers are absent"
        ON)
+option(WITH_URMA_MOCK
+       "Explicitly allow linking brpc's URMA link-time mock when liburma is not found (WITH_URMA only). The mock cannot talk to real URMA hardware, so this must be opted into rather than silently substituted."
+       OFF)
 option(WITH_UBRING "With UB" OFF)
 option(WITH_DEBUG_BTHREAD_SCHE_SAFETY "With debugging bthread sche safety" OFF)
 option(WITH_DEBUG_LOCK "With debugging lock" OFF)
@@ -371,10 +374,17 @@ if(WITH_URMA)
     if(URMA_LIB)
         message(STATUS "Found URMA library: ${URMA_LIB}")
         set(URMA_USE_MOCK 0)
-    else()
+    elseif(WITH_URMA_MOCK)
         message(STATUS
-            "liburma not found; building with the URMA link-time mock")
+            "liburma not found; WITH_URMA_MOCK=ON, building with the URMA "
+            "link-time mock")
         set(URMA_USE_MOCK 1)
+    else()
+        message(FATAL_ERROR
+            "Fail to find liburma. Install liburma, set URMA_ROOT, or "
+            "explicitly opt into brpc's link-time mock with "
+            "-DWITH_URMA_MOCK=ON (the mock cannot talk to real URMA "
+            "hardware; only enable it for CI/tests without URMA hardware).")
     endif()
 endif()
 
diff --git a/config_brpc.sh b/config_brpc.sh
index 2c1394e840..edfa989c49 100755
--- a/config_brpc.sh
+++ b/config_brpc.sh
@@ -54,11 +54,12 @@ else
     LDD=ldd
 fi
 
-TEMP=`getopt -o v: --long headers:,libs:,cc:,cxx:,with-glog,with-thrift,with-rdma,with-urma,with-mesalink,with-bthread-tracer,with-debug-bthread-sche-safety,with-debug-lock,with-asan,with-riscv-zvbc,with-riscv-zbc,with-cpu-frequency,nodebugsymbols,werror -n 'config_brpc' -- "$@"`
+TEMP=`getopt -o v: --long headers:,libs:,cc:,cxx:,with-glog,with-thrift,with-rdma,with-urma,with-urma-mock,with-mesalink,with-bthread-tracer,with-debug-bthread-sche-safety,with-debug-lock,with-asan,with-riscv-zvbc,with-riscv-zbc,with-cpu-frequency,nodebugsymbols,werror -n 'config_brpc' -- "$@"`
 WITH_GLOG=0
 WITH_THRIFT=0
 WITH_RDMA=0
 WITH_URMA=0
+WITH_URMA_MOCK=0
 WITH_MESALINK=0
 WITH_BTHREAD_TRACER=0
 WITH_ASAN=0
@@ -92,6 +93,7 @@ while true; do
         --with-thrift) WITH_THRIFT=1; shift 1 ;;
         --with-rdma) WITH_RDMA=1; shift 1 ;;
         --with-urma) WITH_URMA=1; shift 1 ;;
+        --with-urma-mock) WITH_URMA_MOCK=1; shift 1 ;;
         --with-mesalink) WITH_MESALINK=1; shift 1 ;;
         --with-bthread-tracer) WITH_BTHREAD_TRACER=1; shift 1 ;;
         --with-debug-bthread-sche-safety ) BRPC_DEBUG_BTHREAD_SCHE_SAFETY=1; shift 1 ;;
@@ -554,9 +556,12 @@ if [ $WITH_URMA != 0 ]; then
         append_to_output_libs "$URMA_LIB"
         append_to_output "DYNAMIC_LINKINGS+=-lurma"
         append_to_output "URMA_USE_MOCK=0"
-    else
+    elif [ $WITH_URMA_MOCK != 0 ]; then
         append_to_output "URMA_USE_MOCK=1"
-        print_info "liburma not found; using URMA link-time mock"
+        print_info "liburma not found; --with-urma-mock given, using URMA link-time mock"
+    else
+        >&2 $ECHO "Fail to find liburma. Install liburma, or explicitly opt into brpc's link-time mock with --with-urma-mock (the mock cannot talk to real URMA hardware; only use it for CI/tests without URMA hardware)."
+        exit 1
     fi
 fi
 
diff --git a/docs/cn/urma.md b/docs/cn/urma.md
index 2c31b0d9a3..b1c048fae1 100644
--- a/docs/cn/urma.md
+++ b/docs/cn/urma.md
@@ -20,7 +20,7 @@ WR。完成事件既可由 JFC 忙轮询获取，也可通过 JFCE 事件 fd 获
 ### CMake 编译
 
 ```bash
-# 带 URMA 支持编译 brpc
+# 带 URMA 支持编译 brpc（需要 liburma；无硬件/CI 场景见下方 mock 说明）
 cmake -B build -DWITH_URMA=ON
 make -C build -j$(nproc)
 
@@ -30,11 +30,22 @@ cmake -B build
 make -C build -j$(nproc)
 ```
 
+未安装 `liburma` 时（例如 CI 环境），需显式开启链接期 mock，而不是依赖
+隐式回退：
+
+```bash
+cmake -B build -DWITH_URMA=ON -DWITH_URMA_MOCK=ON
+make -C build -j$(nproc)
+```
+
 `WITH_URMA=ON` 使用上游 UMDK 头文件进行编译。CMake 优先使用系统安装的
 SDK；找不到头文件时，会参照 Mooncake 的 mock 构建方式下载固定版本的
 UMDK，可通过 `DOWNLOAD_URMA_HEADERS=OFF` 禁止下载。找到 `liburma` 时使用
-真实硬件数据通路，否则链接 brpc 的 mock，使 URMA 代码和测试仍可在无硬件
-环境编译。
+真实硬件数据通路；否则默认直接报错终止构建，避免静默回退到 mock 而产出
+一个看似支持 URMA、实际无法访问真实硬件的产物。需要在无硬件环境（例如
+CI）编译和测试 URMA 代码时，显式传入 `-DWITH_URMA_MOCK=ON`
+（Make 对应 `config_brpc.sh --with-urma-mock`）以主动选择链接 brpc 的
+mock。
 
 ### Bazel 编译
 
diff --git a/docs/en/urma.md b/docs/en/urma.md
index ee38eb6359..8556fbdf93 100644
--- a/docs/en/urma.md
+++ b/docs/en/urma.md
@@ -20,7 +20,7 @@ from a JFC either by busy polling or through a JFCE event fd.
 ### Build with CMake
 
 ```bash
-# Build brpc with URMA support
+# Build brpc with URMA support (requires liburma; see below for CI/mock builds)
 cmake -B build -DWITH_URMA=ON
 make -C build -j$(nproc)
 
@@ -30,13 +30,25 @@ cmake -B build
 make -C build -j$(nproc)
 ```
 
+Without `liburma` installed (e.g. in CI), explicitly opt into the link-time
+mock instead of relying on an implicit fallback:
+
+```bash
+cmake -B build -DWITH_URMA=ON -DWITH_URMA_MOCK=ON
+make -C build -j$(nproc)
+```
+
 `WITH_URMA=ON` compiles against upstream UMDK headers. CMake prefers an
 installed SDK and, following Mooncake's mock setup, downloads a pinned UMDK
 release when the headers are unavailable. Set `DOWNLOAD_URMA_HEADERS=OFF` to
 disable downloading.
-When `liburma` is found it is linked for the hardware data path. Otherwise,
-brpc uses its link-time mock so URMA code and tests can still be built without
-hardware.
+When `liburma` is found it is linked for the hardware data path. Otherwise
+the build fails by default, since silently falling back to the mock could
+mask a broken environment and ship a binary that looks URMA-capable but
+cannot reach real hardware. Pass `-DWITH_URMA_MOCK=ON`
+(`config_brpc.sh --with-urma-mock`) to explicitly opt into brpc's
+link-time mock so URMA code and tests can still be built without hardware
+(e.g. in CI).
 
 ### Build with Bazel
 

From 54d0598f24a781d8e464d6541c06b9d7371a5c28 Mon Sep 17 00:00:00 2001
From: Winchell <cw20050111@gmail.com>
Date: Tue, 18 Aug 2026 14:58:46 +0800
Subject: [PATCH 06/16] Link liburma for all examples

Add conditional linking for URMA library based on availability.
---
 example/cmake/BrpcExample.cmake | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/example/cmake/BrpcExample.cmake b/example/cmake/BrpcExample.cmake
index 6b2c7850ff..2f5050672d 100644
--- a/example/cmake/BrpcExample.cmake
+++ b/example/cmake/BrpcExample.cmake
@@ -122,6 +122,13 @@ macro(brpc_example_find_common_deps out_libs)
     endif()
 
     find_package(OpenSSL REQUIRED)
+    # brpc built with -DWITH_URMA=ON carries undefined urma_* symbols, so every
+    # example has to link liburma. Search by best effort: when brpc was built
+    # without URMA the symbols are absent and the library is not needed.
+    find_library(URMA_LIB NAMES urma)
+    if(NOT URMA_LIB)
+        set(URMA_LIB "")
+    endif()
 
     set(_common_libs
         Threads::Threads
@@ -132,6 +139,7 @@ macro(brpc_example_find_common_deps out_libs)
         ${OPENSSL_CRYPTO_LIBRARY}
         ${OPENSSL_SSL_LIBRARY}
         ${THRIFT_LIB}
+        ${URMA_LIB}
         dl
     )
 

From 05bd3a739ddec9cdb977d8fa2a1fc17a68abb18d Mon Sep 17 00:00:00 2001
From: Winchell <cw20050111@gmail.com>
Date: Tue, 18 Aug 2026 14:59:40 +0800
Subject: [PATCH 07/16] Drop duplicate liburma lookup in urma_performance

---
 example/urma_performance/CMakeLists.txt | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/example/urma_performance/CMakeLists.txt b/example/urma_performance/CMakeLists.txt
index 154970fbd3..5140ea5036 100644
--- a/example/urma_performance/CMakeLists.txt
+++ b/example/urma_performance/CMakeLists.txt
@@ -26,13 +26,6 @@ brpc_example_find_common_deps(DYNAMIC_LIB)
 
 protobuf_generate_cpp(PROTO_SRC PROTO_HEADER test.proto)
 set(BRPC_EXAMPLE_WITH_URMA ON)
-find_library(URMA_LIB NAMES urma)
-if(URMA_LIB)
-    list(APPEND DYNAMIC_LIB ${URMA_LIB})
-else()
-    message(STATUS
-        "liburma not found; using the URMA implementation linked into brpc")
-endif()
 
 add_executable(urma_performance_client client.cpp ${PROTO_SRC} ${PROTO_HEADER})
 brpc_example_configure_target(urma_performance_client)

From fc38727bd3ad83dc90b1a60d6f9f5126ac0a2fcb Mon Sep 17 00:00:00 2001
From: Winchell <cw20050111@gmail.com>
Date: Tue, 18 Aug 2026 15:09:51 +0800
Subject: [PATCH 08/16] Add comment about linking liburma in BrpcExample.cmake

Added a comment regarding linking with liburma based on brpc build options.
---
 example/cmake/BrpcExample.cmake | 1 +
 1 file changed, 1 insertion(+)

diff --git a/example/cmake/BrpcExample.cmake b/example/cmake/BrpcExample.cmake
index 2f5050672d..a6cf99e51d 100644
--- a/example/cmake/BrpcExample.cmake
+++ b/example/cmake/BrpcExample.cmake
@@ -122,6 +122,7 @@ macro(brpc_example_find_common_deps out_libs)
     endif()
 
     find_package(OpenSSL REQUIRED)
+
     # brpc built with -DWITH_URMA=ON carries undefined urma_* symbols, so every
     # example has to link liburma. Search by best effort: when brpc was built
     # without URMA the symbols are absent and the library is not needed.

From 8f9221e5142c63de5e4f3c680192b24088388ec7 Mon Sep 17 00:00:00 2001
From: Winchell <cw20050111@gmail.com>
Date: Tue, 18 Aug 2026 18:02:53 +0800
Subject: [PATCH 09/16] Revert liburma linking for diagnosis

---
 example/cmake/BrpcExample.cmake | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/example/cmake/BrpcExample.cmake b/example/cmake/BrpcExample.cmake
index a6cf99e51d..5bc9307e9a 100644
--- a/example/cmake/BrpcExample.cmake
+++ b/example/cmake/BrpcExample.cmake
@@ -123,13 +123,6 @@ macro(brpc_example_find_common_deps out_libs)
 
     find_package(OpenSSL REQUIRED)
 
-    # brpc built with -DWITH_URMA=ON carries undefined urma_* symbols, so every
-    # example has to link liburma. Search by best effort: when brpc was built
-    # without URMA the symbols are absent and the library is not needed.
-    find_library(URMA_LIB NAMES urma)
-    if(NOT URMA_LIB)
-        set(URMA_LIB "")
-    endif()
 
     set(_common_libs
         Threads::Threads
@@ -140,7 +133,6 @@ macro(brpc_example_find_common_deps out_libs)
         ${OPENSSL_CRYPTO_LIBRARY}
         ${OPENSSL_SSL_LIBRARY}
         ${THRIFT_LIB}
-        ${URMA_LIB}
         dl
     )
 

From 511530cdf6948387caae51984ff34ad29d15907e Mon Sep 17 00:00:00 2001
From: Winchell <cw20050111@gmail.com>
Date: Tue, 18 Aug 2026 18:03:49 +0800
Subject: [PATCH 10/16] Check for URMA library and update build configuration

Added logic to find the URMA library and handle its absence.
---
 example/urma_performance/CMakeLists.txt | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/example/urma_performance/CMakeLists.txt b/example/urma_performance/CMakeLists.txt
index 5140ea5036..ae02a2cb52 100644
--- a/example/urma_performance/CMakeLists.txt
+++ b/example/urma_performance/CMakeLists.txt
@@ -27,6 +27,14 @@ brpc_example_find_common_deps(DYNAMIC_LIB)
 protobuf_generate_cpp(PROTO_SRC PROTO_HEADER test.proto)
 set(BRPC_EXAMPLE_WITH_URMA ON)
 
+find_library(URMA_LIB NAMES urma)
+if(URMA_LIB)
+    list(APPEND DYNAMIC_LIB ${URMA_LIB})
+else()
+    message(STATUS
+        "liburma not found; using the URMA implementation linked into brpc")
+endif()
+
 add_executable(urma_performance_client client.cpp ${PROTO_SRC} ${PROTO_HEADER})
 brpc_example_configure_target(urma_performance_client)
 add_executable(urma_performance_server server.cpp ${PROTO_SRC} ${PROTO_HEADER})

From 65311166f58044dff1a0b3e8f69d323d1aa0616d Mon Sep 17 00:00:00 2001
From: Winchell <cw20050111@gmail.com>
Date: Tue, 18 Aug 2026 18:31:30 +0800
Subject: [PATCH 11/16] Add URMA library search to CMake configuration

---
 example/cmake/BrpcExample.cmake | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/example/cmake/BrpcExample.cmake b/example/cmake/BrpcExample.cmake
index 5bc9307e9a..b85f278424 100644
--- a/example/cmake/BrpcExample.cmake
+++ b/example/cmake/BrpcExample.cmake
@@ -123,6 +123,10 @@ macro(brpc_example_find_common_deps out_libs)
 
     find_package(OpenSSL REQUIRED)
 
+    find_library(URMA_LIB NAMES urma)
+    if(NOT URMA_LIB)
+        set(URMA_LIB "")
+    endif()
 
     set(_common_libs
         Threads::Threads
@@ -133,6 +137,7 @@ macro(brpc_example_find_common_deps out_libs)
         ${OPENSSL_CRYPTO_LIBRARY}
         ${OPENSSL_SSL_LIBRARY}
         ${THRIFT_LIB}
+        ${URMA_LIB}
         dl
     )
 

From f4b729f9b838c22655e916148802f85c556bb437 Mon Sep 17 00:00:00 2001
From: Winchell <cw20050111@gmail.com>
Date: Tue, 18 Aug 2026 19:02:40 +0800
Subject: [PATCH 12/16] Update CMake to link with URMA library conditionally

---
 example/cmake/BrpcExample.cmake | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/example/cmake/BrpcExample.cmake b/example/cmake/BrpcExample.cmake
index b85f278424..5eb2280120 100644
--- a/example/cmake/BrpcExample.cmake
+++ b/example/cmake/BrpcExample.cmake
@@ -86,11 +86,12 @@ macro(brpc_example_find_common_deps out_libs)
         )
     endif()
 
-    # Search for libthrift* by best effort. If it is not found and brpc is
-    # compiled with thrift protocol enabled, a link error would be reported.
-    find_library(THRIFT_LIB NAMES thrift)
-    if(NOT THRIFT_LIB)
-        set(THRIFT_LIB "")
+    # brpc built with -DWITH_URMA=ON carries undefined urma_* symbols, so every
+    # example has to link liburma. Search by best effort: when brpc was built
+    # without URMA the symbols are absent and the library is not needed.
+    find_library(_brpc_example_urma_lib NAMES urma NO_CACHE)
+    if(NOT _brpc_example_urma_lib)
+        set(_brpc_example_urma_lib "")
     endif()
 
     find_path(BRPC_INCLUDE_PATH NAMES brpc/server.h)
@@ -137,7 +138,7 @@ macro(brpc_example_find_common_deps out_libs)
         ${OPENSSL_CRYPTO_LIBRARY}
         ${OPENSSL_SSL_LIBRARY}
         ${THRIFT_LIB}
-        ${URMA_LIB}
+        ${_brpc_example_urma_lib}
         dl
     )
 

From 9a2a7e8dc4f1f5d3882576917a24d5349cdfd006 Mon Sep 17 00:00:00 2001
From: Winchell <cw20050111@gmail.com>
Date: Tue, 18 Aug 2026 19:30:23 +0800
Subject: [PATCH 13/16] Remove URMA library check from CMakeLists.txt

Removed conditional check for URMA library and related messages.
---
 example/urma_performance/CMakeLists.txt | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/example/urma_performance/CMakeLists.txt b/example/urma_performance/CMakeLists.txt
index ae02a2cb52..eae472fe90 100644
--- a/example/urma_performance/CMakeLists.txt
+++ b/example/urma_performance/CMakeLists.txt
@@ -27,13 +27,6 @@ brpc_example_find_common_deps(DYNAMIC_LIB)
 protobuf_generate_cpp(PROTO_SRC PROTO_HEADER test.proto)
 set(BRPC_EXAMPLE_WITH_URMA ON)
 
-find_library(URMA_LIB NAMES urma)
-if(URMA_LIB)
-    list(APPEND DYNAMIC_LIB ${URMA_LIB})
-else()
-    message(STATUS
-        "liburma not found; using the URMA implementation linked into brpc")
-endif()
 
 add_executable(urma_performance_client client.cpp ${PROTO_SRC} ${PROTO_HEADER})
 brpc_example_configure_target(urma_performance_client)

From b65ca94b1cf7fe0de844c6c7c180477744578cf5 Mon Sep 17 00:00:00 2001
From: Winchell <cw20050111@gmail.com>
Date: Tue, 18 Aug 2026 20:27:18 +0800
Subject: [PATCH 14/16] Refactor URMA library linking logic in CMake

Update logic for linking liburma based on header presence.
---
 example/cmake/BrpcExample.cmake | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/example/cmake/BrpcExample.cmake b/example/cmake/BrpcExample.cmake
index 5eb2280120..e57cda196a 100644
--- a/example/cmake/BrpcExample.cmake
+++ b/example/cmake/BrpcExample.cmake
@@ -86,12 +86,12 @@ macro(brpc_example_find_common_deps out_libs)
         )
     endif()
 
-    # brpc built with -DWITH_URMA=ON carries undefined urma_* symbols, so every
-    # example has to link liburma. Search by best effort: when brpc was built
-    # without URMA the symbols are absent and the library is not needed.
-    find_library(_brpc_example_urma_lib NAMES urma NO_CACHE)
-    if(NOT _brpc_example_urma_lib)
-        set(_brpc_example_urma_lib "")
+
+    # brpc built with -DWITH_URMA=ON carries undefined urma_* symbols. Link
+    # liburma when the header is present, which indicates a URMA-capable build.
+    set(_brpc_example_urma_lib "")
+    if(EXISTS "/usr/lib64/liburma.so" OR EXISTS "/usr/lib/liburma.so")
+        set(_brpc_example_urma_lib "urma")
     endif()
 
     find_path(BRPC_INCLUDE_PATH NAMES brpc/server.h)

From b67d43a43f2a9d0997b2c1df4a014cc6ab775434 Mon Sep 17 00:00:00 2001
From: Winchell <cw20050111@gmail.com>
Date: Mon, 10 Aug 2026 17:58:39 +0800
Subject: [PATCH 15/16] ci: add WITH_URMA=ON build+test job; fix mock link for
 bonding extension

- ci-linux.yml: new compile-and-test-with-urma job builds with
  -DWITH_URMA=ON against the openEuler-mirror UMDK headers on GitHub
  (avoids the atomgit.com dependency) and runs brpc_urma_unittest with
  the link-time mock, since no URMA hardware is available on runners.
- mock_urma.cpp: add urma_user_ctl(), referenced by SetBondingMode()
  whenever urma_ubagg.h is available; without it, WITH_URMA=ON fails
  to link against the mock.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01JX6CCou3VWh8ZxRR4x6zvY
---
 .github/workflows/ci-linux.yml | 43 ++++++++++++++++++++++++++++++++++
 src/brpc/urma/mock_urma.cpp    | 21 +++++++++++++++++
 2 files changed, 64 insertions(+)

diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml
index e15d81db4f..2112ce31e7 100644
--- a/.github/workflows/ci-linux.yml
+++ b/.github/workflows/ci-linux.yml
@@ -85,6 +85,49 @@ jobs:
               -DWITH_ASAN=ON -DCMAKE_POLICY_VERSION_MINIMUM=3.5 ..
         make -j ${{env.proc_num}} && make clean
 
+  compile-and-test-with-urma:
+    # WITH_URMA=ON is not covered by the jobs above: none of them set the flag,
+    # so src/brpc/urma/*.cpp and brpc_urma_unittest.cpp are never compiled.
+    # liburma is absent on the runner, so CMake falls back to the link-time
+    # mock (src/brpc/urma/mock_urma.cpp) and no URMA hardware is needed.
+    runs-on: ubuntu-22.04
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ./.github/actions/install-essential-dependencies
+
+    # test/CMakeLists.txt does find_package(Gperftools) and links
+    # ${GPERFTOOLS_LIBRARIES} into every unittest target. The make-based
+    # unittest jobs never hit this, but the CMake generate step fails with
+    # NOTFOUND without it.
+    - name: install gperftools
+      run: sudo apt-get install -y libgoogle-perftools-dev
+
+    # DOWNLOAD_URMA_HEADERS fetches from atomgit.com, which is slow and often
+    # unreachable from CI. openEuler mirrors the same repo (identical tags and
+    # layout) on GitHub, so clone that and hand it to CMake via URMA_ROOT.
+    - name: fetch UMDK headers
+      run: |
+        git clone --depth 1 --branch v26.06.0_CAM \
+            https://github.com/openeuler-mirror/umdk.git $GITHUB_WORKSPACE/umdk
+        test -f $GITHUB_WORKSPACE/umdk/src/urma/lib/urma/core/include/urma_api.h
+
+    - name: gcc with URMA
+      env:
+        URMA_ROOT: ${{ github.workspace }}/umdk
+      run: |
+        export CC=gcc && export CXX=g++
+        mkdir urma_build && cd urma_build
+        cmake -DWITH_URMA=ON \
+              -DBUILD_UNIT_TESTS=ON -DBUILD_BRPC_TOOLS=OFF \
+              -DCMAKE_BUILD_TYPE=Debug -DCMAKE_POLICY_VERSION_MINIMUM=3.5 ..
+        # brpc_urma_unittest links brpc-shared-debug, built from
+        # SOURCES_DEBUG_LIB, which contains every urma_*.cpp plus
+        # mock_urma.cpp -- so this target compiles all the URMA code.
+        make -j ${{env.proc_num}} brpc_urma_unittest
+
+    - name: run brpc_urma_unittest
+      run: cd urma_build/test && ./brpc_urma_unittest
+
   gcc-compile-with-make-protobuf:
     runs-on: ubuntu-22.04
     steps:
diff --git a/src/brpc/urma/mock_urma.cpp b/src/brpc/urma/mock_urma.cpp
index 266c08b19a..82326aa640 100644
--- a/src/brpc/urma/mock_urma.cpp
+++ b/src/brpc/urma/mock_urma.cpp
@@ -708,6 +708,27 @@ int urma_wait_jfc(urma_jfce_t* jfce, uint32_t jfc_cnt, int,
 void urma_ack_jfc(urma_jfc_t*[], uint32_t[], uint32_t) {
 }
 
+// Referenced by SetBondingMode() in urma_helper.cpp whenever the provider
+// header urma_ubagg.h is available (BRPC_URMA_HAS_BONDING_EXT). Without a
+// definition here, WITH_URMA=ON fails to link against the mock. The mock
+// advertises no bonding device, so this is never reached at runtime, but the
+// symbol must exist.
+urma_status_t urma_user_ctl(urma_context_t *ctx, urma_user_ctl_in_t *in,
+                            urma_user_ctl_out_t *out) {
+    if (ctx == nullptr || in == nullptr || out == nullptr) {
+        return URMA_EINVAL;
+    }
+    std::shared_lock<std::shared_mutex> lock(g_rw_mutex);
+    if (context_map.find(ctx) == context_map.end()) {
+        return URMA_EINVAL;
+    }
+    // No provider state to configure; accept the command and report an empty
+    // output buffer.
+    out->addr = 0;
+    out->len = 0;
+    return URMA_SUCCESS;
+}
+
 }  // extern "C"
 
 #endif  // BRPC_WITH_URMA

From 7e6884ce64f9ccaa2125a7e44a205f8ceebd0f02 Mon Sep 17 00:00:00 2001
From: Winchell <cw20050111@gmail,com>
Date: Tue, 11 Aug 2026 15:07:31 +0800
Subject: [PATCH 16/16] fix(urma): use std::shared_timed_mutex in mock_urma.cpp
 for C++14 builds

---
 src/brpc/urma/mock_urma.cpp | 76 ++++++++++++++++++++-----------------
 1 file changed, 41 insertions(+), 35 deletions(-)

diff --git a/src/brpc/urma/mock_urma.cpp b/src/brpc/urma/mock_urma.cpp
index 82326aa640..b6b7e29733 100644
--- a/src/brpc/urma/mock_urma.cpp
+++ b/src/brpc/urma/mock_urma.cpp
@@ -62,7 +62,13 @@ struct PendingRecv {
     uint64_t user_ctx;
 };
 
-std::shared_mutex g_rw_mutex;
+// brpc is built with -std=c++14 whenever protobuf < 4.21 (see BRPC_CXX_STANDARD
+// in CMakeLists.txt and CXXFLAGS in config_brpc.sh), which is the case on the
+// CI runners. std::shared_mutex is C++17-only; std::shared_timed_mutex is the
+// C++14 equivalent and has the same locking semantics here.
+typedef std::shared_timed_mutex MockSharedMutex;
+
+MockSharedMutex g_rw_mutex;
 bool initialized = false;
 std::vector<urma_device_t *> device_list;
 std::map<urma_context_t *, int> context_map;
@@ -119,7 +125,7 @@ urma_eid_info_t mock_eid_info = {
 extern "C" {
 
 urma_status_t urma_init(urma_init_attr_t *init_attr) {
-    std::unique_lock<std::shared_mutex> lock(g_rw_mutex);
+    std::unique_lock<MockSharedMutex> lock(g_rw_mutex);
     if (initialized) {
         return URMA_EEXIST;
     }
@@ -128,7 +134,7 @@ urma_status_t urma_init(urma_init_attr_t *init_attr) {
 }
 
 urma_status_t urma_uninit(void) {
-    std::unique_lock<std::shared_mutex> lock(g_rw_mutex);
+    std::unique_lock<MockSharedMutex> lock(g_rw_mutex);
     initialized = false;
     for (auto device : device_list) {
         delete device;
@@ -153,7 +159,7 @@ urma_status_t urma_uninit(void) {
 
 urma_device_t **urma_get_device_list(int *num_devices) {
     {
-        std::shared_lock<std::shared_mutex> lock(g_rw_mutex);
+        std::shared_lock<MockSharedMutex> lock(g_rw_mutex);
         if (!initialized) {
             *num_devices = 0;
             return nullptr;
@@ -168,7 +174,7 @@ urma_device_t **urma_get_device_list(int *num_devices) {
         }
     }
     {
-        std::unique_lock<std::shared_mutex> write_lock(g_rw_mutex);
+        std::unique_lock<MockSharedMutex> write_lock(g_rw_mutex);
         if (!initialized) {
             *num_devices = 0;
             return nullptr;
@@ -193,7 +199,7 @@ urma_device_t **urma_get_device_list(int *num_devices) {
 
 urma_device_t *urma_get_device_by_name(char *dev_name) {
     {
-        std::shared_lock<std::shared_mutex> lock(g_rw_mutex);
+        std::shared_lock<MockSharedMutex> lock(g_rw_mutex);
         if (!initialized) {
             return nullptr;
         }
@@ -207,7 +213,7 @@ urma_device_t *urma_get_device_by_name(char *dev_name) {
         }
     }
     {
-        std::unique_lock<std::shared_mutex> write_lock(g_rw_mutex);
+        std::unique_lock<MockSharedMutex> write_lock(g_rw_mutex);
         if (!initialized) {
             return nullptr;
         }
@@ -265,7 +271,7 @@ void urma_free_eid_list(urma_eid_info_t *eid_list) {
 }
 
 urma_context_t *urma_create_context(urma_device_t *device, uint32_t eid_index) {
-    std::unique_lock<std::shared_mutex> lock(g_rw_mutex);
+    std::unique_lock<MockSharedMutex> lock(g_rw_mutex);
     if (!device) {
         return nullptr;
     }
@@ -277,7 +283,7 @@ urma_context_t *urma_create_context(urma_device_t *device, uint32_t eid_index) {
 }
 
 urma_status_t urma_delete_context(urma_context_t *ctx) {
-    std::unique_lock<std::shared_mutex> lock(g_rw_mutex);
+    std::unique_lock<MockSharedMutex> lock(g_rw_mutex);
     if (!ctx || context_map.find(ctx) == context_map.end()) {
         return URMA_EINVAL;
     }
@@ -287,7 +293,7 @@ urma_status_t urma_delete_context(urma_context_t *ctx) {
 }
 
 urma_jfce_t *urma_create_jfce(urma_context_t *ctx) {
-    std::unique_lock<std::shared_mutex> lock(g_rw_mutex);
+    std::unique_lock<MockSharedMutex> lock(g_rw_mutex);
     if (!ctx || context_map.find(ctx) == context_map.end()) {
         return nullptr;
     }
@@ -305,7 +311,7 @@ urma_jfce_t *urma_create_jfce(urma_context_t *ctx) {
 }
 
 urma_status_t urma_delete_jfce(urma_jfce_t *jfce) {
-    std::unique_lock<std::shared_mutex> lock(g_rw_mutex);
+    std::unique_lock<MockSharedMutex> lock(g_rw_mutex);
     if (!jfce || jfce_map.find(jfce) == jfce_map.end()) {
         return URMA_EINVAL;
     }
@@ -316,7 +322,7 @@ urma_status_t urma_delete_jfce(urma_jfce_t *jfce) {
 }
 
 urma_jfc_t *urma_create_jfc(urma_context_t *ctx, urma_jfc_cfg_t *cfg) {
-    std::unique_lock<std::shared_mutex> lock(g_rw_mutex);
+    std::unique_lock<MockSharedMutex> lock(g_rw_mutex);
     if (!ctx || !cfg || context_map.find(ctx) == context_map.end()) {
         return nullptr;
     }
@@ -334,7 +340,7 @@ urma_jfc_t *urma_create_jfc(urma_context_t *ctx, urma_jfc_cfg_t *cfg) {
 }
 
 urma_status_t urma_delete_jfc(urma_jfc_t *jfc) {
-    std::unique_lock<std::shared_mutex> lock(g_rw_mutex);
+    std::unique_lock<MockSharedMutex> lock(g_rw_mutex);
     if (!jfc || jfc_state_map.find(jfc) == jfc_state_map.end()) {
         return URMA_EINVAL;
     }
@@ -345,7 +351,7 @@ urma_status_t urma_delete_jfc(urma_jfc_t *jfc) {
 }
 
 urma_jfr_t *urma_create_jfr(urma_context_t *ctx, urma_jfr_cfg_t *cfg) {
-    std::unique_lock<std::shared_mutex> lock(g_rw_mutex);
+    std::unique_lock<MockSharedMutex> lock(g_rw_mutex);
     if (!ctx || !cfg || context_map.find(ctx) == context_map.end()) {
         return nullptr;
     }
@@ -361,7 +367,7 @@ urma_jfr_t *urma_create_jfr(urma_context_t *ctx, urma_jfr_cfg_t *cfg) {
 }
 
 urma_status_t urma_delete_jfr(urma_jfr_t *jfr) {
-    std::unique_lock<std::shared_mutex> lock(g_rw_mutex);
+    std::unique_lock<MockSharedMutex> lock(g_rw_mutex);
     if (!jfr || jfr_map.find(jfr) == jfr_map.end()) {
         return URMA_EINVAL;
     }
@@ -373,7 +379,7 @@ urma_status_t urma_delete_jfr(urma_jfr_t *jfr) {
 }
 
 urma_target_seg_t *urma_register_seg(urma_context_t *ctx, urma_seg_cfg_t *cfg) {
-    std::unique_lock<std::shared_mutex> lock(g_rw_mutex);
+    std::unique_lock<MockSharedMutex> lock(g_rw_mutex);
     if (!ctx || !cfg || context_map.find(ctx) == context_map.end()) {
         return nullptr;
     }
@@ -389,7 +395,7 @@ urma_target_seg_t *urma_register_seg(urma_context_t *ctx, urma_seg_cfg_t *cfg) {
 }
 
 urma_status_t urma_unregister_seg(urma_target_seg_t *seg) {
-    std::unique_lock<std::shared_mutex> lock(g_rw_mutex);
+    std::unique_lock<MockSharedMutex> lock(g_rw_mutex);
     if (!seg || seg_map.find(seg) == seg_map.end()) {
         return URMA_EINVAL;
     }
@@ -401,7 +407,7 @@ urma_status_t urma_unregister_seg(urma_target_seg_t *seg) {
 urma_target_seg_t *urma_import_seg(urma_context_t *ctx, urma_seg_t *seg,
                                    urma_token_t *token_value, uint64_t addr,
                                    urma_import_seg_flag_t flag) {
-    std::unique_lock<std::shared_mutex> lock(g_rw_mutex);
+    std::unique_lock<MockSharedMutex> lock(g_rw_mutex);
     if (!ctx || !seg || !token_value ||
         context_map.find(ctx) == context_map.end()) {
         return nullptr;
@@ -414,7 +420,7 @@ urma_target_seg_t *urma_import_seg(urma_context_t *ctx, urma_seg_t *seg,
 }
 
 urma_status_t urma_unimport_seg(urma_target_seg_t *tseg) {
-    std::unique_lock<std::shared_mutex> lock(g_rw_mutex);
+    std::unique_lock<MockSharedMutex> lock(g_rw_mutex);
     if (!tseg || seg_map.find(tseg) == seg_map.end()) {
         return URMA_EINVAL;
     }
@@ -428,7 +434,7 @@ urma_status_t urma_get_async_event(urma_context_t *ctx,
     if (!ctx || !event) {
         return URMA_EINVAL;
     }
-    std::shared_lock<std::shared_mutex> lock(g_rw_mutex);
+    std::shared_lock<MockSharedMutex> lock(g_rw_mutex);
     if (context_map.find(ctx) == context_map.end()) {
         return URMA_EINVAL;
     }
@@ -438,7 +444,7 @@ urma_status_t urma_get_async_event(urma_context_t *ctx,
 void urma_ack_async_event(urma_async_event_t *event) {}
 
 urma_jetty_t *urma_create_jetty(urma_context_t *ctx, urma_jetty_cfg_t *cfg) {
-    std::unique_lock<std::shared_mutex> lock(g_rw_mutex);
+    std::unique_lock<MockSharedMutex> lock(g_rw_mutex);
     if (!ctx || !cfg || context_map.find(ctx) == context_map.end()) {
         return nullptr;
     }
@@ -455,7 +461,7 @@ urma_jetty_t *urma_create_jetty(urma_context_t *ctx, urma_jetty_cfg_t *cfg) {
 }
 
 urma_status_t urma_delete_jetty(urma_jetty_t *jetty) {
-    std::unique_lock<std::shared_mutex> lock(g_rw_mutex);
+    std::unique_lock<MockSharedMutex> lock(g_rw_mutex);
     if (!jetty || jetty_map.find(jetty) == jetty_map.end()) {
         return URMA_EINVAL;
     }
@@ -466,7 +472,7 @@ urma_status_t urma_delete_jetty(urma_jetty_t *jetty) {
 }
 
 urma_status_t urma_unbind_jetty(urma_jetty_t *jetty) {
-    std::unique_lock<std::shared_mutex> lock(g_rw_mutex);
+    std::unique_lock<MockSharedMutex> lock(g_rw_mutex);
     if (!jetty || jetty_map.find(jetty) == jetty_map.end()) {
         return URMA_EINVAL;
     }
@@ -477,7 +483,7 @@ urma_status_t urma_unbind_jetty(urma_jetty_t *jetty) {
 urma_target_jetty_t *urma_import_jetty(urma_context_t *ctx,
                                        urma_rjetty_t *rjetty,
                                        urma_token_t *token_value) {
-    std::unique_lock<std::shared_mutex> lock(g_rw_mutex);
+    std::unique_lock<MockSharedMutex> lock(g_rw_mutex);
     if (!ctx || !rjetty || !token_value ||
         context_map.find(ctx) == context_map.end()) {
         return nullptr;
@@ -490,7 +496,7 @@ urma_target_jetty_t *urma_import_jetty(urma_context_t *ctx,
 }
 
 urma_status_t urma_unimport_jetty(urma_target_jetty_t *tjetty) {
-    std::unique_lock<std::shared_mutex> lock(g_rw_mutex);
+    std::unique_lock<MockSharedMutex> lock(g_rw_mutex);
     if (!tjetty || target_jetty_map.find(tjetty) == target_jetty_map.end()) {
         return URMA_EINVAL;
     }
@@ -501,7 +507,7 @@ urma_status_t urma_unimport_jetty(urma_target_jetty_t *tjetty) {
 
 urma_status_t urma_bind_jetty(urma_jetty_t *jetty,
                               urma_target_jetty_t *tjetty) {
-    std::unique_lock<std::shared_mutex> lock(g_rw_mutex);
+    std::unique_lock<MockSharedMutex> lock(g_rw_mutex);
     if (!jetty || !tjetty || jetty_map.find(jetty) == jetty_map.end() ||
         target_jetty_map.find(tjetty) == target_jetty_map.end()) {
         return URMA_EINVAL;
@@ -511,7 +517,7 @@ urma_status_t urma_bind_jetty(urma_jetty_t *jetty,
 }
 
 urma_status_t urma_modify_jetty(urma_jetty_t *jetty, urma_jetty_attr_t *attr) {
-    std::shared_lock<std::shared_mutex> lock(g_rw_mutex);
+    std::shared_lock<MockSharedMutex> lock(g_rw_mutex);
     if (!jetty || !attr || jetty_map.find(jetty) == jetty_map.end()) {
         return URMA_EINVAL;
     }
@@ -520,7 +526,7 @@ urma_status_t urma_modify_jetty(urma_jetty_t *jetty, urma_jetty_attr_t *attr) {
 
 urma_status_t urma_post_jetty_send_wr(urma_jetty_t *jetty, urma_jfs_wr_t *wr,
                                       urma_jfs_wr_t **bad_wr) {
-    std::shared_lock<std::shared_mutex> read_lock(g_rw_mutex);
+    std::shared_lock<MockSharedMutex> read_lock(g_rw_mutex);
     auto local_it = jetty_map.find(jetty);
     auto local_jfc_it =
         jetty ? jfc_state_map.find(jetty->jetty_cfg.jfs_cfg.jfc)
@@ -555,7 +561,7 @@ urma_status_t urma_post_jetty_send_wr(urma_jetty_t *jetty, urma_jfs_wr_t *wr,
         PendingRecv recv{};
         urma_jfc_t* remote_jfc = nullptr;
         {
-            std::unique_lock<std::shared_mutex> lock(g_rw_mutex);
+            std::unique_lock<MockSharedMutex> lock(g_rw_mutex);
             auto remote_it = jetty_id_map.find(current->tjetty->id.id);
             if (remote_it == jetty_id_map.end()) {
                 continue;
@@ -585,7 +591,7 @@ urma_status_t urma_post_jetty_send_wr(urma_jetty_t *jetty, urma_jfs_wr_t *wr,
 
         JfcState* remote_state = nullptr;
         {
-            std::shared_lock<std::shared_mutex> lock(g_rw_mutex);
+            std::shared_lock<MockSharedMutex> lock(g_rw_mutex);
             auto state_it = jfc_state_map.find(remote_jfc);
             if (state_it != jfc_state_map.end()) {
                 remote_state = state_it->second;
@@ -613,7 +619,7 @@ urma_status_t urma_post_jetty_send_wr(urma_jetty_t *jetty, urma_jfs_wr_t *wr,
 
 urma_status_t urma_post_jfr_wr(urma_jfr_t *jfr, urma_jfr_wr_t *wr,
                                urma_jfr_wr_t **bad_wr) {
-    std::unique_lock<std::shared_mutex> lock(g_rw_mutex);
+    std::unique_lock<MockSharedMutex> lock(g_rw_mutex);
     auto recv_it = jfr_recv_map.find(jfr);
     if (!jfr || !wr || recv_it == jfr_recv_map.end()) {
         if (bad_wr) {
@@ -644,7 +650,7 @@ urma_status_t urma_post_jetty_recv_wr(urma_jetty_t *jetty,
                                       urma_jfr_wr_t **bad_wr) {
     urma_jfr_t* shared_jfr = nullptr;
     {
-        std::shared_lock<std::shared_mutex> lock(g_rw_mutex);
+        std::shared_lock<MockSharedMutex> lock(g_rw_mutex);
         if (!jetty || jetty_map.find(jetty) == jetty_map.end()) {
             if (bad_wr) {
                 *bad_wr = wr;
@@ -659,7 +665,7 @@ urma_status_t urma_post_jetty_recv_wr(urma_jetty_t *jetty,
 int urma_poll_jfc(urma_jfc_t *jfc, int num_entries, urma_cr_t *cr_list) {
     JfcState* state = nullptr;
     {
-        std::shared_lock<std::shared_mutex> lock(g_rw_mutex);
+        std::shared_lock<MockSharedMutex> lock(g_rw_mutex);
         auto it = jfc_state_map.find(jfc);
         if (it == jfc_state_map.end()) {
             return -1;
@@ -690,7 +696,7 @@ int urma_wait_jfc(urma_jfce_t* jfce, uint32_t jfc_cnt, int,
     }
     uint64_t value = 0;
     (void)read(jfce->fd, &value, sizeof(value));
-    std::shared_lock<std::shared_mutex> lock(g_rw_mutex);
+    std::shared_lock<MockSharedMutex> lock(g_rw_mutex);
     uint32_t count = 0;
     for (const auto& item : jfc_state_map) {
         if (count >= jfc_cnt || item.first->jfc_cfg.jfce != jfce) {
@@ -718,7 +724,7 @@ urma_status_t urma_user_ctl(urma_context_t *ctx, urma_user_ctl_in_t *in,
     if (ctx == nullptr || in == nullptr || out == nullptr) {
         return URMA_EINVAL;
     }
-    std::shared_lock<std::shared_mutex> lock(g_rw_mutex);
+    std::shared_lock<MockSharedMutex> lock(g_rw_mutex);
     if (context_map.find(ctx) == context_map.end()) {
         return URMA_EINVAL;
     }