fzorb/REDACTED-rig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename Results => NetworkState.

Browse source
This commit is contained in:
XMRig 2017-09-01 15:35:00 +03:00
parent 9e9cddedc5
commit 8e08df2fd2
9 changed files with 34 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/net/Network.cpp
View file

@ -141,17 +141,17 @@ void Network::onPause(IStrategy *strategy)
void Network::onResultAccepted(Client *client, const SubmitResult &result, const char *error)
{
m_results.add(result, error);
m_state.add(result, error);
if (error) {
LOG_INFO(m_options->colors() ? "\x1B[01;31mrejected\x1B[0m (%" PRId64 "/%" PRId64 ") diff \x1B[01;37m%u\x1B[0m \x1B[31m\"%s\"\x1B[0m \x1B[01;30m(%" PRIu64 " ms)"
: "rejected (%" PRId64 "/%" PRId64 ") diff %u \"%s\" (%" PRIu64 " ms)",
m_results.accepted, m_results.rejected, result.diff, error, result.elapsed);
m_state.accepted, m_state.rejected, result.diff, error, result.elapsed);
}
else {
LOG_INFO(m_options->colors() ? "\x1B[01;32maccepted\x1B[0m (%" PRId64 "/%" PRId64 ") diff \x1B[01;37m%u\x1B[0m \x1B[01;30m(%" PRIu64 " ms)"
: "accepted (%" PRId64 "/%" PRId64 ") diff %u (%" PRIu64 " ms)",
m_results.accepted, m_results.rejected, result.diff, result.elapsed);
m_state.accepted, m_state.rejected, result.diff, result.elapsed);
}
}
@ -165,7 +165,7 @@ void Network::setJob(Client *client, const Job &job)
LOG_INFO("new job from %s:%d diff %d", client->host(), client->port(), job.diff());
}
m_results.diff = job.diff();
m_state.diff = job.diff();
Workers::setJob(job);
}
@ -180,7 +180,7 @@ void Network::tick()
m_donate->tick(now);
}
Api::tick(m_results);
Api::tick(m_state);
}

4
src/net/Network.h
View file

@ -29,7 +29,7 @@
#include <uv.h>
#include "api/Results.h"
#include "api/NetworkState.h"
#include "interfaces/IJobResultListener.h"
#include "interfaces/IStrategyListener.h"
@ -66,7 +66,7 @@ private:
const Options *m_options;
IStrategy *m_donate;
IStrategy *m_strategy;
Results m_results;
NetworkState m_state;
uv_timer_t m_timer;
};