From 11b73c8f4fcb5d00b030d14cb4894b6cfb199039 Mon Sep 17 00:00:00 2001 From: James Sedgwick Date: Tue, 17 Oct 2017 20:21:36 -0700 Subject: [PATCH] move python/NotificationQueueExecutor to futures/ Summary: as above Reviewed By: yfeldblum Differential Revision: D6076757 fbshipit-source-id: afe144129e8a0242ba6baee96a84a9084e6e2571 --- folly/Makefile.am | 1 + folly/{python => executors}/NotificationQueueExecutor.h | 2 -- folly/python/executor.pxd | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) rename folly/{python => executors}/NotificationQueueExecutor.h (97%) diff --git a/folly/Makefile.am b/folly/Makefile.am index ad956fb4..2e172ead 100644 --- a/folly/Makefile.am +++ b/folly/Makefile.am @@ -96,6 +96,7 @@ nobase_follyinclude_HEADERS = \ executors/IOThreadPoolExecutor.h \ executors/LifoSemMPMCQueue.h \ executors/NamedThreadFactory.h \ + executors/NotificationQueueExecutor.h \ executors/PriorityLifoSemMPMCQueue.h \ executors/PriorityThreadFactory.h \ executors/SerialExecutor.h \ diff --git a/folly/python/NotificationQueueExecutor.h b/folly/executors/NotificationQueueExecutor.h similarity index 97% rename from folly/python/NotificationQueueExecutor.h rename to folly/executors/NotificationQueueExecutor.h index 7bd8f2a4..3738be24 100644 --- a/folly/python/NotificationQueueExecutor.h +++ b/folly/executors/NotificationQueueExecutor.h @@ -21,7 +21,6 @@ #include namespace folly { -namespace python { class NotificationQueueExecutor : public folly::DrivableExecutor { public: @@ -55,5 +54,4 @@ class NotificationQueueExecutor : public folly::DrivableExecutor { folly::NotificationQueue::SimpleConsumer consumer_{queue_}; }; // NotificationQueueExecutor -} // namespace python } // namespace folly diff --git a/folly/python/executor.pxd b/folly/python/executor.pxd index ab4c51b7..eeb8acd5 100644 --- a/folly/python/executor.pxd +++ b/folly/python/executor.pxd @@ -1,8 +1,8 @@ from libcpp.memory cimport unique_ptr from folly cimport cFollyExecutor -cdef extern from "folly/python/NotificationQueueExecutor.h" namespace "folly::python": - cdef cppclass cNotificationQueueExecutor "folly::python::NotificationQueueExecutor"(cFollyExecutor): +cdef extern from "folly/executors/NotificationQueueExecutor.h" namespace "folly": + cdef cppclass cNotificationQueueExecutor "folly::NotificationQueueExecutor"(cFollyExecutor): int fileno() void drive() -- 2.34.1