From 419f3184f8ebcdb23105295eadd2a569f3351eb9 Mon Sep 17 00:00:00 2001 From: Abseil Team Date: Thu, 28 Feb 2019 09:21:10 -0800 Subject: Export of internal Abseil changes. -- 92e1bd6dc9e64163659028b640427d6d8573e41c by Abseil Team : Don't enable ABSL_HAVE_STD_IS_TRIVIALLY_ASSIGNABLE with MSVC when used with nvcc. With nvcc on Windows __has_trivial_assign(int) is false; that leads to a failure of the check in is_trivially_copy_assignable. A better solution would probably be to use the std-provided check in this case, but that seems like a more intrusive change. PiperOrigin-RevId: 236135209 -- 26cee4a7e647076b4e2f88375b4848d1469e55ed by Derek Mauro : Remove hashtablez_force_sampling from the open-source release. This should not have been released. It is internal-only and not portable. Fixes https://github.com/abseil/abseil-cpp/issues/268 PiperOrigin-RevId: 235978666 -- 935a885ec0e108963014f1bb79f00102da8f3871 by CJ Johnson : Internal change PiperOrigin-RevId: 235976027 -- 1c148c89de6064031f1ad9f2eeac0331bd77b7b0 by Tom Manshreck : Add design note for absl::from_chars to abseil.io Fixes #165 PiperOrigin-RevId: 235975923 GitOrigin-RevId: 92e1bd6dc9e64163659028b640427d6d8573e41c Change-Id: I220b0bbb46742070ea8c2a94b06007ecae76fe0f --- absl/container/BUILD.bazel | 23 --------- absl/container/CMakeLists.txt | 24 --------- .../internal/hashtablez_force_sampling.cc | 24 --------- .../internal/hashtablez_force_sampling_test.cc | 60 ---------------------- 4 files changed, 131 deletions(-) delete mode 100644 absl/container/internal/hashtablez_force_sampling.cc delete mode 100644 absl/container/internal/hashtablez_force_sampling_test.cc (limited to 'absl/container') diff --git a/absl/container/BUILD.bazel b/absl/container/BUILD.bazel index f3b3a2c0b42f..91013e04b0d0 100644 --- a/absl/container/BUILD.bazel +++ b/absl/container/BUILD.bazel @@ -446,15 +446,6 @@ cc_library( copts = ABSL_DEFAULT_COPTS, ) -cc_library( - name = "hashtablez_force_sampling", - srcs = ["internal/hashtablez_force_sampling.cc"], - copts = ABSL_DEFAULT_COPTS, - deps = [ - ":hashtablez_sampler", - ], -) - cc_library( name = "hashtablez_sampler", srcs = [ @@ -488,20 +479,6 @@ cc_test( ], ) -cc_test( - name = "hashtablez_force_sampling_test", - srcs = ["internal/hashtablez_force_sampling_test.cc"], - tags = [ - "no_test_darwin_x86_64", - "no_test_msvc_x64", - ], - deps = [ - ":hashtablez_force_sampling", - ":hashtablez_sampler", - "@com_google_googletest//:gtest_main", - ], -) - cc_library( name = "node_hash_policy", hdrs = ["internal/node_hash_policy.h"], diff --git a/absl/container/CMakeLists.txt b/absl/container/CMakeLists.txt index 822388bd5518..c6053d745799 100644 --- a/absl/container/CMakeLists.txt +++ b/absl/container/CMakeLists.txt @@ -464,30 +464,6 @@ absl_cc_test( gmock_main ) -absl_cc_library( - NAME - hashtablez_force_sampling - SRCS - "internal/hashtablez_force_sampling.cc" - COPTS - ${ABSL_DEFAULT_COPTS} - DEPS - absl::base - absl::have_sse - absl::synchronization -) - -absl_cc_test( - NAME - hashtablez_force_sampling_test - SRCS - "internal/hashtablez_force_sampling_test.cc" - DEPS - absl::hashtablez_force_sampling - absl::hashtablez_sampler - gmock_main -) - absl_cc_library( NAME hashtable_debug diff --git a/absl/container/internal/hashtablez_force_sampling.cc b/absl/container/internal/hashtablez_force_sampling.cc deleted file mode 100644 index 868976ec5240..000000000000 --- a/absl/container/internal/hashtablez_force_sampling.cc +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2018 The Abseil Authors. -// -// Licensed 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. - -#include "absl/container/internal/hashtablez_sampler.h" - -namespace absl { -namespace container_internal { - -// See hashtablez_sampler.h for details. -extern "C" const bool kAbslContainerInternalSampleEverything = true; - -} // namespace container_internal -} // namespace absl diff --git a/absl/container/internal/hashtablez_force_sampling_test.cc b/absl/container/internal/hashtablez_force_sampling_test.cc deleted file mode 100644 index 9ff1046a9ad3..000000000000 --- a/absl/container/internal/hashtablez_force_sampling_test.cc +++ /dev/null @@ -1,60 +0,0 @@ -// Copyright 2018 The Abseil Authors. -// -// Licensed 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. - -#include - -#include "gmock/gmock.h" -#include "gtest/gtest.h" -#include "absl/container/internal/hashtablez_sampler.h" - -namespace absl { -namespace container_internal { - -class HashtablezInfoHandlePeer { - public: - static bool IsSampled(const HashtablezInfoHandle& h) { - return h.info_ != nullptr; - } -}; - -namespace { - -bool samples[3]{true, true, true}; - -// We do this test in a global object to test that this works even before main. -struct Global { - Global() { - // By default it is sampled. - samples[0] = HashtablezInfoHandlePeer::IsSampled(Sample()); - - // Even with a large parameter, it is sampled. - SetHashtablezSampleParameter(100); - samples[1] = HashtablezInfoHandlePeer::IsSampled(Sample()); - - // Even if we turn it off, it is still sampled. - SetHashtablezEnabled(false); - samples[2] = HashtablezInfoHandlePeer::IsSampled(Sample()); - } -} global; - -TEST(kAbslContainerInternalSampleEverything, Works) { - EXPECT_THAT(samples, testing::Each(true)); - EXPECT_TRUE(kAbslContainerInternalSampleEverything); - // One more after main() - EXPECT_TRUE(HashtablezInfoHandlePeer::IsSampled(Sample())); -} - -} // namespace -} // namespace container_internal -} // namespace absl -- cgit 1.4.1