From 7da1ea07a2cb8927522acd46d6492632f79701e9 Mon Sep 17 00:00:00 2001
From: Yu Yang <yuyang18@baidu.com>
Date: Wed, 28 Mar 2018 19:25:45 +0800
Subject: [PATCH] Use PopAll

---
 .../details/threaded_ssa_graph_executor.cc    | 26 +++++++++++++------
 .../details/threaded_ssa_graph_executor.h     | 17 ++++++++++--
 2 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/paddle/fluid/framework/details/threaded_ssa_graph_executor.cc b/paddle/fluid/framework/details/threaded_ssa_graph_executor.cc
index 105e21cab..a6998f45d 100644
--- a/paddle/fluid/framework/details/threaded_ssa_graph_executor.cc
+++ b/paddle/fluid/framework/details/threaded_ssa_graph_executor.cc
@@ -124,16 +124,26 @@ FeedFetchList ThreadedSSAGraphExecutor::Run(
     run_all_ready_ops();
 
     // 2. Find ready variable
-    VarHandleBase *ready_var = ready_vars.Pop();
-
+    bool timeout;
+    auto cur_ready_vars = ready_vars.PopAll(100, &timeout);
+
+    if (timeout) {
+      if (exception_) {
+        throw * exception_;
+      } else {
+        continue;
+      }
+    }
     // 3. Remove the dependency of ready_var.
     // Find the ready_ops after the ready_var.
-    pending_vars.erase(ready_var);
-    for (auto *op : ready_var->pending_ops_) {
-      auto &deps = pending_ops[op];
-      --deps;
-      if (deps == 0) {
-        ready_ops.insert(op);
+    for (auto ready_var : cur_ready_vars) {
+      pending_vars.erase(ready_var);
+      for (auto *op : ready_var->pending_ops_) {
+        auto &deps = pending_ops[op];
+        --deps;
+        if (deps == 0) {
+          ready_ops.insert(op);
+        }
       }
     }
     // Keep loop until all vars are ready.
diff --git a/paddle/fluid/framework/details/threaded_ssa_graph_executor.h b/paddle/fluid/framework/details/threaded_ssa_graph_executor.h
index 839217031..da559d855 100644
--- a/paddle/fluid/framework/details/threaded_ssa_graph_executor.h
+++ b/paddle/fluid/framework/details/threaded_ssa_graph_executor.h
@@ -14,6 +14,7 @@
 
 #pragma once
 
+#include <chrono>
 #include <functional>
 #include "ThreadPool.h"  // ThreadPool in thrird party
 #include "paddle/fluid/framework/details/ssa_graph_executor.h"
@@ -27,10 +28,10 @@ namespace details {
 template <typename T>
 class BlockingQueue {
  public:
-  void Push(const T &v) {
+  void Push(const T &item) {
     {
       std::lock_guard<std::mutex> g(mutex_);
-      q_.emplace_back(v);
+      q_.emplace_back(item);
     }
     cv_.notify_one();
   }
@@ -56,6 +57,18 @@ class BlockingQueue {
     return v;
   }
 
+  std::deque<T> PopAll(size_t ms, bool *timeout) {
+    auto time =
+        std::chrono::system_clock::now() + std::chrono::milliseconds(ms);
+    std::unique_lock<std::mutex> lock(mutex_);
+    *timeout = !cv_.wait_until(lock, time, [this] { return !q_.empty(); });
+    std::deque<T> ret;
+    if (!*timeout) {
+      std::swap(ret, q_);
+    }
+    return ret;
+  }
+
  private:
   std::mutex mutex_;
   std::condition_variable cv_;
-- 
GitLab