diff options
| author | fireice-uk <fireice-uk@users.noreply.github.com> | 2018-04-18 21:28:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-18 21:28:09 +0100 |
| commit | 26a5d65f12b2f19a0a3ece39a2bc64718796367b (patch) | |
| tree | b0132803b520fed0dcb2ea42ba5ab8f0a464fc12 /xmrstak/net | |
| parent | e10e8e67492cf3118af8b7d7609937e85e572305 (diff) | |
| parent | 27da3b0831e047a247f78ec299ba74b04f45bd5a (diff) | |
| download | xmr-stak-2.4.3.zip xmr-stak-2.4.3.tar.gz | |
Merge pull request #1459 from fireice-uk/dev2.4.3
release 2.4.3
Diffstat (limited to 'xmrstak/net')
| -rw-r--r-- | xmrstak/net/jpsock.cpp | 12 | ||||
| -rw-r--r-- | xmrstak/net/msgstruct.hpp | 2 | ||||
| -rw-r--r-- | xmrstak/net/socket.cpp | 3 |
3 files changed, 9 insertions, 8 deletions
diff --git a/xmrstak/net/jpsock.cpp b/xmrstak/net/jpsock.cpp index d71aeb1..74d1c26 100644 --- a/xmrstak/net/jpsock.cpp +++ b/xmrstak/net/jpsock.cpp @@ -229,7 +229,7 @@ void jpsock::jpsock_thread() else disconnect_time = 0; - std::unique_lock<std::mutex>(job_mutex); + std::unique_lock<std::mutex> lck(job_mutex); memset(&oCurrentJob, 0, sizeof(oCurrentJob)); bRunning = false; } @@ -439,7 +439,7 @@ bool jpsock::process_pool_job(const opq_json_val* params) if(motd != nullptr && motd->IsString() && (motd->GetStringLength() & 0x01) == 0) { - std::unique_lock<std::mutex>(motd_mutex); + std::unique_lock<std::mutex> lck(motd_mutex); if(motd->GetStringLength() > 0) { pool_motd.resize(motd->GetStringLength()/2 + 1); @@ -454,7 +454,7 @@ bool jpsock::process_pool_job(const opq_json_val* params) executor::inst()->push_event(ex_event(oPoolJob, pool_id)); - std::unique_lock<std::mutex>(job_mutex); + std::unique_lock<std::mutex> lck(job_mutex); oCurrentJob = oPoolJob; return true; } @@ -679,13 +679,13 @@ bool jpsock::cmd_submit(const char* sJobId, uint32_t iNonce, const uint8_t* bRes void jpsock::save_nonce(uint32_t nonce) { - std::unique_lock<std::mutex>(job_mutex); + std::unique_lock<std::mutex> lck(job_mutex); oCurrentJob.iSavedNonce = nonce; } bool jpsock::get_current_job(pool_job& job) { - std::unique_lock<std::mutex>(job_mutex); + std::unique_lock<std::mutex> lck(job_mutex); if(oCurrentJob.iWorkLen == 0) return false; @@ -699,7 +699,7 @@ bool jpsock::get_pool_motd(std::string& strin) if(!ext_motd) return false; - std::unique_lock<std::mutex>(motd_mutex); + std::unique_lock<std::mutex> lck(motd_mutex); if(pool_motd.size() > 0) { strin.assign(pool_motd); diff --git a/xmrstak/net/msgstruct.hpp b/xmrstak/net/msgstruct.hpp index 8c4bdbe..e401f59 100644 --- a/xmrstak/net/msgstruct.hpp +++ b/xmrstak/net/msgstruct.hpp @@ -179,7 +179,7 @@ inline size_t get_timestamp() return time_point_cast<seconds>(steady_clock::now()).time_since_epoch().count(); }; -//Get milisecond timestamp +//Get millisecond timestamp inline size_t get_timestamp_ms() { using namespace std::chrono; diff --git a/xmrstak/net/socket.cpp b/xmrstak/net/socket.cpp index 7c58a8e..9bc608f 100644 --- a/xmrstak/net/socket.cpp +++ b/xmrstak/net/socket.cpp @@ -156,7 +156,8 @@ int plain_socket::recv(char* buf, unsigned int len) bool plain_socket::send(const char* buf) { - int pos = 0, slen = strlen(buf); + size_t pos = 0; + size_t slen = strlen(buf); while (pos != slen) { int ret = ::send(hSocket, buf + pos, slen - pos, 0); |
