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

Merge branch 'master' of github.com:donSchoe/primecoin

Browse source
This commit is contained in:
donSchoe 2013-10-28 15:33:42 +01:00
commit d38e436302
4 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main_poolminer.cpp
View file

@ -578,6 +578,7 @@ int main(int argc, char **argv)
ParseParameters(argc, argv);
socket_to_server = NULL;
pool_share_minimum = (unsigned int)GetArg("-poolshare", 7);
thread_num_max = GetArg("-genproclimit", 1); // what about boost's hardware_concurrency() ?
fee_to_pay = GetArg("-poolfee", 3);
miner_id = GetArg("-minerid", 0);

3
src/prime.cpp
View file

@ -14,6 +14,7 @@ std::vector<unsigned int> vPrimes;
unsigned int nSieveSize = nDefaultSieveSize;
unsigned int nSievePercentage = nDefaultSievePercentage;
unsigned int nSieveExtensions = nDefaultSieveExtensions;
unsigned int pool_share_minimum = (unsigned int)GetArg("-poolshare", 7);
static unsigned int int_invert(unsigned int a, unsigned int nPrime);
@ -712,7 +713,7 @@ static bool ProbablePrimeChainTestFast(const mpz_class& mpzPrimeChainOrigin, CPr
}
}
return (!poolmining && (nChainLength >= nBits)) || (poolmining && (TargetGetLength(nChainLength) >= POOL_SHARE_MINIMUM));
return (!poolmining && (nChainLength >= nBits)) || (poolmining && (TargetGetLength(nChainLength) >= pool_share_minimum));
}
// Sieve for mining

2
src/prime.h
View file

@ -15,7 +15,7 @@
/* POOL ADDON */
/**************/
static const unsigned int POOL_SHARE_MINIMUM = 7;
extern unsigned int pool_share_minimum;
extern size_t thread_num_max;
class CBlockProvider {

BIN
src/primeminer Executable file
View file

Binary file not shown.