#1756 Added results and connection reports.
This commit is contained in:
parent
aa5a7c3c13
commit
26c2200af3
8 changed files with 225 additions and 46 deletions
|
@ -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) {
|
||||
|
@ -192,24 +211,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)"),
|
||||
|
@ -247,9 +252,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),
|
||||
|
|
|
@ -58,6 +58,7 @@ public:
|
|||
inline IStrategy *strategy() const { return m_strategy; }
|
||||
|
||||
void connect();
|
||||
void execCommand(char command);
|
||||
|
||||
protected:
|
||||
inline void onTimer(const Timer *) override { tick(); }
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue