about summary refs log tree commit diff
path: root/absl/synchronization
diff options
context:
space:
mode:
authorAbseil Team <absl-team@google.com>2017-09-24T15·20-0700
committerDerek Mauro <dmauro@google.com>2017-09-25T14·12-0400
commitcf6ab6bb2b800fae859ccc735f398d22a7336a00 (patch)
treeee16a94d16734d11f9e91518038e2712ca025433 /absl/synchronization
parent53c239d1fc161975dad32c654e1f42c0ec42f547 (diff)
Changes imported from Abseil "staging" branch:
  - b527a3e4b36b644ac424e3c525b1cd393f6f6c40 Fix some typos in the usage examples by Jorg Brown <jorg@google.com>
  - 82be4a9adf3bb0ddafc0d46274969c99afffe870 Fix typo in optional.h comment. by Abseil Team <absl-team@google.com>
  - d6ee63bf8fc51fba074c23b33cebc28c808d7f07 Remove internal-only identifiers from code. by Daniel Katz <katzdm@google.com>
  - f9c3ad2f0d73f53b21603638af8b4bed636e79f4 Use easier understandable names for absl::StartsWith and ... by Abseil Team <absl-team@google.com>
  - 7c16c14fefee89c927b8789d6043c4691bcffc9b Add -Wno-missing-prototypes back to the LLVM copts. by Derek Mauro <dmauro@google.com>
  - 2f4b7d2e50c7023240242f1e15db60ccd7e8768d IWYU | absl/strings by Juemin Yang <jueminyang@google.com>
  - a99cbcc1daa34a2d6a2bb26de275e05173cc77e9 IWYU | absl/type by Juemin Yang <jueminyang@google.com>
  - 12e1146d0fc76c071d7e0ebaabb62f0a984fae66 Use LLVM_FLAGS and LLVM_TEST_FLAGS when --compiler=llvm. by Derek Mauro <dmauro@google.com>
  - cd6bea616abda558d0bace5bd77455662a233688 IWYU | absl/debugging by Juemin Yang <jueminyang@google.com>
  - d9a7382e59d46a8581b6b7a31cd5a48bb89326e9 IWYU | absl/synchronization by Juemin Yang <jueminyang@google.com>
  - 07ec7d6d5a4a666f4183c5d0ed9c342baa7b24bc IWYU | absl/numeric by Juemin Yang <jueminyang@google.com>
  - 12bfe40051f4270f8707e191af5652f83f2f750c Remove the RoundTrip{Float,Double}ToBuffer routines from ... by Jorg Brown <jorg@google.com>
  - eeb4fd67c9d97f66cb9475c3c5e51ab132f1c810 Adds conversion functions for converting between absl/tim... by Greg Miller <jgm@google.com>
  - 59a2108d05d4ea85dc5cc11e49b2cd2335d4295a Change Substitute to use %.6g formatting rather than 15/1... by Jorg Brown <jorg@google.com>
  - 394becb48e0fcd161642cdaac5120d32567e0ef8 IWYU | absl/meta by Juemin Yang <jueminyang@google.com>
  - 1e5da6e8da336699b2469dcf6dda025b9b0ec4c9 Rewrite atomic_hook.h to not use std::atomic<T*> under Wi... by Greg Falcon <gfalcon@google.com>

GitOrigin-RevId: b527a3e4b36b644ac424e3c525b1cd393f6f6c40
Change-Id: I14e331d91c956ef045ac7927091a9f179716de0c
Diffstat (limited to 'absl/synchronization')
-rw-r--r--absl/synchronization/blocking_counter.cc2
-rw-r--r--absl/synchronization/blocking_counter_test.cc3
-rw-r--r--absl/synchronization/internal/create_thread_identity.cc5
-rw-r--r--absl/synchronization/internal/graphcycles_test.cc13
-rw-r--r--absl/synchronization/internal/per_thread_sem_test.cc2
-rw-r--r--absl/synchronization/mutex.h2
-rw-r--r--absl/synchronization/mutex_test.cc6
7 files changed, 10 insertions, 23 deletions
diff --git a/absl/synchronization/blocking_counter.cc b/absl/synchronization/blocking_counter.cc
index 48e3650da246..7e68e960bc3a 100644
--- a/absl/synchronization/blocking_counter.cc
+++ b/absl/synchronization/blocking_counter.cc
@@ -14,6 +14,8 @@
 
 #include "absl/synchronization/blocking_counter.h"
 
