Move folly/SmallLocks.h to folly/synchronization/

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

Differential Revision: D6806563

fbshipit-source-id: 26c7be6b6a01673a4f58a0952b5c531528f8ca7f

CMakeLists.txt

@@ -636,6 +636,7 @@ if (BUILD_TESTS)
 
     DIRECTORY synchronization/test/
       TEST atomic_struct_test SOURCES AtomicStructTest.cpp
+      TEST small_locks_test SOURCES SmallLocksTest.cpp
 
     DIRECTORY test/
       TEST ahm_int_stress_test SOURCES AHMIntStressTest.cpp
@@ -689,7 +690,7 @@ if (BUILD_TESTS)
           JsonOtherTest.cpp
       TEST lazy_test SOURCES LazyTest.cpp
       TEST lock_traits_test SOURCES LockTraitsTest.cpp
-      TEST locks_test SOURCES SmallLocksTest.cpp SpinLockTest.cpp
+      TEST locks_test SOURCES SpinLockTest.cpp
       TEST logging_test SOURCES LoggingTest.cpp
       TEST math_test SOURCES MathTest.cpp
       TEST map_util_test SOURCES MapUtilTest.cpp

folly/Makefile.am

@@ -411,7 +411,6 @@ nobase_follyinclude_HEADERS = \
 	Singleton.h \
 	Singleton-inl.h \
 	SingletonThreadLocal.h \
-	SmallLocks.h \
 	small_vector.h \
 	SocketAddress.h \
 	sorted_vector_types.h \
@@ -442,6 +441,7 @@ nobase_follyinclude_HEADERS = \
 	synchronization/ParkingLot.h \
 	synchronization/RWSpinLock.h \
 	synchronization/SaturatingSemaphore.h \
+	synchronization/SmallLocks.h \
 	synchronization/Tearable.h \
 	synchronization/WaitOptions.h \
 	synchronization/detail/AtomicUtils.h \

folly/PackedSyncPtr.h

@@ -21,7 +21,7 @@
 #include <glog/logging.h>
 
 #include <folly/Portability.h>
-#include <folly/SmallLocks.h>
+#include <folly/synchronization/SmallLocks.h>
 
 #if !FOLLY_X64 && !FOLLY_PPC64 && !FOLLY_AARCH64
 #error "PackedSyncPtr is x64, ppc64 or aarch64 specific code."

folly/SpinLock.h

@@ -37,7 +37,7 @@
 #include <boost/noncopyable.hpp>
 
 #include <folly/Portability.h>
-#include <folly/SmallLocks.h>
+#include <folly/synchronization/SmallLocks.h>
 
 namespace folly {
 

folly/small_vector.h

@@ -48,13 +48,13 @@
 #include <folly/ConstexprMath.h>
 #include <folly/FormatTraits.h>
 #include <folly/Portability.h>
-#include <folly/SmallLocks.h>
 #include <folly/Traits.h>
 #include <folly/lang/Assume.h>
 #include <folly/memory/Malloc.h>
 #include <folly/portability/BitsFunctexcept.h>
 #include <folly/portability/Malloc.h>
 #include <folly/portability/TypeTraits.h>
+#include <folly/synchronization/SmallLocks.h>
 
 // Ignore shadowing warnings within this file, so includers can use -Wshadow.
 FOLLY_PUSH_WARNING

folly/test/SmallLocksBenchmark.cpp → folly/synchronization/test/SmallLocksBenchmark.cpp

@@ -22,7 +22,7 @@
 #include <vector>
 
 #include <folly/Benchmark.h>
-#include <folly/SmallLocks.h>
+#include <folly/synchronization/SmallLocks.h>
 
 /* "Work cycle" is just an additional nop loop iteration.
  * A smaller number of work cyles will result in more contention,

folly/test/SmallLocksTest.cpp → folly/synchronization/test/SmallLocksTest.cpp

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <folly/SmallLocks.h>
+#include <folly/synchronization/SmallLocks.h>
 
 #include <cassert>
 #include <condition_variable>

folly/test/Makefile.am

@@ -54,7 +54,7 @@ constexpr_math_test_LDADD = libfollytestmain.la
 TESTS += constexpr_math_test
 
 if RUN_ARCH_SPECIFIC_TESTS
-small_locks_test_SOURCES = SmallLocksTest.cpp
+small_locks_test_SOURCES = ../synchronization/test/SmallLocksTest.cpp
 small_locks_test_LDADD = libfollytestmain.la
 TESTS += small_locks_test