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

Merge branch 'std'

Browse source
This commit is contained in:
enWILLYado 2018-03-04 00:22:40 +01:00
commit c48703d476
1 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/workers/Hashrate.cpp
View file

@ -71,17 +71,18 @@ static int gettimeofday(struct timeval* tp, struct timezone* tzp)
#include "workers/Hashrate.h" #include "workers/Hashrate.h"
inline std::string format(const double value) inline std::string format(double value)
{ {
char buff[8]; char buff[8];
if(false == isnormal(value) && 0 != value) if(isnormal(value))
{ {
return "n/a";
}
snprintf(buff, sizeof(buff), "%03.1f", value); snprintf(buff, sizeof(buff), "%03.1f", value);
return buff; return buff;
} }
return "n/a";
}
Hashrate::Hashrate(int threads) : Hashrate::Hashrate(int threads) :
m_highest(0.0), m_highest(0.0),
@ -121,8 +122,11 @@ double Hashrate::calc(size_t ms) const
for(int i = 0; i < m_threads; ++i) for(int i = 0; i < m_threads; ++i)
{ {
data = calc(i, ms); data = calc(i, ms);
if(isnormal(data))
{
result += data; result += data;
} }
}
return result; return result;
} }
@ -172,12 +176,12 @@ double Hashrate::calc(size_t threadId, size_t ms) const
if(!haveFullSet || earliestStamp == 0 || lastestStamp == 0) if(!haveFullSet || earliestStamp == 0 || lastestStamp == 0)
{ {
return 0; return std::numeric_limits<double>::quiet_NaN() ;
} }
if(lastestStamp - earliestStamp == 0) if(lastestStamp - earliestStamp == 0)
{ {
return 0; return std::numeric_limits<double>::quiet_NaN() ;
} }
double hashes, time; double hashes, time;