Move fibers out of experimental

Summary: folly::fibers have been used by mcrouter for more than 2 years, so not really experimental. Reviewed By: pavlo-fb Differential Revision: D3320595 fbshipit-source-id: 68188f92b71a4206d57222993848521ca5437ef5
facebook · May 19, 2016 · 2622d2f · 2622d2f
1 parent 6698301
commit 2622d2f
Show file tree

Hide file tree

Showing 40 changed files with 108 additions and 108 deletions.
diff --git a/folly/Makefile.am b/folly/Makefile.am
@@ -96,32 +96,32 @@ nobase_follyinclude_HEADERS = \
 	experimental/EventCount.h \
 	experimental/Instructions.h \
 	experimental/bser/Bser.h \
-	experimental/fibers/AddTasks.h \
-	experimental/fibers/AddTasks-inl.h \
-	experimental/fibers/Baton.h \
-	experimental/fibers/Baton-inl.h \
-	experimental/fibers/BoostContextCompatibility.h \
-	experimental/fibers/EventBaseLoopController.h \
-	experimental/fibers/EventBaseLoopController-inl.h \
-	experimental/fibers/Fiber.h \
-	experimental/fibers/Fiber-inl.h \
-	experimental/fibers/FiberManager.h \
-	experimental/fibers/FiberManager-inl.h \
-	experimental/fibers/FiberManagerMap.h \
-	experimental/fibers/ForEach.h \
-	experimental/fibers/ForEach-inl.h \
-	experimental/fibers/GenericBaton.h \
-	experimental/fibers/GuardPageAllocator.h \
-	experimental/fibers/LoopController.h \
-	experimental/fibers/Promise.h \
-	experimental/fibers/Promise-inl.h \
-	experimental/fibers/SimpleLoopController.h \
-	experimental/fibers/TimedMutex.h \
-	experimental/fibers/TimedMutex-inl.h \
-	experimental/fibers/TimeoutController.h \
-	experimental/fibers/traits.h \
-	experimental/fibers/WhenN.h \
-	experimental/fibers/WhenN-inl.h \
+	fibers/AddTasks.h \
+	fibers/AddTasks-inl.h \
+	fibers/Baton.h \
+	fibers/Baton-inl.h \
+	fibers/BoostContextCompatibility.h \
+	fibers/EventBaseLoopController.h \
+	fibers/EventBaseLoopController-inl.h \
+	fibers/Fiber.h \
+	fibers/Fiber-inl.h \
+	fibers/FiberManager.h \
+	fibers/FiberManager-inl.h \
+	fibers/FiberManagerMap.h \
+	fibers/ForEach.h \
+	fibers/ForEach-inl.h \
+	fibers/GenericBaton.h \
+	fibers/GuardPageAllocator.h \
+	fibers/LoopController.h \
+	fibers/Promise.h \
+	fibers/Promise-inl.h \
+	fibers/SimpleLoopController.h \
+	fibers/TimedMutex.h \
+	fibers/TimedMutex-inl.h \
+	fibers/TimeoutController.h \
+	fibers/traits.h \
+	fibers/WhenN.h \
+	fibers/WhenN-inl.h \
 	experimental/FunctionScheduler.h \
 	experimental/FutureDAG.h \
 	experimental/io/FsUtil.h \
@@ -464,12 +464,12 @@ libfolly_la_SOURCES = \
 	experimental/bser/Dump.cpp \
 	experimental/bser/Load.cpp \
 	experimental/DynamicParser.cpp \
-	experimental/fibers/Baton.cpp \
-	experimental/fibers/Fiber.cpp \
-	experimental/fibers/FiberManager.cpp \
-	experimental/fibers/FiberManagerMap.cpp \
-	experimental/fibers/GuardPageAllocator.cpp \
-	experimental/fibers/TimeoutController.cpp \
+	fibers/Baton.cpp \
+	fibers/Fiber.cpp \
+	fibers/FiberManager.cpp \
+	fibers/FiberManagerMap.cpp \
+	fibers/GuardPageAllocator.cpp \
+	fibers/TimeoutController.cpp \
 	experimental/FunctionScheduler.cpp \
 	experimental/io/FsUtil.cpp \
 	experimental/JSONSchema.cpp \

