From 078d29f70bac3893084ae1183560a29c8afdb028 Mon Sep 17 00:00:00 2001
From: Yedidya Feldblum <yfeldblum@fb.com>
Date: Mon, 25 Dec 2017 17:07:39 -0800
Subject: [PATCH] Move folly/AtomicStruct.h to folly/synchronization/

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

Reviewed By: Orvid

Differential Revision: D6636072

fbshipit-source-id: 87098e25fc40d0d60b4a657ba395418388e170fc
---
 folly/IndexedMemPool.h                                | 2 +-
 folly/Makefile.am                                     | 2 +-
 folly/concurrency/AtomicSharedPtr.h                   | 2 +-
 folly/detail/MemoryIdler.h                            | 2 +-
 folly/{ => synchronization}/AtomicStruct.h            | 0
 folly/synchronization/LifoSem.h                       | 2 +-
 folly/{ => synchronization}/test/AtomicStructTest.cpp | 2 +-
 7 files changed, 6 insertions(+), 6 deletions(-)
 rename folly/{ => synchronization}/AtomicStruct.h (100%)
 rename folly/{ => synchronization}/test/AtomicStructTest.cpp (97%)

diff --git a/folly/IndexedMemPool.h b/folly/IndexedMemPool.h
index cab5cac1..14661dd7 100644
--- a/folly/IndexedMemPool.h
+++ b/folly/IndexedMemPool.h
@@ -23,11 +23,11 @@
 #include <type_traits>
 
 #include <boost/noncopyable.hpp>
-#include <folly/AtomicStruct.h>
 #include <folly/Portability.h>
 #include <folly/concurrency/CacheLocality.h>
 #include <folly/portability/SysMman.h>
 #include <folly/portability/Unistd.h>
+#include <folly/synchronization/AtomicStruct.h>
 
 // Ignore shadowing warnings within this file, so includers can use -Wshadow.
 FOLLY_PUSH_WARNING
diff --git a/folly/Makefile.am b/folly/Makefile.am
index 6df61c3c..ec1e2e67 100644
--- a/folly/Makefile.am
+++ b/folly/Makefile.am
@@ -34,7 +34,6 @@ nobase_follyinclude_HEADERS = \
 	AtomicHashMap-inl.h \
 	AtomicIntrusiveLinkedList.h \
 	AtomicLinkedList.h \
-	AtomicStruct.h \
 	AtomicUnorderedMap.h \
 	Benchmark.h \
 	Bits.h \
@@ -436,6 +435,7 @@ nobase_follyinclude_HEADERS = \
 	stats/TimeseriesHistogram-defs.h \
 	stats/TimeseriesHistogram.h \
 	synchronization/AsymmetricMemoryBarrier.h \
+	synchronization/AtomicStruct.h \
 	synchronization/Baton.h \
 	synchronization/CallOnce.h \
 	synchronization/LifoSem.h \
diff --git a/folly/concurrency/AtomicSharedPtr.h b/folly/concurrency/AtomicSharedPtr.h
index d1b2aa7a..7b2e697e 100644
--- a/folly/concurrency/AtomicSharedPtr.h
+++ b/folly/concurrency/AtomicSharedPtr.h
@@ -15,9 +15,9 @@
  */
 #pragma once
 
-#include <folly/AtomicStruct.h>
 #include <folly/PackedSyncPtr.h>
 #include <folly/concurrency/detail/AtomicSharedPtr-detail.h>
+#include <folly/synchronization/AtomicStruct.h>
 #include <folly/synchronization/detail/AtomicUtils.h>
 #include <atomic>
 #include <thread>
diff --git a/folly/detail/MemoryIdler.h b/folly/detail/MemoryIdler.h
index 1cabfecc..1a924b57 100644
--- a/folly/detail/MemoryIdler.h
+++ b/folly/detail/MemoryIdler.h
@@ -19,10 +19,10 @@
 #include <atomic>
 #include <chrono>
 
-#include <folly/AtomicStruct.h>
 #include <folly/Traits.h>
 #include <folly/detail/Futex.h>
 #include <folly/hash/Hash.h>
+#include <folly/synchronization/AtomicStruct.h>
 #include <folly/system/ThreadId.h>
 
 namespace folly {
diff --git a/folly/AtomicStruct.h b/folly/synchronization/AtomicStruct.h
similarity index 100%
rename from folly/AtomicStruct.h
rename to folly/synchronization/AtomicStruct.h
diff --git a/folly/synchronization/LifoSem.h b/folly/synchronization/LifoSem.h
index b06ec4ca..102154cf 100644
--- a/folly/synchronization/LifoSem.h
+++ b/folly/synchronization/LifoSem.h
@@ -23,10 +23,10 @@
 #include <memory>
 #include <system_error>
 
-#include <folly/AtomicStruct.h>
 #include <folly/CachelinePadded.h>
 #include <folly/IndexedMemPool.h>
 #include <folly/Likely.h>
+#include <folly/synchronization/AtomicStruct.h>
 #include <folly/synchronization/Baton.h>
 
 namespace folly {
diff --git a/folly/test/AtomicStructTest.cpp b/folly/synchronization/test/AtomicStructTest.cpp
similarity index 97%
rename from folly/test/AtomicStructTest.cpp
rename to folly/synchronization/test/AtomicStructTest.cpp
index 507f164c..59d3467a 100644
--- a/folly/test/AtomicStructTest.cpp
+++ b/folly/synchronization/test/AtomicStructTest.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <folly/AtomicStruct.h>
+#include <folly/synchronization/AtomicStruct.h>
 
 #include <folly/portability/GTest.h>
 
-- 
2.34.1