q3k
/
primeminer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename 'gensieveroundpercentage' to 'roundsievepercentage' for simplicity.

master
mikaelh 2013-07-26 00:31:13 +03:00
parent eb2402ac05
commit 6e8970b8f0
6 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bitcoinrpc.cpp
View File

@ -212,8 +212,8 @@ static const CRPCCommand vRPCCommands[] =
{ "setgenerate", &setgenerate, true, false },
{ "getsievepercentage", &getsievepercentage, true, false },
{ "setsievepercentage", &setsievepercentage, true, false },
{ "getgensieveroundpercentage",&getgensieveroundpercentage,true,false },
{ "setgensieveroundpercentage",&setgensieveroundpercentage,true,false },
{ "getroundsievepercentage",&getroundsievepercentage,true,false },
{ "setroundsievepercentage",&setroundsievepercentage,true,false },
{ "getprimespersec", &getprimespersec, true, false },
{ "getchainspermin", &getchainspermin, true, false },
{ "getinfo", &getinfo, true, false },
@ -1157,7 +1157,7 @@ Array RPCConvertValues(const std::string &strMethod, const std::vector<std::stri
if (strMethod == "setgenerate" && n > 0) ConvertTo<bool>(params[0]);
if (strMethod == "setgenerate" && n > 1) ConvertTo<boost::int64_t>(params[1]);
if (strMethod == "setsievepercentage" && n > 0) ConvertTo<boost::int64_t>(params[0]);
if (strMethod == "setgensieveroundpercentage" && n > 0) ConvertTo<boost::int64_t>(params[0]);
if (strMethod == "setroundsievepercentage" && n > 0) ConvertTo<boost::int64_t>(params[0]);
if (strMethod == "sendtoaddress" && n > 1) ConvertTo<double>(params[1]);
if (strMethod == "settxfee" && n > 0) ConvertTo<double>(params[0]);
if (strMethod == "getreceivedbyaddress" && n > 1) ConvertTo<boost::int64_t>(params[1]);

4
src/bitcoinrpc.h
View File

@ -151,8 +151,8 @@ extern json_spirit::Value getgenerate(const json_spirit::Array& params, bool fHe
extern json_spirit::Value setgenerate(const json_spirit::Array& params, bool fHelp);
extern json_spirit::Value getsievepercentage(const json_spirit::Array& params, bool fHelp);
extern json_spirit::Value setsievepercentage(const json_spirit::Array& params, bool fHelp);
extern json_spirit::Value getgensieveroundpercentage(const json_spirit::Array& params, bool fHelp);
extern json_spirit::Value setgensieveroundpercentage(const json_spirit::Array& params, bool fHelp);
extern json_spirit::Value getroundsievepercentage(const json_spirit::Array& params, bool fHelp);
extern json_spirit::Value setroundsievepercentage(const json_spirit::Array& params, bool fHelp);
extern json_spirit::Value getprimespersec(const json_spirit::Array& params, bool fHelp);
extern json_spirit::Value getchainspermin(const json_spirit::Array& params, bool fHelp);
extern json_spirit::Value getmininginfo(const json_spirit::Array& params, bool fHelp);

2
src/main.cpp
View File

@ -4785,7 +4785,7 @@ void static BitcoinMiner(CWallet *pwallet)
// Primecoin: reset sieve+primality round timer
nPrimeTimerStart = GetTimeMicros();
// Adjust primorial so that sieve generation takes a set percentage of round time
if (nSieveGenTime >= nGenSieveRoundPercentage * nRoundTime / 100)
if (nSieveGenTime >= nRoundSievePercentage * nRoundTime / 100)
fIncrementPrimorial = true;
else
fIncrementPrimorial = false;

6
src/prime.cpp
View File

@ -10,14 +10,14 @@ std::vector<unsigned int> vPrimes;
std::vector<unsigned int> vTwoInverses;
unsigned int nSieveSize = nDefaultSieveSize;
unsigned int nSievePercentage = nDefaultSievePercentage;
unsigned int nGenSieveRoundPercentage = nDefaultGenSieveRoundPercentage;
unsigned int nRoundSievePercentage = nDefaultRoundSievePercentage;
static unsigned int int_invert(unsigned int a, unsigned int nPrime);
void GeneratePrimeTable()
{
nGenSieveRoundPercentage = (unsigned int)GetArg("-gensieveroundpercentage", nDefaultGenSieveRoundPercentage);
nGenSieveRoundPercentage = std::max(std::min(nGenSieveRoundPercentage, nMaxGenSieveRoundPercentage), nMinGenSieveRoundPercentage);
nRoundSievePercentage = (unsigned int)GetArg("-roundsievepercentage", nDefaultRoundSievePercentage);
nRoundSievePercentage = std::max(std::min(nRoundSievePercentage, nMaxRoundSievePercentage), nMinRoundSievePercentage);
nSievePercentage = (unsigned int)GetArg("-sievepercentage", nDefaultSievePercentage);
nSievePercentage = std::max(std::min(nSievePercentage, nMaxSievePercentage), nMinSievePercentage);
nSieveSize = (unsigned int)GetArg("-sievesize", nDefaultSieveSize);

8
src/prime.h
View File

@ -11,10 +11,10 @@
#include <gmpxx.h>
#include <bitset>
static const unsigned int nMaxGenSieveRoundPercentage = 100;
static const unsigned int nDefaultGenSieveRoundPercentage = 30;
static const unsigned int nMinGenSieveRoundPercentage = 1;
extern unsigned int nGenSieveRoundPercentage;
static const unsigned int nMaxRoundSievePercentage = 100;
static const unsigned int nDefaultRoundSievePercentage = 30;
static const unsigned int nMinRoundSievePercentage = 1;
extern unsigned int nRoundSievePercentage;
static const unsigned int nMaxSievePercentage = 100;
static const unsigned int nDefaultSievePercentage = 10;
static const unsigned int nMinSievePercentage = 1;

18
src/rpcmining.cpp
View File

@ -77,30 +77,30 @@ Value setsievepercentage(const Array& params, bool fHelp)
}
Value getgensieveroundpercentage(const Array& params, bool fHelp)
Value getroundsievepercentage(const Array& params, bool fHelp)
{
if (fHelp || params.size() != 0)
throw runtime_error(
"getgensieveroundpercentage\n"
"getroundsievepercentage\n"
"Returns the current sieve generation time percentage used by the mining algorithm.");
return (boost::int64_t)nGenSieveRoundPercentage;
return (boost::int64_t)nRoundSievePercentage;
}
Value setgensieveroundpercentage(const Array& params, bool fHelp)
Value setroundsievepercentage(const Array& params, bool fHelp)
{
if (fHelp || params.size() < 1)
throw runtime_error(
"setgensieveroundpercentage <gensieveroundpercentage>\n"
"<gensieveroundpercentage> determines much time should be spent generating the sieve of candidate multipliers.\n"
"setroundsievepercentage <roundsievepercentage>\n"
"<roundsievepercentage> determines much time should be spent generating the sieve of candidate multipliers.\n"
"The round primorial is dynamically adjusted based on this value.");
unsigned int nPercentage = nDefaultGenSieveRoundPercentage;
unsigned int nPercentage = nDefaultRoundSievePercentage;
if (params.size() > 0)
nPercentage = params[0].get_int();
nGenSieveRoundPercentage = nPercentage;
nRoundSievePercentage = nPercentage;
return Value::null;
}
@ -146,7 +146,7 @@ Value getmininginfo(const Array& params, bool fHelp)
obj.push_back(Pair("errors", GetWarnings("statusbar")));
obj.push_back(Pair("generate", GetBoolArg("-gen")));
obj.push_back(Pair("genproclimit", (int)GetArg("-genproclimit", -1)));
obj.push_back(Pair("gensieveroundpercentage",(int)nGenSieveRoundPercentage));
obj.push_back(Pair("roundsievepercentage",(int)nRoundSievePercentage));
obj.push_back(Pair("primespersec", getprimespersec(params, false)));
obj.push_back(Pair("pooledtx", (uint64_t)mempool.size()));
obj.push_back(Pair("sievepercentage",(int)nSievePercentage));