From 7457019029c72a082174078357c67e2e176f21d4 Mon Sep 17 00:00:00 2001
From: Yedidya Feldblum <yfeldblum@fb.com>
Date: Thu, 5 Oct 2017 15:40:50 -0700
Subject: [PATCH] Move GlobalThreadPoolList.h into folly/concurrency/

Summary:
[Folly] Move `GlobalThreadPoolList.h` into `folly/concurrency/`.

This seems like a better place than the top-level. It seems reasonable because this has *something* to do with concurrency. This is used by executors, but is not itself an executor, so it was not clear that it should go to `folly/executors/`, although that also seems like quite the reasonable choice.

Reviewed By: Orvid

Differential Revision: D5985142

fbshipit-source-id: 6117d133757af74023d6cffb838741da83d173bd
---
 folly/Makefile.am                                | 4 ++--
 folly/{ => concurrency}/GlobalThreadPoolList.cpp | 2 +-
 folly/{ => concurrency}/GlobalThreadPoolList.h   | 0
 folly/executors/ThreadPoolExecutor.cpp           | 2 +-
 folly/executors/ThreadPoolExecutor.h             | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
 rename folly/{ => concurrency}/GlobalThreadPoolList.cpp (99%)
 rename folly/{ => concurrency}/GlobalThreadPoolList.h (100%)

diff --git a/folly/Makefile.am b/folly/Makefile.am
index cb6c1074..90837eef 100644
--- a/folly/Makefile.am
+++ b/folly/Makefile.am
@@ -59,6 +59,7 @@ nobase_follyinclude_HEADERS = \
 	concurrency/CacheLocality.h \
 	concurrency/ConcurrentHashMap.h \
 	concurrency/CoreCachedSharedPtr.h \
+	concurrency/GlobalThreadPoolList.h \
 	concurrency/detail/ConcurrentHashMap-detail.h \
 	ConstexprMath.h \
 	detail/AtomicHashUtils.h \
@@ -241,7 +242,6 @@ nobase_follyinclude_HEADERS = \
 	gen/ParallelMap-inl.h \
 	gen/String.h \
 	gen/String-inl.h \
-	GlobalThreadPoolList.h \
 	GroupVarint.h \
 	Hash.h \
 	IPAddress.h \
@@ -489,6 +489,7 @@ libfolly_la_SOURCES = \
 	Checksum.cpp \
 	ClockGettimeWrappers.cpp \
 	concurrency/CacheLocality.cpp \
+	concurrency/GlobalThreadPoolList.cpp \
 	detail/Futex.cpp \
 	detail/IPAddress.cpp \
 	detail/StaticSingletonManager.cpp \
@@ -515,7 +516,6 @@ libfolly_la_SOURCES = \
 	executors/ThreadedExecutor.cpp \
 	experimental/hazptr/hazptr.cpp \
 	experimental/hazptr/memory_resource.cpp \
-	GlobalThreadPoolList.cpp \
 	GroupVarint.cpp \
 	GroupVarintTables.cpp \
 	hash/SpookyHashV1.cpp \
diff --git a/folly/GlobalThreadPoolList.cpp b/folly/concurrency/GlobalThreadPoolList.cpp
similarity index 99%
rename from folly/GlobalThreadPoolList.cpp
rename to folly/concurrency/GlobalThreadPoolList.cpp
index 075baa72..680193d2 100644
--- a/folly/GlobalThreadPoolList.cpp
+++ b/folly/concurrency/GlobalThreadPoolList.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <folly/GlobalThreadPoolList.h>
+#include <folly/concurrency/GlobalThreadPoolList.h>
 
 #include <memory>
 #include <string>
diff --git a/folly/GlobalThreadPoolList.h b/folly/concurrency/GlobalThreadPoolList.h
similarity index 100%
rename from folly/GlobalThreadPoolList.h
rename to folly/concurrency/GlobalThreadPoolList.h
diff --git a/folly/executors/ThreadPoolExecutor.cpp b/folly/executors/ThreadPoolExecutor.cpp
index 552d981c..227f2b1d 100644
--- a/folly/executors/ThreadPoolExecutor.cpp
+++ b/folly/executors/ThreadPoolExecutor.cpp
@@ -16,7 +16,7 @@
 
 #include <folly/executors/ThreadPoolExecutor.h>
 
-#include <folly/GlobalThreadPoolList.h>
+#include <folly/concurrency/GlobalThreadPoolList.h>
 
 namespace folly {
 
diff --git a/folly/executors/ThreadPoolExecutor.h b/folly/executors/ThreadPoolExecutor.h
index 1e270b4c..79ca2905 100644
--- a/folly/executors/ThreadPoolExecutor.h
+++ b/folly/executors/ThreadPoolExecutor.h
@@ -17,9 +17,9 @@
 #pragma once
 #include <folly/Baton.h>
 #include <folly/Executor.h>
-#include <folly/GlobalThreadPoolList.h>
 #include <folly/Memory.h>
 #include <folly/RWSpinLock.h>
+#include <folly/concurrency/GlobalThreadPoolList.h>
 #include <folly/executors/LifoSemMPMCQueue.h>
 #include <folly/executors/NamedThreadFactory.h>
 #include <folly/io/async/Request.h>
-- 
2.34.1