From bdb1a2432eb460a78f6c31e55f0beda9f51e4dc0 Mon Sep 17 00:00:00 2001
From: Chang Lan <lanchang@bytedance.com>
Date: Tue, 16 Jul 2019 13:56:24 -0700
Subject: [PATCH] rdma_van: lint

---
 include/ps/internal/postoffice.h       | 4 +++-
 include/ps/internal/threadsafe_queue.h | 1 +
 include/ps/kv_app.h                    | 1 +
 src/rdma_van.h                         | 5 ++++-
 src/zmq_van.h                          | 1 +
 5 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/include/ps/internal/postoffice.h b/include/ps/internal/postoffice.h
index 0f3b64ea..883c5071 100644
--- a/include/ps/internal/postoffice.h
+++ b/include/ps/internal/postoffice.h
@@ -6,6 +6,8 @@
 #include <mutex>
 #include <algorithm>
 #include <vector>
+#include <unordered_map>
+#include <memory>
 #include "ps/range.h"
 #include "ps/internal/env.h"
 #include "ps/internal/customer.h"
@@ -35,7 +37,7 @@ class Postoffice {
   /**
    * \brief terminate the system
    *
-   * All nodes should call this function before existing. 
+   * All nodes should call this function before existing.
    * \param do_barrier whether to do block until every node is finalized, default true.
    */
   void Finalize(const int customer_id, const bool do_barrier = true);
diff --git a/include/ps/internal/threadsafe_queue.h b/include/ps/internal/threadsafe_queue.h
index 93169dcd..a32af116 100644
--- a/include/ps/internal/threadsafe_queue.h
+++ b/include/ps/internal/threadsafe_queue.h
@@ -7,6 +7,7 @@
 #include <mutex>
 #include <condition_variable>
 #include <memory>
+#include <utility>
 #include "ps/base.h"
 namespace ps {
 
diff --git a/include/ps/kv_app.h b/include/ps/kv_app.h
index 8d402972..075d1317 100644
--- a/include/ps/kv_app.h
+++ b/include/ps/kv_app.h
@@ -6,6 +6,7 @@
 #include <algorithm>
 #include <utility>
 #include <vector>
+#include <unordered_map>
 #include "ps/base.h"
 #include "ps/simple_app.h"
 namespace ps {
diff --git a/src/rdma_van.h b/src/rdma_van.h
index f42e1e13..b630b1a2 100644
--- a/src/rdma_van.h
+++ b/src/rdma_van.h
@@ -22,11 +22,14 @@
 #include <algorithm>
 #include <map>
 #include <queue>
+#include <memory>
 #include <set>
 #include <string>
 #include <thread>
 #include <tuple>
 #include <unordered_map>
+#include <unordered_set>
+#include <utility>
 #include <vector>
 
 #include "ps/internal/threadsafe_queue.h"
@@ -528,7 +531,7 @@ class RDMAVan : public Van {
     CHECK(!ibv_destroy_comp_channel(comp_event_channel_))
         << "Failed to destroy channel";
 
-    // TODO: ibv_dealloc_pd sometimes complains about busy resources
+    // TODO(changlan): ibv_dealloc_pd sometimes complains about busy resources
 
     PS_VLOG(1) << "Destroying listener.";
     rdma_destroy_id(listener_);
diff --git a/src/zmq_van.h b/src/zmq_van.h
index ee0e85b6..050323f2 100644
--- a/src/zmq_van.h
+++ b/src/zmq_van.h
@@ -8,6 +8,7 @@
 #include <zmq.h>
 #include <string>
 #include <thread>
+#include <unordered_map>
 #include "ps/internal/van.h"
 #if _MSC_VER
 #define rand_r(x) rand()