Merge branch 'tianyuli-rpc' into tianyuli-libpqxx

* tianyuli-rpc:
  Move function definition back because of templates
  Update dedicated_thread_registry.cpp
  Fix compilation issue

# Conflicts:
#	src/common/dedicated_thread_registry.cpp
#	src/include/common/dedicated_thread_registry.h

Author: tli2

src/common/dedicated_thread_registry.cpp

@@ -17,7 +17,6 @@
 #include <thread>
 #include "common/macros.h"
 #include "common/dedicated_thread_task.h"
-#include "common/dedicated_thread_owner.h"
 
 namespace peloton {
 
@@ -31,10 +30,24 @@ class DedicatedThreadRegistry {
  public:
   DedicatedThreadRegistry() = default;
 
-  ~DedicatedThreadRegistry();
+  ~DedicatedThreadRegistry() {
+    // Note that if registry is shutting down, it doesn't matter whether
+    // owners are notified as this class should have the same life cycle
+    // as the entire peloton process.
+
+    for (auto &entry : thread_owners_table_) {
+      for (auto &task : entry.second) {
+        task->Terminate();
+        threads_table_[task.get()].join();
+      }
+    }
+  }
 
   // TODO(tianyu): Remove when we remove singletons
-  static DedicatedThreadRegistry &GetInstance();
+  static DedicatedThreadRegistry &GetInstance()  {
+    static DedicatedThreadRegistry registry;
+    return registry;
+  }
 
   /**
    *