diff --git a/folly/experimental/fibers/AddTasks-inl.h → folly/fibers/AddTasks-inl.h b/folly/experimental/fibers/AddTasks-inl.h → folly/fibers/AddTasks-inl.h
diff --git a/folly/experimental/fibers/AddTasks.h → folly/fibers/AddTasks.h b/folly/experimental/fibers/AddTasks.h → folly/fibers/AddTasks.h
@@ -19,8 +19,8 @@
 #include <vector>
 
 #include <folly/Optional.h>
-#include <folly/experimental/fibers/FiberManager.h>
-#include <folly/experimental/fibers/Promise.h>
+#include <folly/fibers/FiberManager.h>
+#include <folly/fibers/Promise.h>
 #include <folly/futures/Try.h>
 
 namespace folly {
@@ -131,4 +131,4 @@ class TaskIterator {
 }
 }
 
-#include <folly/experimental/fibers/AddTasks-inl.h>
+#include <folly/fibers/AddTasks-inl.h>
diff --git a/folly/experimental/fibers/Baton-inl.h → folly/fibers/Baton-inl.h b/folly/experimental/fibers/Baton-inl.h → folly/fibers/Baton-inl.h
@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <folly/experimental/fibers/Fiber.h>
-#include <folly/experimental/fibers/FiberManager.h>
+#include <folly/fibers/Fiber.h>
+#include <folly/fibers/FiberManager.h>
 
 namespace folly {
 namespace fibers {

diff --git a/folly/experimental/fibers/Baton.cpp → folly/fibers/Baton.cpp b/folly/experimental/fibers/Baton.cpp → folly/fibers/Baton.cpp
@@ -18,7 +18,7 @@
 #include <chrono>
 
 #include <folly/detail/MemoryIdler.h>
-#include <folly/experimental/fibers/FiberManager.h>
+#include <folly/fibers/FiberManager.h>
 #include <folly/portability/Asm.h>
 
 namespace folly {

diff --git a/folly/experimental/fibers/Baton.h → folly/fibers/Baton.h b/folly/experimental/fibers/Baton.h → folly/fibers/Baton.h
@@ -18,7 +18,7 @@
 #include <atomic>
 
 #include <folly/detail/Futex.h>
-#include <folly/experimental/fibers/TimeoutController.h>
+#include <folly/fibers/TimeoutController.h>
 
 namespace folly {
 namespace fibers {
@@ -188,4 +188,4 @@ class Baton {
 }
 }
 
-#include <folly/experimental/fibers/Baton-inl.h>
+#include <folly/fibers/Baton-inl.h>
diff --git a/...mental/fibers/BoostContextCompatibility.h → folly/fibers/BoostContextCompatibility.h b/...mental/fibers/BoostContextCompatibility.h → folly/fibers/BoostContextCompatibility.h
diff --git a/...ntal/fibers/EventBaseLoopController-inl.h → folly/fibers/EventBaseLoopController-inl.h b/...ntal/fibers/EventBaseLoopController-inl.h → folly/fibers/EventBaseLoopController-inl.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 #include <folly/Memory.h>
-#include <folly/experimental/fibers/EventBaseLoopController.h>
-#include <folly/experimental/fibers/FiberManager.h>
+#include <folly/fibers/EventBaseLoopController.h>
+#include <folly/fibers/FiberManager.h>
 
 namespace folly {
 namespace fibers {

diff --git a/...rimental/fibers/EventBaseLoopController.h → folly/fibers/EventBaseLoopController.h b/...rimental/fibers/EventBaseLoopController.h → folly/fibers/EventBaseLoopController.h
@@ -15,7 +15,7 @@
  */
 #pragma once
 
-#include <folly/experimental/fibers/LoopController.h>
+#include <folly/fibers/LoopController.h>
 #include <folly/io/async/EventBase.h>
 #include <atomic>
 #include <memory>

diff --git a/folly/experimental/fibers/Fiber-inl.h → folly/fibers/Fiber-inl.h b/folly/experimental/fibers/Fiber-inl.h → folly/fibers/Fiber-inl.h
diff --git a/folly/experimental/fibers/Fiber.cpp → folly/fibers/Fiber.cpp b/folly/experimental/fibers/Fiber.cpp → folly/fibers/Fiber.cpp
@@ -25,8 +25,8 @@
 
 #include <folly/Likely.h>
 #include <folly/Portability.h>
-#include <folly/experimental/fibers/BoostContextCompatibility.h>
-#include <folly/experimental/fibers/FiberManager.h>
+#include <folly/fibers/BoostContextCompatibility.h>
+#include <folly/fibers/FiberManager.h>
 #include <folly/portability/SysSyscall.h>
 
 namespace folly {

diff --git a/folly/experimental/fibers/Fiber.h → folly/fibers/Fiber.h b/folly/experimental/fibers/Fiber.h → folly/fibers/Fiber.h
@@ -18,15 +18,15 @@
 #include <functional>
 #include <typeinfo>
 
+#include <boost/context/all.hpp>
+#include <boost/version.hpp>
 #include <folly/AtomicIntrusiveLinkedList.h>
 #include <folly/CPortability.h>
 #include <folly/Function.h>
 #include <folly/IntrusiveList.h>
 #include <folly/Portability.h>
-#include <folly/experimental/fibers/BoostContextCompatibility.h>
+#include <folly/fibers/BoostContextCompatibility.h>
 #include <folly/io/async/Request.h>
-#include <boost/context/all.hpp>
-#include <boost/version.hpp>
 
 namespace folly {
 namespace fibers {
@@ -189,4 +189,4 @@ class Fiber {
 }
 }
 
-#include <folly/experimental/fibers/Fiber-inl.h>
+#include <folly/fibers/Fiber-inl.h>
diff --git a/folly/experimental/fibers/FiberManager-inl.h → folly/fibers/FiberManager-inl.h b/folly/experimental/fibers/FiberManager-inl.h → folly/fibers/FiberManager-inl.h
@@ -25,10 +25,10 @@
 #ifdef __APPLE__
 #include <folly/ThreadLocal.h>
 #endif
-#include <folly/experimental/fibers/Baton.h>
-#include <folly/experimental/fibers/Fiber.h>
-#include <folly/experimental/fibers/LoopController.h>
-#include <folly/experimental/fibers/Promise.h>
+#include <folly/fibers/Baton.h>
+#include <folly/fibers/Fiber.h>
+#include <folly/fibers/LoopController.h>
+#include <folly/fibers/Promise.h>
 #include <folly/futures/Promise.h>
 #include <folly/futures/Try.h>
 

diff --git a/folly/experimental/fibers/FiberManager.cpp → folly/fibers/FiberManager.cpp b/folly/experimental/fibers/FiberManager.cpp → folly/fibers/FiberManager.cpp
@@ -24,8 +24,8 @@
 
 #include <glog/logging.h>
 
-#include <folly/experimental/fibers/Fiber.h>
-#include <folly/experimental/fibers/LoopController.h>
+#include <folly/fibers/Fiber.h>
+#include <folly/fibers/LoopController.h>
 
 #include <folly/SingletonThreadLocal.h>
 

diff --git a/folly/experimental/fibers/FiberManager.h → folly/fibers/FiberManager.h b/folly/experimental/fibers/FiberManager.h → folly/fibers/FiberManager.h
@@ -32,11 +32,11 @@
 #include <folly/io/async/Request.h>
 
 #include <folly/experimental/ExecutionObserver.h>
-#include <folly/experimental/fibers/BoostContextCompatibility.h>
-#include <folly/experimental/fibers/Fiber.h>
-#include <folly/experimental/fibers/GuardPageAllocator.h>
-#include <folly/experimental/fibers/TimeoutController.h>
-#include <folly/experimental/fibers/traits.h>
+#include <folly/fibers/BoostContextCompatibility.h>
+#include <folly/fibers/Fiber.h>
+#include <folly/fibers/GuardPageAllocator.h>
+#include <folly/fibers/TimeoutController.h>
+#include <folly/fibers/traits.h>
 
 namespace folly {
 

diff --git a/...y/experimental/fibers/FiberManagerMap.cpp → folly/fibers/FiberManagerMap.cpp b/...y/experimental/fibers/FiberManagerMap.cpp → folly/fibers/FiberManagerMap.cpp
diff --git a/folly/experimental/fibers/FiberManagerMap.h → folly/fibers/FiberManagerMap.h b/folly/experimental/fibers/FiberManagerMap.h → folly/fibers/FiberManagerMap.h
@@ -15,8 +15,8 @@
  */
 #pragma once
 
-#include <folly/experimental/fibers/EventBaseLoopController.h>
-#include <folly/experimental/fibers/FiberManager.h>
+#include <folly/fibers/EventBaseLoopController.h>
+#include <folly/fibers/FiberManager.h>
 
 namespace folly {
 namespace fibers {

diff --git a/folly/experimental/fibers/ForEach-inl.h → folly/fibers/ForEach-inl.h b/folly/experimental/fibers/ForEach-inl.h → folly/fibers/ForEach-inl.h
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <folly/experimental/fibers/FiberManager.h>
+#include <folly/fibers/FiberManager.h>
 
 namespace folly {
 namespace fibers {

diff --git a/folly/experimental/fibers/ForEach.h → folly/fibers/ForEach.h b/folly/experimental/fibers/ForEach.h → folly/fibers/ForEach.h
@@ -41,4 +41,4 @@ inline void forEach(InputIterator first, InputIterator last, F&& f);
 }
 } // folly::fibers
 
-#include <folly/experimental/fibers/ForEach-inl.h>
+#include <folly/fibers/ForEach-inl.h>
diff --git a/folly/experimental/fibers/GenericBaton.h → folly/fibers/GenericBaton.h b/folly/experimental/fibers/GenericBaton.h → folly/fibers/GenericBaton.h
@@ -17,7 +17,7 @@
 
 #include <folly/Baton.h>
 
-#include <folly/experimental/fibers/Baton.h>
+#include <folly/fibers/Baton.h>
 
 namespace folly {
 namespace fibers {

diff --git a/...xperimental/fibers/GuardPageAllocator.cpp → folly/fibers/GuardPageAllocator.cpp b/...xperimental/fibers/GuardPageAllocator.cpp → folly/fibers/GuardPageAllocator.cpp
diff --git a/.../experimental/fibers/GuardPageAllocator.h → folly/fibers/GuardPageAllocator.h b/.../experimental/fibers/GuardPageAllocator.h → folly/fibers/GuardPageAllocator.h
diff --git a/folly/experimental/fibers/LoopController.h → folly/fibers/LoopController.h b/folly/experimental/fibers/LoopController.h → folly/fibers/LoopController.h
diff --git a/folly/experimental/fibers/Promise-inl.h → folly/fibers/Promise-inl.h b/folly/experimental/fibers/Promise-inl.h → folly/fibers/Promise-inl.h
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <folly/experimental/fibers/Baton.h>
+#include <folly/fibers/Baton.h>
 
 namespace folly {
 namespace fibers {

diff --git a/folly/experimental/fibers/Promise.h → folly/fibers/Promise.h b/folly/experimental/fibers/Promise.h → folly/fibers/Promise.h
@@ -15,7 +15,7 @@
  */
 #pragma once
 
-#include <folly/experimental/fibers/traits.h>
+#include <folly/fibers/traits.h>
 #include <folly/futures/Try.h>
 
 namespace folly {
@@ -101,4 +101,4 @@ class Promise {
 }
 }
 
-#include <folly/experimental/fibers/Promise-inl.h>
+#include <folly/fibers/Promise-inl.h>