Merged xmrig v6.2.3

This commit is contained in:
MoneroOcean 2020-07-09 10:24:41 -07:00
commit aaaaf5c1ed
26 changed files with 4596 additions and 4360 deletions

View file

@ -98,6 +98,25 @@ void xmrig::Network::connect()
}
void xmrig::Network::execCommand(char command)
{
switch (command) {
case 's':
case 'S':
m_state->printResults();
break;
case 'c':
case 'C':
m_state->printConnection();
break;
default:
break;
}
}
void xmrig::Network::onActive(IStrategy *strategy, IClient *client)
{
if (m_donate && m_donate == strategy) {
@ -202,24 +221,10 @@ void xmrig::Network::onPause(IStrategy *strategy)
}
static void scale_diff(uint64_t& diff, const char* &scale)
{
if (diff >= 100000000) {
diff /= 1000000;
scale = "M";
}
else if (diff >= 1000000) {
diff /= 1000;
scale = "K";
}
}
void xmrig::Network::onResultAccepted(IStrategy *, IClient *, const SubmitResult &result, const char *error)
{
uint64_t diff = result.diff;
const char* scale = "";
scale_diff(diff, scale);
uint64_t diff = result.diff;
const char *scale = NetworkState::scaleDiff(diff);
if (error) {
LOG_INFO("%s " RED_BOLD("rejected") " (%" PRId64 "/%" PRId64 ") diff " WHITE_BOLD("%" PRIu64 "%s") " " RED("\"%s\"") " " BLACK_BOLD("(%" PRIu64 " ms)"),
@ -257,9 +262,8 @@ void xmrig::Network::onRequest(IApiRequest &request)
void xmrig::Network::setJob(IClient *client, const Job &job, bool donate)
{
uint64_t diff = job.diff();
const char* scale = "";
scale_diff(diff, scale);
uint64_t diff = job.diff();;
const char *scale = NetworkState::scaleDiff(diff);
if (job.height()) {
LOG_INFO("%s " MAGENTA_BOLD("new job") " from " WHITE_BOLD("%s:%d") " diff " WHITE_BOLD("%" PRIu64 "%s") " algo " WHITE_BOLD("%s") " height " WHITE_BOLD("%" PRIu64),