executors/ThreadPoolExecutor.h \
executors/ThreadedExecutor.h \
executors/UnboundedBlockingQueue.h \
+ executors/QueuedImmediateExecutor.h \
Demangle.h \
DiscriminatedPtr.h \
DynamicConverter.h \
futures/ManualExecutor.h \
futures/Promise-inl.h \
futures/Promise.h \
- futures/QueuedImmediateExecutor.h \
futures/SharedPromise.h \
futures/SharedPromise-inl.h \
futures/ThreadWheelTimekeeper.h \
futures/Future.cpp \
futures/FutureException.cpp \
futures/ManualExecutor.cpp \
- futures/QueuedImmediateExecutor.cpp \
futures/ThreadWheelTimekeeper.cpp \
futures/test/TestExecutor.cpp \
executors/CPUThreadPoolExecutor.cpp \
executors/SerialExecutor.cpp \
executors/ThreadPoolExecutor.cpp \
executors/ThreadedExecutor.cpp \
+ executors/QueuedImmediateExecutor.cpp \
experimental/hazptr/hazptr.cpp \
experimental/hazptr/memory_resource.cpp \
GroupVarint.cpp \
--- /dev/null
+/*
+ * Copyright 2017 Facebook, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <folly/executors/QueuedImmediateExecutor.h>
+#include <folly/ThreadLocal.h>
+#include <queue>
+
+namespace folly {
+
+void QueuedImmediateExecutor::addStatic(Func callback) {
+ static folly::ThreadLocal<std::queue<Func>> q_;
+
+ if (q_->empty()) {
+ q_->push(std::move(callback));
+ while (!q_->empty()) {
+ q_->front()();
+ q_->pop();
+ }
+ } else {
+ q_->push(std::move(callback));
+ }
+}
+
+} // namespace
--- /dev/null
+/*
+ * Copyright 2017 Facebook, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+#include <folly/Executor.h>
+
+namespace folly {
+
+/**
+ * Runs inline like InlineExecutor, but with a queue so that any tasks added
+ * to this executor by one of its own callbacks will be queued instead of
+ * executed inline (nested). This is usually better behavior than Inline.
+ */
+class QueuedImmediateExecutor : public Executor {
+ public:
+ /// There's really only one queue per thread, no matter how many
+ /// QueuedImmediateExecutor objects you may have.
+ static void addStatic(Func);
+
+ void add(Func func) override {
+ addStatic(std::move(func));
+ }
+};
+
+} // namespace folly
+++ /dev/null
-/*
- * Copyright 2017 Facebook, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <folly/futures/QueuedImmediateExecutor.h>
-#include <folly/ThreadLocal.h>
-#include <queue>
-
-namespace folly {
-
-void QueuedImmediateExecutor::addStatic(Func callback) {
- static folly::ThreadLocal<std::queue<Func>> q_;
-
- if (q_->empty()) {
- q_->push(std::move(callback));
- while (!q_->empty()) {
- q_->front()();
- q_->pop();
- }
- } else {
- q_->push(std::move(callback));
- }
-}
-
-} // namespace
+++ /dev/null
-/*
- * Copyright 2017 Facebook, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-
-#include <folly/Executor.h>
-
-namespace folly {
-
-/**
- * Runs inline like InlineExecutor, but with a queue so that any tasks added
- * to this executor by one of its own callbacks will be queued instead of
- * executed inline (nested). This is usually better behavior than Inline.
- */
-class QueuedImmediateExecutor : public Executor {
- public:
- /// There's really only one queue per thread, no matter how many
- /// QueuedImmediateExecutor objects you may have.
- static void addStatic(Func);
-
- void add(Func func) override {
- addStatic(std::move(func));
- }
-};
-
-} // namespace folly
*/
#include <folly/Baton.h>
+#include <folly/executors/QueuedImmediateExecutor.h>
#include <folly/futures/Future.h>
#include <folly/futures/InlineExecutor.h>
#include <folly/futures/ManualExecutor.h>
-#include <folly/futures/QueuedImmediateExecutor.h>
#include <folly/portability/GTest.h>
+// TODO(jsedgwick) move this test to executors/test/ once the tested executors
+// have all moved
+
using namespace folly;
TEST(ManualExecutor, runIsStable) {
projects / folly.git / commitdiff