Skip to content

abseil: update to latest #12561

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattklein123 merged 5 commits into from
Aug 10, 2020
Merged

abseil: update to latest #12561

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b886394
abseil: update to latest
mattklein123 Aug 8, 2020
95e84c3
Merge remote-tracking branch 'origin/master' into absl_update
mattklein123 Aug 10, 2020
bd69093
fix
mattklein123 Aug 10, 2020
05e7737
temp flake fix
mattklein123 Aug 10, 2020
232e239
Merge remote-tracking branch 'origin/master' into absl_update
mattklein123 Aug 10, 2020
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
3 changes: 3 additions & 0 deletions .bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,9 @@ build:clang-tsan --build_tag_filters=-no_san,-no_tsan
build:clang-tsan --test_tag_filters=-no_san,-no_tsan
# Needed due to https://github.com/libevent/libevent/issues/777
build:clang-tsan --copt -DEVENT__DISABLE_DEBUG_MODE
# https://github.com/abseil/abseil-cpp/issues/760
# https://github.com/google/sanitizers/issues/953
build:clang-tsan --test_env="TSAN_OPTIONS=report_atomic_races=0"

# Clang MSAN - this is the base config for remote-msan and docker-msan. To run this config without
# our build image, follow https://github.com/google/sanitizers/wiki/MemorySanitizerLibcxxHowTo
Expand Down
8 changes: 4 additions & 4 deletions bazel/repository_locations.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,10 @@ DEPENDENCY_REPOSITORIES = dict(
cpe = "N/A",
),
com_google_absl = dict(
sha256 = "ec8ef47335310cc3382bdc0d0cc1097a001e67dc83fcba807845aa5696e7e1e4",
strip_prefix = "abseil-cpp-302b250e1d917ede77b5ff00a6fd9f28430f1563",
# 2020-07-13
urls = ["https://github.com/abseil/abseil-cpp/archive/302b250e1d917ede77b5ff00a6fd9f28430f1563.tar.gz"],
sha256 = "573baccd67aa591b8c7209bfb0c77e0d15633d77ced39d1ccbb1232828f7f7d9",
strip_prefix = "abseil-cpp-ce4bc927755fdf0ed03d679d9c7fa041175bb3cb",
# 2020-08-08
urls = ["https://github.com/abseil/abseil-cpp/archive/ce4bc927755fdf0ed03d679d9c7fa041175bb3cb.tar.gz"],
use_category = ["dataplane", "controlplane"],
cpe = "N/A",
),
Expand Down
2 changes: 1 addition & 1 deletion test/integration/fake_upstream.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,7 +709,7 @@ FakeRawConnection::waitForData(const std::function<bool(const std::string&)>& da
AssertionResult FakeRawConnection::write(const std::string& data, bool end_stream,
milliseconds timeout) {
return shared_connection_.executeOnDispatcher(
[&data, end_stream](Network::Connection& connection) {
[data, end_stream](Network::Connection& connection) {
Buffer::OwnedImpl to_write(data);
connection.write(to_write, end_stream);
},
Expand Down
2 changes: 1 addition & 1 deletion test/integration/fake_upstream.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ class SharedConnectionWrapper : public Network::ConnectionCallbacks {
return testing::AssertionSuccess();
}
Thread::CondVar callback_ready_event;
bool unexpected_disconnect = false;
std::atomic<bool> unexpected_disconnect = false;
connection_.dispatcher().post(
[this, f, &callback_ready_event, &unexpected_disconnect]() -> void {
// The use of connected() here, vs. !disconnected_, is because we want to use the lock_
Expand Down