From 18172db622389a6401ce731cc25a0870baa816fa Mon Sep 17 00:00:00 2001
From: James Sedgwick <jsedgwick@fb.com>
Date: Thu, 19 Oct 2017 14:08:04 -0700
Subject: [PATCH] move CallOnce to synchronization/

Summary: as above

Reviewed By: knekritz

Differential Revision: D6088687

fbshipit-source-id: 0efbb7f5fa33b5f553c0c2019658370fc6e8613f
---
 CMakeLists.txt                                         | 4 +++-
 folly/Makefile.am                                      | 2 +-
 folly/Random.cpp                                       | 2 +-
 folly/io/async/EventBase.h                             | 2 +-
 folly/{ => synchronization}/CallOnce.h                 | 0
 folly/{ => synchronization}/test/CallOnceBenchmark.cpp | 2 +-
 folly/{ => synchronization}/test/CallOnceTest.cpp      | 2 +-
 7 files changed, 8 insertions(+), 6 deletions(-)
 rename folly/{ => synchronization}/CallOnce.h (100%)
 rename folly/{ => synchronization}/test/CallOnceBenchmark.cpp (97%)
 rename folly/{ => synchronization}/test/CallOnceTest.cpp (97%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 68fdc288..e41ba08d 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -475,6 +475,9 @@ if (BUILD_TESTS)
       TEST timeseries_histogram_test SOURCES TimeseriesHistogramTest.cpp
       TEST timeseries_test SOURCES TimeseriesTest.cpp
 
+    DIRECTORY synchronization/test/
+      TEST call_once_test SOURCES CallOnceTest.cpp
+
     DIRECTORY test/
       TEST ahm_int_stress_test SOURCES AHMIntStressTest.cpp
       TEST arena_test SOURCES ArenaTest.cpp
@@ -492,7 +495,6 @@ if (BUILD_TESTS)
       TEST bit_iterator_test SOURCES BitIteratorTest.cpp
       TEST bits_test SOURCES BitsTest.cpp
       TEST cacheline_padded_test SOURCES CachelinePaddedTest.cpp
-      TEST call_once_test SOURCES CallOnceTest.cpp
       TEST checksum_test SOURCES ChecksumTest.cpp
       TEST clock_gettime_wrappers_test SOURCES ClockGettimeWrappersTest.cpp
       TEST concurrent_skip_list_test SOURCES ConcurrentSkipListTest.cpp
diff --git a/folly/Makefile.am b/folly/Makefile.am
index 2223da74..344dc3ae 100644
--- a/folly/Makefile.am
+++ b/folly/Makefile.am
@@ -44,7 +44,6 @@ nobase_follyinclude_HEADERS = \
 	Benchmark.h \
 	Bits.h \
 	CachelinePadded.h \
-	CallOnce.h \
 	Chrono.h \
 	ClockGettimeWrappers.h \
 	ConcurrentSkipList.h \
@@ -419,6 +418,7 @@ nobase_follyinclude_HEADERS = \
 	stats/MultiLevelTimeSeries.h \
 	stats/TimeseriesHistogram-defs.h \
 	stats/TimeseriesHistogram.h \
+	synchronization/CallOnce.h \
 	stop_watch.h \
 	String.h \
 	String-inl.h \
diff --git a/folly/Random.cpp b/folly/Random.cpp
index 524b9d06..f643fb52 100644
--- a/folly/Random.cpp
+++ b/folly/Random.cpp
@@ -21,13 +21,13 @@
 #include <mutex>
 #include <random>
 
-#include <folly/CallOnce.h>
 #include <folly/File.h>
 #include <folly/FileUtil.h>
 #include <folly/SingletonThreadLocal.h>
 #include <folly/ThreadLocal.h>
 #include <folly/portability/SysTime.h>
 #include <folly/portability/Unistd.h>
+#include <folly/synchronization/CallOnce.h>
 #include <glog/logging.h>
 
 #ifdef _MSC_VER
diff --git a/folly/io/async/EventBase.h b/folly/io/async/EventBase.h
index 670d6af6..1454c847 100644
--- a/folly/io/async/EventBase.h
+++ b/folly/io/async/EventBase.h
@@ -35,7 +35,6 @@
 #include <boost/utility.hpp>
 #include <glog/logging.h>
 
-#include <folly/CallOnce.h>
 #include <folly/Executor.h>
 #include <folly/Function.h>
 #include <folly/Portability.h>
@@ -47,6 +46,7 @@
 #include <folly/io/async/Request.h>
 #include <folly/io/async/TimeoutManager.h>
 #include <folly/portability/Event.h>
+#include <folly/synchronization/CallOnce.h>
 
 namespace folly {
 
diff --git a/folly/CallOnce.h b/folly/synchronization/CallOnce.h
similarity index 100%
rename from folly/CallOnce.h
rename to folly/synchronization/CallOnce.h
diff --git a/folly/test/CallOnceBenchmark.cpp b/folly/synchronization/test/CallOnceBenchmark.cpp
similarity index 97%
rename from folly/test/CallOnceBenchmark.cpp
rename to folly/synchronization/test/CallOnceBenchmark.cpp
index 5aca0c1a..f85b23b5 100644
--- a/folly/test/CallOnceBenchmark.cpp
+++ b/folly/synchronization/test/CallOnceBenchmark.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <folly/CallOnce.h>
+#include <folly/synchronization/CallOnce.h>
 
 #include <deque>
 #include <mutex>
diff --git a/folly/test/CallOnceTest.cpp b/folly/synchronization/test/CallOnceTest.cpp
similarity index 97%
rename from folly/test/CallOnceTest.cpp
rename to folly/synchronization/test/CallOnceTest.cpp
index e0dccd81..81bcbe55 100644
--- a/folly/test/CallOnceTest.cpp
+++ b/folly/synchronization/test/CallOnceTest.cpp
@@ -18,9 +18,9 @@
 #include <mutex>
 #include <thread>
 
-#include <folly/CallOnce.h>
 #include <folly/portability/GFlags.h>
 #include <folly/portability/GTest.h>
+#include <folly/synchronization/CallOnce.h>
 
 #include <glog/logging.h>
 
-- 
2.34.1