+#include "absl/base/internal/raw_logging.h"
+
 namespace absl {
 
 // Return whether int *arg is zero.
diff --git a/absl/synchronization/blocking_counter_test.cc b/absl/synchronization/blocking_counter_test.cc
index b4b6677234e9..e8223f841a5f 100644
--- a/absl/synchronization/blocking_counter_test.cc
+++ b/absl/synchronization/blocking_counter_test.cc
@@ -14,13 +14,12 @@
 
 #include "absl/synchronization/blocking_counter.h"
 
-#include <functional>
-#include <memory>
 #include <thread>  // NOLINT(build/c++11)
 #include <vector>
 
 #include "gtest/gtest.h"
 #include "absl/time/clock.h"
+#include "absl/time/time.h"
 
 namespace absl {
 namespace {
diff --git a/absl/synchronization/internal/create_thread_identity.cc b/absl/synchronization/internal/create_thread_identity.cc
index 14976347b671..0134a4399b42 100644
--- a/absl/synchronization/internal/create_thread_identity.cc
+++ b/absl/synchronization/internal/create_thread_identity.cc
@@ -12,13 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include <stdint.h>
+#include <new>
+
 // This file is a no-op if the required LowLevelAlloc support is missing.
 #include "absl/base/internal/low_level_alloc.h"
 #ifndef ABSL_LOW_LEVEL_ALLOC_MISSING
 
 #include <string.h>
-#include <atomic>
-#include <memory>
 
 #include "absl/base/internal/spinlock.h"
 #include "absl/base/internal/thread_identity.h"
diff --git a/absl/synchronization/internal/graphcycles_test.cc b/absl/synchronization/internal/graphcycles_test.cc
index 734f2770b26e..9a85b39074d7 100644
--- a/absl/synchronization/internal/graphcycles_test.cc
+++ b/absl/synchronization/internal/graphcycles_test.cc
@@ -12,22 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-// Copyright 2007 Google, Inc.
-// All rights reserved.
-
-// Author: Mike Burrows
-
-// A test for the GraphCycles interface.
-
-// This test is testing a component of //third_party/absl.  As written it
-// heavily uses logging, including VLOG, so this test can't ship with Abseil.
-// We're leaving it here until Abseil gets base/logging.h in a future release.
 #include "absl/synchronization/internal/graphcycles.h"
 
 #include <map>
 #include <random>
-#include <vector>
 #include <unordered_set>
+#include <utility>
+#include <vector>
 
 #include "gtest/gtest.h"
 #include "absl/base/internal/raw_logging.h"
diff --git a/absl/synchronization/internal/per_thread_sem_test.cc b/absl/synchronization/internal/per_thread_sem_test.cc
index 1d072a79e3d4..61296cfca502 100644
--- a/absl/synchronization/internal/per_thread_sem_test.cc
+++ b/absl/synchronization/internal/per_thread_sem_test.cc
@@ -22,13 +22,13 @@
 #include <string>
 #include <thread>              // NOLINT(build/c++11)
 
+#include "gtest/gtest.h"
 #include "absl/base/internal/cycleclock.h"
 #include "absl/base/internal/malloc_extension.h"
 #include "absl/base/internal/thread_identity.h"
 #include "absl/strings/str_cat.h"
 #include "absl/time/clock.h"
 #include "absl/time/time.h"
-#include "gtest/gtest.h"
 
 // In this test we explicitly avoid the use of synchronization
 // primitives which might use PerThreadSem, most notably absl::Mutex.
diff --git a/absl/synchronization/mutex.h b/absl/synchronization/mutex.h
index a417802677cc..8343c9c8961f 100644
--- a/absl/synchronization/mutex.h
+++ b/absl/synchronization/mutex.h
@@ -81,8 +81,8 @@
 
 namespace absl {
 
-struct SynchWaitParams;
 class Condition;
+struct SynchWaitParams;
 
 // -----------------------------------------------------------------------------
 // Mutex
diff --git a/absl/synchronization/mutex_test.cc b/absl/synchronization/mutex_test.cc
index 9cf34fce0271..cfe81096dc98 100644
--- a/absl/synchronization/mutex_test.cc
+++ b/absl/synchronization/mutex_test.cc
@@ -20,7 +20,6 @@
 
 #include <algorithm>
 #include <atomic>
-#include <cstdint>
 #include <cstdlib>
 #include <functional>
 #include <memory>
@@ -32,8 +31,6 @@
 #include "gtest/gtest.h"
 #include "absl/base/internal/raw_logging.h"
 #include "absl/base/internal/sysinfo.h"
-#include "absl/base/macros.h"
-#include "absl/base/thread_annotations.h"
 #include "absl/memory/memory.h"
 #include "absl/synchronization/internal/thread_pool.h"
 #include "absl/time/clock.h"
@@ -713,7 +710,6 @@ static void LockWhenTestWaitForIsCond(LockWhenTestStruct* s) {
 TEST(Mutex, LockWhen) {
   LockWhenTestStruct s;
 
-  // Don't use ThreadPool for this test. See b/65107115.
   std::thread t(LockWhenTestWaitForIsCond, &s);
   s.mu2.LockWhen(absl::Condition(&s.waiting));
   s.mu2.Unlock();
@@ -1041,8 +1037,6 @@ TEST(Mutex, DeadlockDetector) {
   m2.Unlock();
   m4.Unlock();
   m1.Unlock();
-  // Pre b/7636708 the thread local cache remembered that ID1 is assigned to m1.
-  // So, we had a cycle ID1=>ID1=>ID1.
 }
 
 // Bazel has a test "warning" file that programs can write to if the