Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 23 additions & 2 deletions .github/workflows/ci-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
8 changes: 7 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,10 @@ CTestTestfile.cmake
/test/recordio_ref.io

# Ignore protoc-gen-mcpack files
/protoc-gen-mcpack*/
/protoc-gen-mcpack*/

# Ignore bazel files
bazel-bin
bazel-out
bazel-testlogs
bazel-brpc
2 changes: 1 addition & 1 deletion BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@ cc_library(
]),
defines = [] + select({
"//bazel/config:brpc_with_bthread_tracer": [
"-DBRPC_BTHREAD_TRACER",
"BRPC_BTHREAD_TRACER",
],
"//conditions:default": [],
}),
Expand Down
4 changes: 2 additions & 2 deletions src/bthread/task_tracer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Comment thread
chenBright marked this conversation as resolved.
#include <csignal>
#include <gflags/gflags.h>
#include <poll.h>
Expand Down
Loading