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

Merge branch 'master' of bitbucket.org:thbaumbach/primecoin-hp

master
Thomas Baumbach 2013-09-16 20:08:00 +02:00
parent 5a7a921943 f8cf45d79b
commit 4ec2603c35
3 changed files with 35 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/main_poolminer.cpp
View File

@ -18,7 +18,8 @@
#include <boost/asio.hpp>
#define VERSION_MAJOR 0
#define VERSION_MINOR 2
#define VERSION_MINOR 3
#define VERSION_EXT "RC0"
// <START> be compatible to original code (not actually used!)
#include "txdb.h"
@ -62,11 +63,12 @@ struct blockHeader_t {
unsigned char primemultiplier[48]; // 80+48
}; // =128 bytes header (80 default + 48 primemultiplier)
size_t thread_num_max;
boost::asio::ip::tcp::socket* socket_to_server;
boost::posix_time::ptime t_start;
std::map<int,unsigned long> statistics;
bool running;
static size_t thread_num_max;
static boost::asio::ip::tcp::socket* socket_to_server;
static boost::posix_time::ptime t_start;
static std::map<int,unsigned long> statistics;
static bool running;
static volatile int submitting_share;
/*********************************
* helping functions
@ -148,12 +150,19 @@ public:
for (size_t i = 0; i < primemultiplier.size(); ++i)
blockraw.primemultiplier[1 + i] = primemultiplier[i];
boost::system::error_code error;
while (socket_to_server == NULL)
boost::this_thread::sleep(boost::posix_time::seconds(1));
socket_to_server->write_some(boost::asio::buffer((unsigned char*)&blockraw, 128));
if (error)
std::cout << error << " @ write_some_submit" << std::endl;
boost::posix_time::ptime submit_start = boost::posix_time::second_clock::universal_time();
boost::system::error_code submit_error = boost::asio::error::host_not_found; //run at least 1 time
++submitting_share;
while (submit_error && running && (boost::posix_time::second_clock::universal_time() - submit_start).total_seconds() < 100) {
while (socket_to_server == NULL && running && (boost::posix_time::second_clock::universal_time() - submit_start).total_seconds() < 100) //socket error was issued somewhere else
boost::this_thread::sleep(boost::posix_time::milliseconds(100));
if (running && (boost::posix_time::second_clock::universal_time() - submit_start).total_seconds() < 100) {
socket_to_server->write_some(boost::asio::buffer((unsigned char*)&blockraw, 128), submit_error);
if (submit_error)
std::cout << submit_error << " @ write_some_submit" << std::endl;
}
}
--submitting_share;
}
protected:
@ -228,9 +237,11 @@ public:
boost::system::error_code error_socket = boost::asio::error::host_not_found;
while (error_socket && endpoint != end)
{
//socket.close();
//socket->close();
socket.reset(new boost::asio::ip::tcp::socket(io_service));
socket->connect(*endpoint++, error_socket);
boost::asio::ip::tcp::endpoint tcp_ep = *endpoint++;
socket->connect(tcp_ep, error_socket);
std::cout << "connecting to " << tcp_ep << std::endl;
}
socket->set_option(nd_option);
@ -326,8 +337,8 @@ public:
reject_counter = 0;
else
reject_counter++;
if (reject_counter >= 3) {
std::cout << "too many rejects, forcing reconnect." << std::endl;
if (reject_counter >= 4) {
std::cout << "too many rejects (4), forcing reconnect." << std::endl;
socket->close();
done = true;
}
@ -348,7 +359,8 @@ public:
}
socket_to_server = NULL; //TODO: lock/mutex
boost::this_thread::sleep(boost::posix_time::seconds(10));
for (int i = 0; i < 100 && submitting_share < 1; ++i)
boost::this_thread::sleep(boost::posix_time::milliseconds(100));
}
}
@ -473,7 +485,7 @@ void ctrl_handler(int signum) {
int main(int argc, char **argv)
{
std::cout << "********************************************" << std::endl;
std::cout << "*** Primeminer - Primecoin Pool Miner v" << VERSION_MAJOR << "." << VERSION_MINOR << std::endl;
std::cout << "*** Xolominer - Primecoin Pool Miner v" << VERSION_MAJOR << "." << VERSION_MINOR << " " << VERSION_EXT << std::endl;
std::cout << "*** by xolokram/TB - www.beeeeer.org - glhf" << std::endl;
std::cout << "***" << std::endl;
std::cout << "*** thx to Sunny King & mikaelh" << std::endl;

8
src/prime.cpp
View File

@ -1036,7 +1036,7 @@ bool CSieveOfEratosthenes::Weave()
// Apply the layer to the primary sieve arrays
if (nLayerSeq < nChainLength)
{
if (nLayerSeq < nBiTwinCC1Layers && nLayerSeq < nBiTwinCC2Layers)
if (nLayerSeq < nBiTwinCC2Layers)
{
for (unsigned int nWord = nMinWord; nWord < nMaxWord; nWord++)
{
@ -1045,7 +1045,7 @@ bool CSieveOfEratosthenes::Weave()
vfCompositeBiTwin[nWord] |= vfCompositeLayerCC1[nWord] | vfCompositeLayerCC2[nWord];
}
}
else if (nLayerSeq < nBiTwinCC2Layers)
else if (nLayerSeq < nBiTwinCC1Layers)
{
for (unsigned int nWord = nMinWord; nWord < nMaxWord; nWord++)
{
@ -1074,7 +1074,7 @@ bool CSieveOfEratosthenes::Weave()
sieve_word_t *vfExtCC1 = vfExtendedCompositeCunningham1 + nExtensionSeq * nCandidatesWords;
sieve_word_t *vfExtCC2 = vfExtendedCompositeCunningham2 + nExtensionSeq * nCandidatesWords;
sieve_word_t *vfExtTWN = vfExtendedCompositeBiTwin + nExtensionSeq * nCandidatesWords;
if (nLayerExtendedSeq < nBiTwinCC1Layers && nLayerExtendedSeq < nBiTwinCC2Layers)
if (nLayerExtendedSeq < nBiTwinCC2Layers)
{
for (unsigned int nWord = nExtMinWord; nWord < nMaxWord; nWord++)
{
@ -1083,7 +1083,7 @@ bool CSieveOfEratosthenes::Weave()
vfExtTWN[nWord] |= vfCompositeLayerCC1[nWord] | vfCompositeLayerCC2[nWord];
}
}
else if (nLayerExtendedSeq < nBiTwinCC2Layers)
else if (nLayerExtendedSeq < nBiTwinCC1Layers)
{
for (unsigned int nWord = nExtMinWord; nWord < nMaxWord; nWord++)
{

2
src/prime.h
View File

@ -32,7 +32,7 @@ public:
extern std::vector<unsigned int> vPrimes;
static const unsigned int nMaxSieveExtensions = 20;
static const unsigned int nMinSieveExtensions = 0;
static const unsigned int nDefaultSieveExtensions = 6;
static const unsigned int nDefaultSieveExtensions = 9;
static const unsigned int nDefaultSieveExtensionsTestnet = 4;
extern unsigned int nSieveExtensions;
static const unsigned int nMaxSievePercentage = 100;