This is an automated email from the ASF dual-hosted git repository.
guangmingchen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brpc.git
The following commit(s) were added to refs/heads/master by this push:
new 4eeb5e26 bazel: fix with_bthread_tracer config setting (#3111)
4eeb5e26 is described below
commit 4eeb5e260af165291f95f30f0fa64f9ff67ba192
Author: fanbingxin <[email protected]>
AuthorDate: Wed Oct 8 17:13:01 2025 +0800
bazel: fix with_bthread_tracer config setting (#3111)
---
.github/workflows/ci-linux.yml | 25 +++++++++++++++++++++++--
.gitignore | 8 +++++++-
BUILD.bazel | 2 +-
src/bthread/task_tracer.cpp | 4 ++--
4 files changed, 33 insertions(+), 6 deletions(-)
diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml
index b1704aa4..5d749a32 100644
--- a/.github/workflows/ci-linux.yml
+++ b/.github/workflows/ci-linux.yml
@@ -119,7 +119,17 @@ jobs:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v2
- - run: bazel build --verbose_failures --define with_mesalink=false
--define with_glog=true --define with_thrift=true --define
with_debug_bthread_sche_safety=true --define with_debug_lock=true --define
with_asan=true -- //... -//example/...
+ - run: |
+ bazel build --verbose_failures \
+ --define with_mesalink=false \
+ --define with_glog=true \
+ --define with_thrift=true \
+ --define with_debug_bthread_sche_safety=true \
+ --define with_debug_lock=true \
+ --define with_asan=true \
+ --define with_bthread_tracer=true \
+ --define BRPC_WITH_NO_PTHREAD_MUTEX_HOOK=true \
+ -- //... -//example/...
clang-compile-with-make-protobuf:
runs-on: ubuntu-22.04
@@ -167,7 +177,18 @@ jobs:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v2
- - run: bazel build --verbose_failures --action_env=CC=clang --define
with_mesalink=false --define with_glog=true --define with_thrift=true --define
with_debug_bthread_sche_safety=true --define with_debug_lock=true --define
with_asan=true -- //... -//example/...
+ - run: |
+ bazel build --verbose_failures \
+ --action_env=CC=clang \
+ --define with_mesalink=false \
+ --define with_glog=true \
+ --define with_thrift=true \
+ --define with_debug_bthread_sche_safety=true \
+ --define with_debug_lock=true \
+ --define with_asan=true \
+ --define with_bthread_tracer=true \
+ --define BRPC_WITH_NO_PTHREAD_MUTEX_HOOK=true \
+ -- //... -//example/...
clang-unittest:
runs-on: ubuntu-22.04
diff --git a/.gitignore b/.gitignore
index 9a60889a..44a371ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,4 +46,10 @@ CTestTestfile.cmake
/test/recordio_ref.io
# Ignore protoc-gen-mcpack files
-/protoc-gen-mcpack*/
\ No newline at end of file
+/protoc-gen-mcpack*/
+
+# Ignore bazel files
+bazel-bin
+bazel-out
+bazel-testlogs
+bazel-brpc
diff --git a/BUILD.bazel b/BUILD.bazel
index 3cfe83b6..a3e7b29f 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -405,7 +405,7 @@ cc_library(
]),
defines = [] + select({
"//bazel/config:brpc_with_bthread_tracer": [
- "-DBRPC_BTHREAD_TRACER",
+ "BRPC_BTHREAD_TRACER",
],
"//conditions:default": [],
}),
diff --git a/src/bthread/task_tracer.cpp b/src/bthread/task_tracer.cpp
index e2483495..415670aa 100644
--- a/src/bthread/task_tracer.cpp
+++ b/src/bthread/task_tracer.cpp
@@ -23,8 +23,8 @@
#include "butil/fd_utility.h"
#include "butil/memory/scope_guard.h"
#include "butil/reloadable_flags.h"
-#include <absl/debugging/stacktrace.h>
-#include <absl/debugging/symbolize.h>
+#include "absl/debugging/stacktrace.h"
+#include "absl/debugging/symbolize.h"
#include <csignal>
#include <gflags/gflags.h>
#include <poll.h>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
