Move folly/detail/AtomicUtils.h

Summary: [Folly] Move `folly/detail/AtomicUtils.h` to `folly/synchronization/detail/`.

Reviewed By: Orvid

Differential Revision: D6180482

fbshipit-source-id: 5671c149a59eea824db2935ffabcf85a2f78b690

diff --git a/folly/AtomicStruct.h b/folly/AtomicStruct.h
index e32976040793c5b555e4b0786726f7c322889997..a774d31500fd952afd49e1a326560d30e3c5eaa6 100644 (file)
--- a/folly/AtomicStruct.h
+++ b/folly/AtomicStruct.h
@@ -17,7 +17,7 @@
 #pragma once
 
 #include <folly/Traits.h>
-#include <folly/detail/AtomicUtils.h>
+#include <folly/synchronization/detail/AtomicUtils.h>
 #include <stdint.h>
 #include <string.h>
 #include <atomic>

diff --git a/folly/Makefile.am b/folly/Makefile.am
index bb51537974415b8abc470c68bad7be1d469524da..f2b89b7e7de4dc6fc12536beb7dfaaea3b8c0033 100644 (file)
--- a/folly/Makefile.am
+++ b/folly/Makefile.am
@@ -67,7 +67,6 @@ nobase_follyinclude_HEADERS = \
        ConstexprMath.h \
        detail/AtomicHashUtils.h \
        detail/AtomicUnorderedMapUtils.h \
-       detail/AtomicUtils.h \
        detail/BitIteratorDetail.h \
        detail/DiscriminatedPtrDetail.h \
        detail/FileUtilDetail.h \
@@ -418,6 +417,7 @@ nobase_follyinclude_HEADERS = \
        stats/TimeseriesHistogram-defs.h \
        stats/TimeseriesHistogram.h \
        synchronization/CallOnce.h \
+       synchronization/detail/AtomicUtils.h \
        system/MemoryMapping.h \
        system/Shell.h \
        system/ThreadId.h \

diff --git a/folly/concurrency/AtomicSharedPtr.h b/folly/concurrency/AtomicSharedPtr.h
index bd400d3cf01e71e1ff22387feb2525cdc406df91..d1b2aa7a1d888714f2d79befbd6c5de0c55f9303 100644 (file)
--- a/folly/concurrency/AtomicSharedPtr.h
+++ b/folly/concurrency/AtomicSharedPtr.h
@@ -18,7 +18,7 @@
 #include <folly/AtomicStruct.h>
 #include <folly/PackedSyncPtr.h>
 #include <folly/concurrency/detail/AtomicSharedPtr-detail.h>
-#include <folly/detail/AtomicUtils.h>
+#include <folly/synchronization/detail/AtomicUtils.h>
 #include <atomic>
 #include <thread>
 

diff --git a/folly/detail/AtomicUtils.h b/folly/detail/AtomicUtils.h
deleted file mode 100644 (file)
index ff6a85e..0000000
--- a/folly/detail/AtomicUtils.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2017 Facebook, Inc.
- *
- * 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.
- */
-
-#pragma once
-
-#include <atomic>
-
-namespace folly {
-namespace detail {
-
-inline std::memory_order default_failure_memory_order(
-    std::memory_order successMode) {
-  switch (successMode) {
-    case std::memory_order_acq_rel:
-      return std::memory_order_acquire;
-    case std::memory_order_release:
-      return std::memory_order_relaxed;
-    default:
-      return successMode;
-  }
-}
-} // namespace detail
-} // namespace folly

diff --git a/folly/synchronization/detail/AtomicUtils.h b/folly/synchronization/detail/AtomicUtils.h
new file mode 100644 (file)
index 0000000..ff6a85e
--- /dev/null
+++ b/folly/synchronization/detail/AtomicUtils.h
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2017 Facebook, Inc.
+ *
+ * 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.
+ */
+
+#pragma once
+
+#include <atomic>
+
+namespace folly {
+namespace detail {
+
+inline std::memory_order default_failure_memory_order(
+    std::memory_order successMode) {
+  switch (successMode) {
+    case std::memory_order_acq_rel:
+      return std::memory_order_acquire;
+    case std::memory_order_release:
+      return std::memory_order_relaxed;
+    default:
+      return successMode;
+  }
+}
+} // namespace detail
+} // namespace folly

diff --git a/folly/test/DeterministicSchedule.h b/folly/test/DeterministicSchedule.h
index 0f243d369cddc5c12121c1b41821ebbcaa23ac36..d085dcb02c68ec62f036b42403485b69304ce6f7 100644 (file)
--- a/folly/test/DeterministicSchedule.h
+++ b/folly/test/DeterministicSchedule.h
@@ -29,9 +29,9 @@
 
 #include <folly/ScopeGuard.h>
 #include <folly/concurrency/CacheLocality.h>
-#include <folly/detail/AtomicUtils.h>
 #include <folly/detail/Futex.h>
 #include <folly/portability/Semaphore.h>
+#include <folly/synchronization/detail/AtomicUtils.h>
 
 namespace folly {
 namespace test {