summaryrefslogtreecommitdiffstats
path: root/xmrstak/misc
diff options
context:
space:
mode:
authorTony Butler <spudz76@gmail.com>2018-05-03 16:00:58 +0100
committerTimothy Pearson <tpearson@raptorengineering.com>2018-06-04 21:07:11 +0000
commit7c587421f1050dac43d612b03f73c405928031b3 (patch)
treeb19a8938da8922ff02c047a5b35aebe6aecea428 /xmrstak/misc
parent84471e3d48b0423410384d41c2ce467b19f2b73a (diff)
downloadxmr-stak-7c587421f1050dac43d612b03f73c405928031b3.zip
xmr-stak-7c587421f1050dac43d612b03f73c405928031b3.tar.gz
Spell check
Diffstat (limited to 'xmrstak/misc')
-rw-r--r--xmrstak/misc/configEditor.hpp2
-rw-r--r--xmrstak/misc/console.cpp2
-rw-r--r--xmrstak/misc/executor.cpp28
-rw-r--r--xmrstak/misc/telemetry.cpp22
-rw-r--r--xmrstak/misc/telemetry.hpp2
-rw-r--r--xmrstak/misc/uac.cpp4
6 files changed, 30 insertions, 30 deletions
diff --git a/xmrstak/misc/configEditor.hpp b/xmrstak/misc/configEditor.hpp
index 8a81ad6..d95ea6b 100644
--- a/xmrstak/misc/configEditor.hpp
+++ b/xmrstak/misc/configEditor.hpp
@@ -14,7 +14,7 @@ struct configEditor
{
std::string m_fileContent;
- configEditor()
+ configEditor()
{
}
diff --git a/xmrstak/misc/console.cpp b/xmrstak/misc/console.cpp
index d961b71..7b14b4f 100644
--- a/xmrstak/misc/console.cpp
+++ b/xmrstak/misc/console.cpp
@@ -239,7 +239,7 @@ void win_exit(int code)
#else
void win_exit(int code)
-{
+{
std::exit(code);
}
#endif // _WIN32
diff --git a/xmrstak/misc/executor.cpp b/xmrstak/misc/executor.cpp
index 6764ad1..64ec902 100644
--- a/xmrstak/misc/executor.cpp
+++ b/xmrstak/misc/executor.cpp
@@ -132,7 +132,7 @@ bool executor::get_live_pools(std::vector<jpsock*>& eval_pools, bool is_dev)
if(over_limit == pool_count)
{
- printer::inst()->print_msg(L0, "All pools are over give up limit. Exitting.");
+ printer::inst()->print_msg(L0, "All pools are over give up limit. Exiting.");
exit(0);
}
@@ -232,7 +232,7 @@ void executor::eval_pool_choice()
else
{
/* All is good - but check if we can do better */
- std::sort(eval_pools.begin(), eval_pools.end(), [](jpsock* a, jpsock* b) { return b->get_pool_weight(false) < a->get_pool_weight(false); });
+ std::sort(eval_pools.begin(), eval_pools.end(), [](jpsock* a, jpsock* b) { return b->get_pool_weight(false) < a->get_pool_weight(false); });
jpsock* goal2 = eval_pools[0];
if(goal->get_pool_id() != goal2->get_pool_id())
@@ -334,7 +334,7 @@ void executor::on_sock_ready(size_t pool_id)
std::string str = "Login error: " + pool->get_call_error();
log_socket_error(pool, std::move(str));
}
-
+
if(!pool->have_sock_error())
pool->disconnect();
}
@@ -421,7 +421,7 @@ void executor::on_miner_result(size_t pool_id, job_result& oResult)
{
//Ignore errors silently
if(pool->is_running() && pool->is_logged_in())
- pool->cmd_submit(oResult.sJobID, oResult.iNonce, oResult.bResult, backend_name,
+ pool->cmd_submit(oResult.sJobID, oResult.iNonce, oResult.bResult, backend_name,
backend_hashcount, total_hashcount, jconf::inst()->GetCurrentCoinSelection().GetDescription(0).GetMiningAlgo()
);
return;
@@ -434,7 +434,7 @@ void executor::on_miner_result(size_t pool_id, job_result& oResult)
}
size_t t_start = get_timestamp_ms();
- bool bResult = pool->cmd_submit(oResult.sJobID, oResult.iNonce, oResult.bResult,
+ bool bResult = pool->cmd_submit(oResult.sJobID, oResult.iNonce, oResult.bResult,
backend_name, backend_hashcount, total_hashcount, jconf::inst()->GetCurrentCoinSelection().GetDescription(1).GetMiningAlgo()
);
size_t t_len = get_timestamp_ms() - t_start;
@@ -528,12 +528,12 @@ void executor::ex_main()
{
auto& params = xmrstak::params::inst();
already_have_cli_pool = true;
-
+
const char* wallet = params.poolUsername.empty() ? cfg.sWalletAddr : params.poolUsername.c_str();
const char* rigid = params.userSetRigid ? params.poolRigid.c_str() : cfg.sRigId;
const char* pwd = params.userSetPwd ? params.poolPasswd.c_str() : cfg.sPasswd;
bool nicehash = cfg.nicehash || params.nicehashMode;
-
+
pools.emplace_back(i+1, cfg.sPoolAddr, wallet, rigid, pwd, 9.9, false, params.poolUseTls, cfg.tls_fingerprint, nicehash);
}
else
@@ -548,7 +548,7 @@ void executor::ex_main()
printer::inst()->print_msg(L1, "ERROR: You didn't specify the username / wallet address for %s", xmrstak::params::inst().poolURL.c_str());
win_exit();
}
-
+
pools.emplace_back(i+1, params.poolURL.c_str(), params.poolUsername.c_str(), params.poolRigid.c_str(), params.poolPasswd.c_str(), 9.9, false, params.poolUseTls, "", params.nicehashMode);
}
@@ -794,7 +794,7 @@ void executor::hashrate_report(std::string& out)
auto bType = static_cast<xmrstak::iBackend::BackendType>(b);
std::string name(xmrstak::iBackend::getName(bType));
std::transform(name.begin(), name.end(), name.begin(), ::toupper);
-
+
out.append("HASHRATE REPORT - ").append(name).append("\n");
out.append("| ID | 10s | 60s | 15m |");
if(nthd != 1)
@@ -817,11 +817,11 @@ void executor::hashrate_report(std::string& out)
out.append(hps_format(fHps[0], num, sizeof(num))).append(" |");
out.append(hps_format(fHps[1], num, sizeof(num))).append(" |");
out.append(hps_format(fHps[2], num, sizeof(num))).append(1, ' ');
-
+
fTotal[0] += (std::isnormal(fHps[0])) ? fHps[0] : 0.0;
fTotal[1] += (std::isnormal(fHps[1])) ? fHps[1] : 0.0;
fTotal[2] += (std::isnormal(fHps[2])) ? fHps[2] : 0.0;
-
+
fTotalCur[0] += (std::isnormal(fHps[0])) ? fHps[0] : 0.0;
fTotalCur[1] += (std::isnormal(fHps[1])) ? fHps[1] : 0.0;
fTotalCur[2] += (std::isnormal(fHps[2])) ? fHps[2] : 0.0;
@@ -832,13 +832,13 @@ void executor::hashrate_report(std::string& out)
if((i & 0x1) == 1) //We had odd number of threads
out.append("|\n");
-
+
out.append("Totals (").append(name).append("): ");
out.append(hps_format(fTotalCur[0], num, sizeof(num)));
out.append(hps_format(fTotalCur[1], num, sizeof(num)));
out.append(hps_format(fTotalCur[2], num, sizeof(num)));
out.append(" H/s\n");
-
+
out.append("-----------------------------------------------------------------\n");
}
}
@@ -1030,7 +1030,7 @@ void executor::http_hashrate_report(std::string& out)
out.append(sHtmlMotdBoxStart);
have_motd = true;
}
-
+
snprintf(buffer, sizeof(buffer), sHtmlMotdEntry, pool.get_pool_addr(), motd.c_str());
out.append(buffer);
}
diff --git a/xmrstak/misc/telemetry.cpp b/xmrstak/misc/telemetry.cpp
index a3a2a12..5642f6b 100644
--- a/xmrstak/misc/telemetry.cpp
+++ b/xmrstak/misc/telemetry.cpp
@@ -47,14 +47,14 @@ telemetry::telemetry(size_t iThd)
}
}
-double telemetry::calc_telemetry_data(size_t iLastMilisec, size_t iThread)
+double telemetry::calc_telemetry_data(size_t iLastMillisec, size_t iThread)
{
uint64_t iTimeNow = get_timestamp_ms();
uint64_t iEarliestHashCnt = 0;
uint64_t iEarliestStamp = 0;
- uint64_t iLastestStamp = 0;
- uint64_t iLastestHashCnt = 0;
+ uint64_t iLatestStamp = 0;
+ uint64_t iLatestHashCnt = 0;
bool bHaveFullSet = false;
//Start at 1, buckettop points to next empty
@@ -65,13 +65,13 @@ double telemetry::calc_telemetry_data(size_t iLastMilisec, size_t iThread)
if (ppTimestamps[iThread][idx] == 0)
break; //That means we don't have the data yet
- if (iLastestStamp == 0)
+ if (iLatestStamp == 0)
{
- iLastestStamp = ppTimestamps[iThread][idx];
- iLastestHashCnt = ppHashCounts[iThread][idx];
+ iLatestStamp = ppTimestamps[iThread][idx];
+ iLatestHashCnt = ppHashCounts[iThread][idx];
}
- if (iTimeNow - ppTimestamps[iThread][idx] > iLastMilisec)
+ if (iTimeNow - ppTimestamps[iThread][idx] > iLastMillisec)
{
bHaveFullSet = true;
break; //We are out of the requested time period
@@ -81,16 +81,16 @@ double telemetry::calc_telemetry_data(size_t iLastMilisec, size_t iThread)
iEarliestHashCnt = ppHashCounts[iThread][idx];
}
- if (!bHaveFullSet || iEarliestStamp == 0 || iLastestStamp == 0)
+ if (!bHaveFullSet || iEarliestStamp == 0 || iLatestStamp == 0)
return nan("");
//Don't think that can happen, but just in case
- if (iLastestStamp - iEarliestStamp == 0)
+ if (iLatestStamp - iEarliestStamp == 0)
return nan("");
double fHashes, fTime;
- fHashes = static_cast<double>(iLastestHashCnt - iEarliestHashCnt);
- fTime = static_cast<double>(iLastestStamp - iEarliestStamp);
+ fHashes = static_cast<double>(iLatestHashCnt - iEarliestHashCnt);
+ fTime = static_cast<double>(iLatestStamp - iEarliestStamp);
fTime /= 1000.0;
return fHashes / fTime;
diff --git a/xmrstak/misc/telemetry.hpp b/xmrstak/misc/telemetry.hpp
index 2f84dfa..309fd6d 100644
--- a/xmrstak/misc/telemetry.hpp
+++ b/xmrstak/misc/telemetry.hpp
@@ -11,7 +11,7 @@ class telemetry
public:
telemetry(size_t iThd);
void push_perf_value(size_t iThd, uint64_t iHashCount, uint64_t iTimestamp);
- double calc_telemetry_data(size_t iLastMilisec, size_t iThread);
+ double calc_telemetry_data(size_t iLastMillisec, size_t iThread);
private:
constexpr static size_t iBucketSize = 2 << 11; //Power of 2 to simplify calculations
diff --git a/xmrstak/misc/uac.cpp b/xmrstak/misc/uac.cpp
index ad9d394..9f94093 100644
--- a/xmrstak/misc/uac.cpp
+++ b/xmrstak/misc/uac.cpp
@@ -5,11 +5,11 @@
#include <string>
#include <windows.h>
-BOOL IsElevated()
+BOOL IsElevated()
{
BOOL fRet = FALSE;
HANDLE hToken = NULL;
- if (OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &hToken))
+ if (OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &hToken))
{
TOKEN_ELEVATION Elevation;
DWORD cbSize = sizeof(TOKEN_ELEVATION);
OpenPOWER on IntegriCloud