From 7c86c5997d72062191c2fb4fbaf003bf48485842 Mon Sep 17 00:00:00 2001
From: Howard Chu <hyc@symas.com>
Date: Thu, 18 Feb 2016 21:30:10 +0000
Subject: Use boost::thread instead of std::thread

std::thread crashes on (at least) ARMv6 g++ 4.8/4.9
---
 src/p2p/data_logger.cpp | 3 ++-
 src/p2p/net_node.h      | 2 +-
 src/p2p/net_node.inl    | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/p2p/data_logger.cpp b/src/p2p/data_logger.cpp
index f875cb8f0..7fc85e3bc 100644
--- a/src/p2p/data_logger.cpp
+++ b/src/p2p/data_logger.cpp
@@ -31,6 +31,7 @@
 
 #include <boost/chrono.hpp>
 #include <boost/filesystem.hpp>
+#include <boost/thread.hpp>
 #include <chrono>
 #include "../../contrib/otshell_utils/utils.hpp"
 
@@ -85,7 +86,7 @@ namespace net_utils
 
 		_info_c("dbg/data","Creating thread for data logger"); // create timer thread
 		m_thread_maybe_running=true;
-		std::shared_ptr<std::thread> logger_thread(new std::thread([&]() {
+		std::shared_ptr<boost::thread> logger_thread(new boost::thread([&]() {
 			_info_c("dbg/data","Inside thread for data logger");
 			while (m_state == data_logger_state::state_during_init) { // wait for creation to be done (in other thread, in singleton) before actually running
 				std::this_thread::sleep_for(std::chrono::seconds(1));
diff --git a/src/p2p/net_node.h b/src/p2p/net_node.h
index 2ae849e2a..260dd813d 100644
--- a/src/p2p/net_node.h
+++ b/src/p2p/net_node.h
@@ -270,7 +270,7 @@ namespace nodetool
     bool m_offline;
     std::atomic<bool> m_save_graph;
     std::atomic<bool> is_closing;
-    std::unique_ptr<std::thread> mPeersLoggerThread;
+    std::unique_ptr<boost::thread> mPeersLoggerThread;
     //critical_section m_connections_lock;
     //connections_indexed_container m_connections;
 
diff --git a/src/p2p/net_node.inl b/src/p2p/net_node.inl
index 47a5dc6c3..56717ec66 100644
--- a/src/p2p/net_node.inl
+++ b/src/p2p/net_node.inl
@@ -567,7 +567,7 @@ namespace nodetool
   bool node_server<t_payload_net_handler>::run()
   {
     // creating thread to log number of connections
-    mPeersLoggerThread.reset(new std::thread([&]()
+    mPeersLoggerThread.reset(new boost::thread([&]()
     {
       _note("Thread monitor number of peers - start");
       while (!is_closing && !m_net_server.is_stop_signal_sent())
-- 
cgit v1.2.3


From 014f8868f215175fc8db41f79d57588db9ea1d4d Mon Sep 17 00:00:00 2001
From: Howard Chu <hyc@symas.com>
Date: Tue, 26 Jan 2016 22:09:08 +0000
Subject: std::condvar is broken on Win32 with gcc/g++ 4.8 too

Use boost...
---
 contrib/epee/include/syncobj.h | 10 ++++------
 src/common/dns_utils.cpp       |  4 ++--
 2 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/contrib/epee/include/syncobj.h b/contrib/epee/include/syncobj.h
index b81eb43a9..275324436 100644
--- a/contrib/epee/include/syncobj.h
+++ b/contrib/epee/include/syncobj.h
@@ -30,8 +30,6 @@
 #ifndef __WINH_OBJ_H__
 #define __WINH_OBJ_H__
 
-#include <condition_variable>
-#include <mutex>
 #include <boost/thread/locks.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/recursive_mutex.hpp>
@@ -51,22 +49,22 @@ namespace epee
 
     void raise()
     {
-      std::unique_lock<std::mutex> lock(m_mx);
+      boost::unique_lock<boost::mutex> lock(m_mx);
       m_rised = true;
       m_cond_var.notify_one();
     }
 
     void wait()
     {
-      std::unique_lock<std::mutex> lock(m_mx);
+      boost::unique_lock<boost::mutex> lock(m_mx);
       while (!m_rised) 
         m_cond_var.wait(lock);
       m_rised = false;
     }
 
   private:
-    std::mutex m_mx;
-    std::condition_variable m_cond_var;
+    boost::mutex m_mx;
+    boost::condition_variable m_cond_var;
     bool m_rised;
   };
 
diff --git a/src/common/dns_utils.cpp b/src/common/dns_utils.cpp
index eb7b6608b..eb0a7de1f 100644
--- a/src/common/dns_utils.cpp
+++ b/src/common/dns_utils.cpp
@@ -38,7 +38,7 @@
 using namespace epee;
 namespace bf = boost::filesystem;
 
-static std::mutex instance_lock;
+static boost::mutex instance_lock;
 
 namespace
 {
@@ -304,7 +304,7 @@ std::string DNSResolver::get_dns_format_from_oa_address(const std::string& oa_ad
 
 DNSResolver& DNSResolver::instance()
 {
-  std::lock_guard<std::mutex> lock(instance_lock);
+  boost::lock_guard<boost::mutex> lock(instance_lock);
 
   static DNSResolver* staticInstance = NULL;
   if (staticInstance == NULL)
-- 
cgit v1.2.3