aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2016-09-18 17:21:44 +0200
committerRiccardo Spagni <ric@spagni.net>2016-09-18 17:36:40 +0200
commitc15da0e70836ebc574ebcd4233cb61a5784b2db6 (patch)
tree95be35498f186c8c0065be58750ac20bd8036d0c
parentMerge pull request #1094 (diff)
downloadmonero-c15da0e70836ebc574ebcd4233cb61a5784b2db6.tar.xz
switch wallet API from std thread/mutex to boost
-rw-r--r--src/wallet/api/wallet.cpp8
-rw-r--r--src/wallet/api/wallet.h14
2 files changed, 11 insertions, 11 deletions
diff --git a/src/wallet/api/wallet.cpp b/src/wallet/api/wallet.cpp
index 25a20a575..74552bc03 100644
--- a/src/wallet/api/wallet.cpp
+++ b/src/wallet/api/wallet.cpp
@@ -170,7 +170,7 @@ WalletImpl::WalletImpl(bool testnet)
m_refreshThreadDone = false;
m_refreshEnabled = false;
m_refreshIntervalSeconds = DEFAULT_REFRESH_INTERVAL_SECONDS;
- m_refreshThread = std::thread([this] () {
+ m_refreshThread = boost::thread([this] () {
this->refreshThreadFunc();
});
@@ -632,12 +632,12 @@ void WalletImpl::refreshThreadFunc()
LOG_PRINT_L3(__FUNCTION__ << ": starting refresh thread");
while (true) {
- std::unique_lock<std::mutex> lock(m_refreshMutex);
+ boost::mutex::scoped_lock lock(m_refreshMutex);
if (m_refreshThreadDone) {
break;
}
LOG_PRINT_L3(__FUNCTION__ << ": waiting for refresh...");
- m_refreshCV.wait_for(lock, std::chrono::seconds(m_refreshIntervalSeconds));
+ m_refreshCV.wait(lock);
LOG_PRINT_L3(__FUNCTION__ << ": refresh lock acquired...");
LOG_PRINT_L3(__FUNCTION__ << ": m_refreshEnabled: " << m_refreshEnabled);
LOG_PRINT_L3(__FUNCTION__ << ": m_status: " << m_status);
@@ -652,7 +652,7 @@ void WalletImpl::refreshThreadFunc()
void WalletImpl::doRefresh()
{
// synchronizing async and sync refresh calls
- std::lock_guard<std::mutex> guarg(m_refreshMutex2);
+ boost::lock_guard<boost::mutex> guarg(m_refreshMutex2);
try {
m_wallet->refresh();
} catch (const std::exception &e) {
diff --git a/src/wallet/api/wallet.h b/src/wallet/api/wallet.h
index 9a290e0bc..658296c30 100644
--- a/src/wallet/api/wallet.h
+++ b/src/wallet/api/wallet.h
@@ -35,9 +35,9 @@
#include "wallet/wallet2.h"
#include <string>
-#include <thread>
-#include <mutex>
-#include <condition_variable>
+#include <boost/thread/mutex.hpp>
+#include <boost/thread/thread.hpp>
+#include <boost/thread/condition_variable.hpp>
namespace Bitmonero {
@@ -113,12 +113,12 @@ private:
std::atomic<bool> m_refreshThreadDone;
std::atomic<int> m_refreshIntervalSeconds;
// synchronizing refresh loop;
- std::mutex m_refreshMutex;
+ boost::mutex m_refreshMutex;
// synchronizing sync and async refresh
- std::mutex m_refreshMutex2;
- std::condition_variable m_refreshCV;
- std::thread m_refreshThread;
+ boost::mutex m_refreshMutex2;
+ boost::condition_variable m_refreshCV;
+ boost::thread m_refreshThread;
};