Merge pull request #5599
0cc0d8d Get rid of the internal miner's hashmeter (jtimon)This commit is contained in:
Wladimir J. van der Laan
commit
40e96a3016
|
|
@ -362,8 +362,6 @@ void IncrementExtraNonce(CBlock* pblock, CBlockIndex* pindexPrev, unsigned int&
|
|||
//
|
||||
// Internal miner
|
||||
//
|
||||
double dHashesPerSec = 0.0;
|
||||
int64_t nHPSTimerStart = 0;
|
||||
|
||||
//
|
||||
// ScanHash scans nonces looking for a hash with at least some zero bits.
|
||||
|
|
@ -393,10 +391,8 @@ bool static ScanHash(const CBlockHeader *pblock, uint32_t& nNonce, uint256 *phas
|
|||
return true;
|
||||
|
||||
// If nothing found after trying for a while, return -1
|
||||
if ((nNonce & 0xffff) == 0)
|
||||
return false;
|
||||
if ((nNonce & 0xfff) == 0)
|
||||
boost::this_thread::interruption_point();
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -483,14 +479,9 @@ void static BitcoinMiner(CWallet *pwallet)
|
|||
arith_uint256 hashTarget = arith_uint256().SetCompact(pblock->nBits);
|
||||
uint256 hash;
|
||||
uint32_t nNonce = 0;
|
||||
uint32_t nOldNonce = 0;
|
||||
while (true) {
|
||||
bool fFound = ScanHash(pblock, nNonce, &hash);
|
||||
uint32_t nHashesDone = nNonce - nOldNonce;
|
||||
nOldNonce = nNonce;
|
||||
|
||||
// Check if something found
|
||||
if (fFound)
|
||||
if (ScanHash(pblock, nNonce, &hash))
|
||||
{
|
||||
if (UintToArith256(hash) <= hashTarget)
|
||||
{
|
||||
|
|
@ -512,35 +503,6 @@ void static BitcoinMiner(CWallet *pwallet)
|
|||
}
|
||||
}
|
||||
|
||||
// Meter hashes/sec
|
||||
static int64_t nHashCounter;
|
||||
if (nHPSTimerStart == 0)
|
||||
{
|
||||
nHPSTimerStart = GetTimeMillis();
|
||||
nHashCounter = 0;
|
||||
}
|
||||
else
|
||||
nHashCounter += nHashesDone;
|
||||
if (GetTimeMillis() - nHPSTimerStart > 4000)
|
||||
{
|
||||
static CCriticalSection cs;
|
||||
{
|
||||
LOCK(cs);
|
||||
if (GetTimeMillis() - nHPSTimerStart > 4000)
|
||||
{
|
||||
dHashesPerSec = 1000.0 * nHashCounter / (GetTimeMillis() - nHPSTimerStart);
|
||||
nHPSTimerStart = GetTimeMillis();
|
||||
nHashCounter = 0;
|
||||
static int64_t nLogTime;
|
||||
if (GetTime() - nLogTime > 30 * 60)
|
||||
{
|
||||
nLogTime = GetTime();
|
||||
LogPrintf("hashmeter %6.0f khash/s\n", dHashesPerSec/1000.0);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Check for stop or if block needs to be rebuilt
|
||||
boost::this_thread::interruption_point();
|
||||
// Regtest mode doesn't require peers
|
||||
|
|
|
|||
|
|
@ -31,7 +31,4 @@ CBlockTemplate* CreateNewBlockWithKey(CReserveKey& reservekey);
|
|||
void IncrementExtraNonce(CBlock* pblock, CBlockIndex* pindexPrev, unsigned int& nExtraNonce);
|
||||
void UpdateTime(CBlockHeader* block, const CBlockIndex* pindexPrev);
|
||||
|
||||
extern double dHashesPerSec;
|
||||
extern int64_t nHPSTimerStart;
|
||||
|
||||
#endif // BITCOIN_MINER_H
|
||||
|
|
|
|||
|
|
@ -201,24 +201,6 @@ Value setgenerate(const Array& params, bool fHelp)
|
|||
return Value::null;
|
||||
}
|
||||
|
||||
Value gethashespersec(const Array& params, bool fHelp)
|
||||
{
|
||||
if (fHelp || params.size() != 0)
|
||||
throw runtime_error(
|
||||
"gethashespersec\n"
|
||||
"\nReturns a recent hashes per second performance measurement while generating.\n"
|
||||
"See the getgenerate and setgenerate calls to turn generation on and off.\n"
|
||||
"\nResult:\n"
|
||||
"n (numeric) The recent hashes per second when generation is on (will return 0 if generation is off)\n"
|
||||
"\nExamples:\n"
|
||||
+ HelpExampleCli("gethashespersec", "")
|
||||
+ HelpExampleRpc("gethashespersec", "")
|
||||
);
|
||||
|
||||
if (GetTimeMillis() - nHPSTimerStart > 8000)
|
||||
return (int64_t)0;
|
||||
return (int64_t)dHashesPerSec;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
|
|
@ -237,7 +219,6 @@ Value getmininginfo(const Array& params, bool fHelp)
|
|||
" \"errors\": \"...\" (string) Current errors\n"
|
||||
" \"generate\": true|false (boolean) If the generation is on or off (see getgenerate or setgenerate calls)\n"
|
||||
" \"genproclimit\": n (numeric) The processor limit for generation. -1 if no generation. (see getgenerate or setgenerate calls)\n"
|
||||
" \"hashespersec\": n (numeric) The hashes per second of the generation, or 0 if no generation.\n"
|
||||
" \"pooledtx\": n (numeric) The size of the mem pool\n"
|
||||
" \"testnet\": true|false (boolean) If using testnet or not\n"
|
||||
" \"chain\": \"xxxx\", (string) current network name as defined in BIP70 (main, test, regtest)\n"
|
||||
|
|
@ -260,7 +241,6 @@ Value getmininginfo(const Array& params, bool fHelp)
|
|||
obj.push_back(Pair("chain", Params().NetworkIDString()));
|
||||
#ifdef ENABLE_WALLET
|
||||
obj.push_back(Pair("generate", getgenerate(params, false)));
|
||||
obj.push_back(Pair("hashespersec", gethashespersec(params, false)));
|
||||
#endif
|
||||
return obj;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -281,7 +281,6 @@ static const CRPCCommand vRPCCommands[] =
|
|||
#ifdef ENABLE_WALLET
|
||||
/* Coin generation */
|
||||
{ "generating", "getgenerate", &getgenerate, true, false, false },
|
||||
{ "generating", "gethashespersec", &gethashespersec, true, false, false },
|
||||
{ "generating", "setgenerate", &setgenerate, true, true, false },
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -154,7 +154,6 @@ extern json_spirit::Value importwallet(const json_spirit::Array& params, bool fH
|
|||
extern json_spirit::Value getgenerate(const json_spirit::Array& params, bool fHelp); // in rpcmining.cpp
|
||||
extern json_spirit::Value setgenerate(const json_spirit::Array& params, bool fHelp);
|
||||
extern json_spirit::Value getnetworkhashps(const json_spirit::Array& params, bool fHelp);
|
||||
extern json_spirit::Value gethashespersec(const json_spirit::Array& params, bool fHelp);
|
||||
extern json_spirit::Value getmininginfo(const json_spirit::Array& params, bool fHelp);
|
||||
extern json_spirit::Value prioritisetransaction(const json_spirit::Array& params, bool fHelp);
|
||||
extern json_spirit::Value getblocktemplate(const json_spirit::Array& params, bool fHelp);
|
||||
|
|
|
|||
Loading…
Reference in a new issue