twisterarmy
/
twister-core
mirror of https://github.com/twisterarmy/twister-core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge remote branch 'refs/remotes/svn/trunk' into svn

miguelfreitas
Gavin Andresen 14 years ago
parent
2bda554be4 5cbf75324d
commit
d1e4a866ad
14 changed files with 155 additions and 82 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      base58.h
  2. 7
      db.cpp
  3. 1
      db.h
  4. 30
      init.cpp
  5. 4
      irc.cpp
  6. 80
      main.cpp
  7. 4
      main.h
  8. 2
      net.cpp
  9. 5
      net.h
  10. 7
      script.cpp
  11. 2
      serialize.h
  12. 1
      ui.cpp
  13. 27
      util.cpp
  14. 25
      util.h

2
base58.h
Unescape View File

@ -152,7 +152,7 @@ inline bool DecodeBase58Check(const string& str, vector<unsigned char>& vchRet)
static const unsigned char ADDRESSVERSION = 0; #define ADDRESSVERSION ((unsigned char)(fTestNet ? 111 : 0))
inline string Hash160ToAddress(uint160 hash160) inline string Hash160ToAddress(uint160 hash160)
{ {

7
db.cpp
Unescape View File

@ -846,10 +846,13 @@ void BackupWallet(const string& strDest)
} }
} }
void CWalletDB::ReserveKeyFromKeyPool(int64& nIndex, CKeyPool& keypool) void CWalletDB::ReserveKeyFromKeyPool(int64& nIndex, CKeyPool& keypool)
{ {
nIndex = -1; nIndex = -1;
keypool.vchPubKey.clear(); keypool.vchPubKey.clear();
CRITICAL_BLOCK(cs_main)
CRITICAL_BLOCK(cs_mapWallet)
CRITICAL_BLOCK(cs_setKeyPool) CRITICAL_BLOCK(cs_setKeyPool)
{ {
// Top up key pool // Top up key pool
@ -881,7 +884,11 @@ void CWalletDB::ReserveKeyFromKeyPool(int64& nIndex, CKeyPool& keypool)
void CWalletDB::KeepKey(int64 nIndex) void CWalletDB::KeepKey(int64 nIndex)
{ {
// Remove from key pool // Remove from key pool
CRITICAL_BLOCK(cs_main)
CRITICAL_BLOCK(cs_mapWallet)
{
Erase(make_pair(string("pool"), nIndex)); Erase(make_pair(string("pool"), nIndex));
}
printf("keypool keep %"PRI64d"\n", nIndex); printf("keypool keep %"PRI64d"\n", nIndex);
} }

1
db.h
Unescape View File

@ -455,6 +455,7 @@ public:
~CReserveKey() ~CReserveKey()
{ {
if (!fShutdown)
ReturnKey(); ReturnKey();
} }

30
init.cpp
Unescape View File

@ -165,22 +165,22 @@ bool AppInit2(int argc, char* argv[])
" bitcoin [options] help \t\t " + _("List commands\n") + " bitcoin [options] help \t\t " + _("List commands\n") +
" bitcoin [options] help <command> \t\t " + _("Get help for a command\n") + " bitcoin [options] help <command> \t\t " + _("Get help for a command\n") +
_("Options:\n") + _("Options:\n") +
" -conf=<file> \t " + _("Specify configuration file (default: bitcoin.conf)\n") + " -conf=<file> \t\t " + _("Specify configuration file (default: bitcoin.conf)\n") +
" -gen \t " + _("Generate coins\n") + " -gen \t\t " + _("Generate coins\n") +
" -gen=0 \t " + _("Don't generate coins\n") + " -gen=0 \t\t " + _("Don't generate coins\n") +
" -min \t " + _("Start minimized\n") + " -min \t\t " + _("Start minimized\n") +
" -datadir=<dir> \t " + _("Specify data directory\n") + " -datadir=<dir> \t\t " + _("Specify data directory\n") +
" -proxy=<ip:port> \t " + _("Connect through socks4 proxy\n") + " -proxy=<ip:port> \t " + _("Connect through socks4 proxy\n") +
" -addnode=<ip> \t " + _("Add a node to connect to\n") + " -addnode=<ip> \t " + _("Add a node to connect to\n") +
" -connect=<ip> \t " + _("Connect only to the specified node\n") + " -connect=<ip> \t\t " + _("Connect only to the specified node\n") +
" -server \t " + _("Accept command line and JSON-RPC commands\n") + " -server \t\t " + _("Accept command line and JSON-RPC commands\n") +
" -daemon \t " + _("Run in the background as a daemon and accept commands\n") + " -daemon \t\t " + _("Run in the background as a daemon and accept commands\n") +
" -testnet \t\t " + _("Use the test network\n") +
" -rpcuser=<user> \t " + _("Username for JSON-RPC connections\n") + " -rpcuser=<user> \t " + _("Username for JSON-RPC connections\n") +
" -rpcpassword=<pw>\t " + _("Password for JSON-RPC connections\n") + " -rpcpassword=<pw>\t " + _("Password for JSON-RPC connections\n") +
" -rpcport=<port> \t " + _("Listen for JSON-RPC connections on <port>\n") + " -rpcport=<port> \t\t " + _("Listen for JSON-RPC connections on <port>\n") +
" -rpcallowip=<ip> \t " + _("Allow JSON-RPC connections from specified IP address\n") + " -rpcallowip=<ip> \t\t " + _("Allow JSON-RPC connections from specified IP address\n") +
" -rpcconnect=<ip> \t " + _("Send commands to node running on <ip>\n") + " -rpcconnect=<ip> \t " + _("Send commands to node running on <ip>\n");
" -? \t " + _("This help message\n");
#ifdef USE_SSL #ifdef USE_SSL
strUsage += string() + strUsage += string() +
@ -191,6 +191,9 @@ bool AppInit2(int argc, char* argv[])
" -rpcsslciphers=<ciphers> \t " + _("Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)\n"); " -rpcsslciphers=<ciphers> \t " + _("Acceptable ciphers (default: TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!AH:!3DES:@STRENGTH)\n");
#endif #endif
strUsage += string() +
" -? \t\t " + _("This help message\n");
#if defined(__WXMSW__) && defined(GUI) #if defined(__WXMSW__) && defined(GUI)
// Tabs make the columns line up in the message box // Tabs make the columns line up in the message box
wxMessageBox(strUsage, "Bitcoin", wxOK); wxMessageBox(strUsage, "Bitcoin", wxOK);
@ -208,6 +211,9 @@ bool AppInit2(int argc, char* argv[])
if (mapArgs.count("-printtodebugger")) if (mapArgs.count("-printtodebugger"))
fPrintToDebugger = true; fPrintToDebugger = true;
if (mapArgs.count("-testnet"))
fTestNet = true;
if (fCommandLine) if (fCommandLine)
{ {
int ret = CommandLineRPC(argc, argv); int ret = CommandLineRPC(argc, argv);

4
irc.cpp
Unescape View File

@ -252,8 +252,8 @@ void ThreadIRCSeed2(void* parg)
} }
Sleep(500); Sleep(500);
Send(hSocket, "JOIN #bitcoin\r"); Send(hSocket, fTestNet ? "JOIN #bitcoinTEST\r" : "JOIN #bitcoin\r");
Send(hSocket, "WHO #bitcoin\r"); Send(hSocket, fTestNet ? "WHO #bitcoinTEST\r" : "WHO #bitcoin\r");
int64 nStart = GetTime(); int64 nStart = GetTime();
string strLine; string strLine;

80
main.cpp
Unescape View File

@ -21,7 +21,8 @@ unsigned int nTransactionsUpdated = 0;
map<COutPoint, CInPoint> mapNextTx; map<COutPoint, CInPoint> mapNextTx;
map<uint256, CBlockIndex*> mapBlockIndex; map<uint256, CBlockIndex*> mapBlockIndex;
const uint256 hashGenesisBlock("0x000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f"); uint256 hashGenesisBlock("0x000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f");
CBigNum bnProofOfWorkLimit(~uint256(0) >> 32);
CBlockIndex* pindexGenesisBlock = NULL; CBlockIndex* pindexGenesisBlock = NULL;
int nBestHeight = -1; int nBestHeight = -1;
CBigNum bnBestChainWork = 0; CBigNum bnBestChainWork = 0;
@ -1487,6 +1488,7 @@ bool CBlock::AcceptBlock()
return error("AcceptBlock() : contains a non-final transaction"); return error("AcceptBlock() : contains a non-final transaction");
// Check that the block chain matches the known block chain up to a checkpoint // Check that the block chain matches the known block chain up to a checkpoint
if (!fTestNet)
if ((nHeight == 11111 && hash != uint256("0x0000000069e244f73d78e8fd29ba2fd2ed618bd6fa2ee92559f542fdb26e7c1d")) || if ((nHeight == 11111 && hash != uint256("0x0000000069e244f73d78e8fd29ba2fd2ed618bd6fa2ee92559f542fdb26e7c1d")) ||
(nHeight == 33333 && hash != uint256("0x000000002dd5588a74784eaa7ab0507a18ad16a236e7b1ce69f00d7ddfb5d0a6")) || (nHeight == 33333 && hash != uint256("0x000000002dd5588a74784eaa7ab0507a18ad16a236e7b1ce69f00d7ddfb5d0a6")) ||
(nHeight == 68555 && hash != uint256("0x00000000001e1b4903550a0b96e9a9405c8a95f387162e4944e8d9fbe501cd6a")) || (nHeight == 68555 && hash != uint256("0x00000000001e1b4903550a0b96e9a9405c8a95f387162e4944e8d9fbe501cd6a")) ||
@ -1683,6 +1685,16 @@ FILE* AppendBlockFile(unsigned int& nFileRet)
bool LoadBlockIndex(bool fAllowNew) bool LoadBlockIndex(bool fAllowNew)
{ {
if (fTestNet)
{
hashGenesisBlock = uint256("0x0000000224b1593e3ff16a0e3b61285bbc393a39f78c8aa48c456142671f7110");
bnProofOfWorkLimit = CBigNum(~uint256(0) >> 28);
pchMessageStart[0] = 0xfa;
pchMessageStart[1] = 0xbf;
pchMessageStart[2] = 0xb5;
pchMessageStart[3] = 0xda;
}
// //
// Load block index // Load block index
// //
@ -1723,13 +1735,19 @@ bool LoadBlockIndex(bool fAllowNew)
block.nBits = 0x1d00ffff; block.nBits = 0x1d00ffff;
block.nNonce = 2083236893; block.nNonce = 2083236893;
if (fTestNet)
{
block.nTime = 1279232055;
block.nBits = 0x1d07fff8;
block.nNonce = 81622180;
}
//// debug print //// debug print
printf("%s\n", block.GetHash().ToString().c_str()); printf("%s\n", block.GetHash().ToString().c_str());
printf("%s\n", hashGenesisBlock.ToString().c_str()); printf("%s\n", hashGenesisBlock.ToString().c_str());
printf("%s\n", block.hashMerkleRoot.ToString().c_str()); printf("%s\n", block.hashMerkleRoot.ToString().c_str());
assert(block.hashMerkleRoot == uint256("0x4a5e1e4baab89f3a32518a88c31bc87f618f76673e2cc77ab2127b7afdeda33b")); assert(block.hashMerkleRoot == uint256("0x4a5e1e4baab89f3a32518a88c31bc87f618f76673e2cc77ab2127b7afdeda33b"));
block.print(); block.print();
assert(block.GetHash() == hashGenesisBlock); assert(block.GetHash() == hashGenesisBlock);
// Start new block file // Start new block file
@ -1963,7 +1981,10 @@ bool AlreadyHave(CTxDB& txdb, const CInv& inv)
// The message start string is designed to be unlikely to occur in normal data.
// The characters are rarely used upper ascii, not valid as UTF-8, and produce
// a large 4-byte int at any alignment.
char pchMessageStart[4] = { 0xf9, 0xbe, 0xb4, 0xd9 };
bool ProcessMessages(CNode* pfrom) bool ProcessMessages(CNode* pfrom)
@ -2022,19 +2043,14 @@ bool ProcessMessages(CNode* pfrom)
if (nMessageSize > vRecv.size()) if (nMessageSize > vRecv.size())
{ {
// Rewind and wait for rest of message // Rewind and wait for rest of message
///// need a mechanism to give up waiting for overlong message size error
vRecv.insert(vRecv.begin(), vHeaderSave.begin(), vHeaderSave.end()); vRecv.insert(vRecv.begin(), vHeaderSave.begin(), vHeaderSave.end());
break; break;
} }
// Copy message to its own buffer
CDataStream vMsg(vRecv.begin(), vRecv.begin() + nMessageSize, vRecv.nType, vRecv.nVersion);
vRecv.ignore(nMessageSize);
// Checksum // Checksum
if (vRecv.GetVersion() >= 209) if (vRecv.GetVersion() >= 209)
{ {
uint256 hash = Hash(vMsg.begin(), vMsg.end()); uint256 hash = Hash(vRecv.begin(), vRecv.begin() + nMessageSize);
unsigned int nChecksum = 0; unsigned int nChecksum = 0;
memcpy(&nChecksum, &hash, sizeof(nChecksum)); memcpy(&nChecksum, &hash, sizeof(nChecksum));
if (nChecksum != hdr.nChecksum) if (nChecksum != hdr.nChecksum)
@ -2045,6 +2061,10 @@ bool ProcessMessages(CNode* pfrom)
} }
} }
// Copy message to its own buffer
CDataStream vMsg(vRecv.begin(), vRecv.begin() + nMessageSize, vRecv.nType, vRecv.nVersion);
vRecv.ignore(nMessageSize);
// Process message // Process message
bool fRet = false; bool fRet = false;
try try
@ -2208,20 +2228,27 @@ bool ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
addr.nTime -= 5 * 24 * 60 * 60; addr.nTime -= 5 * 24 * 60 * 60;
AddAddress(addr); AddAddress(addr);
pfrom->AddAddressKnown(addr); pfrom->AddAddressKnown(addr);
if (!pfrom->fGetAddr && addr.IsRoutable()) if (!pfrom->fGetAddr && vAddr.size() <= 10 && addr.IsRoutable())
{ {
// Relay to a limited number of other nodes // Relay to a limited number of other nodes
CRITICAL_BLOCK(cs_vNodes) CRITICAL_BLOCK(cs_vNodes)
{ {
// Use deterministic randomness to send to // Use deterministic randomness to send to the same nodes for 24 hours
// the same places for 12 hours at a time // at a time so the setAddrKnowns of the chosen nodes prevent repeats
static uint256 hashSalt; static uint256 hashSalt;
if (hashSalt == 0) if (hashSalt == 0)
RAND_bytes((unsigned char*)&hashSalt, sizeof(hashSalt)); RAND_bytes((unsigned char*)&hashSalt, sizeof(hashSalt));
uint256 hashRand = addr.ip ^ ((GetTime()+addr.ip)/(12*60*60)) ^ hashSalt; uint256 hashRand = hashSalt ^ (((int64)addr.ip)<<32) ^ ((GetTime()+addr.ip)/(24*60*60));
hashRand = Hash(BEGIN(hashRand), END(hashRand));
multimap<uint256, CNode*> mapMix; multimap<uint256, CNode*> mapMix;
foreach(CNode* pnode, vNodes) foreach(CNode* pnode, vNodes)
mapMix.insert(make_pair(hashRand = Hash(BEGIN(hashRand), END(hashRand)), pnode)); {
unsigned int nPointer;
memcpy(&nPointer, &pnode, sizeof(nPointer));
uint256 hashKey = hashRand ^ nPointer;
hashKey = Hash(BEGIN(hashKey), END(hashKey));
mapMix.insert(make_pair(hashKey, pnode));
}
int nRelayNodes = 2; int nRelayNodes = 2;
for (multimap<uint256, CNode*>::iterator mi = mapMix.begin(); mi != mapMix.end() && nRelayNodes-- > 0; ++mi) for (multimap<uint256, CNode*>::iterator mi = mapMix.begin(); mi != mapMix.end() && nRelayNodes-- > 0; ++mi)
((*mi).second)->PushAddress(addr); ((*mi).second)->PushAddress(addr);
@ -2446,7 +2473,7 @@ bool ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
foreach(const PAIRTYPE(vector<unsigned char>, CAddress)& item, mapAddresses) foreach(const PAIRTYPE(vector<unsigned char>, CAddress)& item, mapAddresses)
{ {
const CAddress& addr = item.second; const CAddress& addr = item.second;
if (addr.nTime > nSince && GetRand(nCount) < 2000) if (addr.nTime > nSince && GetRand(nCount) < 2500)
pfrom->PushAddress(addr); pfrom->PushAddress(addr);
} }
} }
@ -2931,10 +2958,12 @@ void BitcoinMiner()
f4WaySSE2 = (mapArgs["-4way"] != "0"); f4WaySSE2 = (mapArgs["-4way"] != "0");
CReserveKey reservekey; CReserveKey reservekey;
CBigNum bnExtraNonce = 0; unsigned int nExtraNonce = 0;
int64 nPrevTime = 0;
while (fGenerateBitcoins) while (fGenerateBitcoins)
{ {
Sleep(50); if (AffinityBugWorkaround(ThreadBitcoinMiner))
return;
if (fShutdown) if (fShutdown)
return; return;
while (vNodes.empty() || IsInitialBlockDownload()) while (vNodes.empty() || IsInitialBlockDownload())
@ -2957,7 +2986,13 @@ void BitcoinMiner()
CTransaction txNew; CTransaction txNew;
txNew.vin.resize(1); txNew.vin.resize(1);
txNew.vin[0].prevout.SetNull(); txNew.vin[0].prevout.SetNull();
txNew.vin[0].scriptSig << ++bnExtraNonce; int64 nNow = max(pindexPrev->GetMedianTimePast()+1, GetAdjustedTime());
if (nNow > nPrevTime+1 && ++nExtraNonce >= 0x7f)
{
nExtraNonce = 1;
nPrevTime = nNow;
}
txNew.vin[0].scriptSig << nBits << CBigNum(nExtraNonce);
txNew.vout.resize(1); txNew.vout.resize(1);
txNew.vout[0].scriptPubKey << reservekey.GetReservedKey() << OP_CHECKSIG; txNew.vout[0].scriptPubKey << reservekey.GetReservedKey() << OP_CHECKSIG;
@ -3045,9 +3080,9 @@ void BitcoinMiner()
tmpworkspace& tmp = *(tmpworkspace*)alignup<16>(tmpbuf); tmpworkspace& tmp = *(tmpworkspace*)alignup<16>(tmpbuf);
tmp.block.nVersion = pblock->nVersion; tmp.block.nVersion = pblock->nVersion;
tmp.block.hashPrevBlock = pblock->hashPrevBlock = (pindexPrev ? pindexPrev->GetBlockHash() : 0); tmp.block.hashPrevBlock = pblock->hashPrevBlock = pindexPrev->GetBlockHash();
tmp.block.hashMerkleRoot = pblock->hashMerkleRoot = pblock->BuildMerkleTree(); tmp.block.hashMerkleRoot = pblock->hashMerkleRoot = pblock->BuildMerkleTree();
tmp.block.nTime = pblock->nTime = max((pindexPrev ? pindexPrev->GetMedianTimePast()+1 : 0), GetAdjustedTime()); tmp.block.nTime = pblock->nTime = max(pindexPrev->GetMedianTimePast()+1, GetAdjustedTime());
tmp.block.nBits = pblock->nBits = nBits; tmp.block.nBits = pblock->nBits = nBits;
tmp.block.nNonce = pblock->nNonce = 0; tmp.block.nNonce = pblock->nNonce = 0;
@ -3177,10 +3212,7 @@ void BitcoinMiner()
break; break;
// Update nTime every few seconds // Update nTime every few seconds
int64 nNewTime = max(pindexPrev->GetMedianTimePast()+1, GetAdjustedTime()); pblock->nTime = max(pindexPrev->GetMedianTimePast()+1, GetAdjustedTime());
if (nNewTime != pblock->nTime && bnExtraNonce > 10)
bnExtraNonce = 0;
pblock->nTime = nNewTime;
tmp.block.nTime = ByteReverse(pblock->nTime); tmp.block.nTime = ByteReverse(pblock->nTime);
} }
} }

4
main.h
Unescape View File

@ -22,7 +22,6 @@ static const int64 CENT = 1000000;
static const int64 MAX_MONEY = 21000000 * COIN; static const int64 MAX_MONEY = 21000000 * COIN;
inline bool MoneyRange(int64 nValue) { return (nValue >= 0 && nValue <= MAX_MONEY); } inline bool MoneyRange(int64 nValue) { return (nValue >= 0 && nValue <= MAX_MONEY); }
static const int COINBASE_MATURITY = 100; static const int COINBASE_MATURITY = 100;
static const CBigNum bnProofOfWorkLimit(~uint256(0) >> 32);
@ -31,7 +30,8 @@ static const CBigNum bnProofOfWorkLimit(~uint256(0) >> 32);
extern CCriticalSection cs_main; extern CCriticalSection cs_main;
extern map<uint256, CBlockIndex*> mapBlockIndex; extern map<uint256, CBlockIndex*> mapBlockIndex;
extern const uint256 hashGenesisBlock; extern uint256 hashGenesisBlock;
extern CBigNum bnProofOfWorkLimit;
extern CBlockIndex* pindexGenesisBlock; extern CBlockIndex* pindexGenesisBlock;
extern int nBestHeight; extern int nBestHeight;
extern CBigNum bnBestChainWork; extern CBigNum bnBestChainWork;

2
net.cpp
Unescape View File

@ -937,7 +937,7 @@ void ThreadOpenConnections2(void* parg)
// Add seed nodes if IRC isn't working // Add seed nodes if IRC isn't working
static bool fSeedUsed; static bool fSeedUsed;
bool fTOR = (fUseProxy && addrProxy.port == htons(9050)); bool fTOR = (fUseProxy && addrProxy.port == htons(9050));
if (mapAddresses.empty() && (GetTime() - nStart > 60 || fTOR)) if (mapAddresses.empty() && (GetTime() - nStart > 60 || fTOR) && !fTestNet)
{ {
for (int i = 0; i < ARRAYLEN(pnSeed); i++) for (int i = 0; i < ARRAYLEN(pnSeed); i++)
{ {

5
net.h
Unescape View File

@ -48,10 +48,7 @@ bool StopNode();
// (4) size // (4) size
// (4) checksum // (4) checksum
// The message start string is designed to be unlikely to occur in normal data. extern char pchMessageStart[4];
// The characters are rarely used upper ascii, not valid as UTF-8, and produce
// a large 4-byte int at any alignment.
static const char pchMessageStart[4] = { 0xf9, 0xbe, 0xb4, 0xd9 };
class CMessageHeader class CMessageHeader
{ {

7
script.cpp
Unescape View File

@ -776,16 +776,11 @@ bool EvalScript(vector<vector<unsigned char> >& stack, const CScript& script, co
return false; return false;
int nKeysCount = CastToBigNum(stacktop(-i)).getint(); int nKeysCount = CastToBigNum(stacktop(-i)).getint();
if (nKeysCount < 0) if (nKeysCount < 0 || nKeysCount > 20)
return false;
if (nBestHeight > 84000)
{
if (nKeysCount > 20)
return false; return false;
nOpCount += nKeysCount; nOpCount += nKeysCount;
if (nOpCount > 201) if (nOpCount > 201)
return false; return false;
}
int ikey = ++i; int ikey = ++i;
i += nKeysCount; i += nKeysCount;
if (stack.size() < i) if (stack.size() < i)

2
serialize.h
Unescape View File

@ -22,7 +22,7 @@ class CDataStream;
class CAutoFile; class CAutoFile;
static const unsigned int MAX_SIZE = 0x02000000; static const unsigned int MAX_SIZE = 0x02000000;
static const int VERSION = 31304; static const int VERSION = 31305;
static const char* pszSubVer = ""; static const char* pszSubVer = "";

1
ui.cpp
Unescape View File

@ -763,6 +763,7 @@ bool CMainFrame::InsertTransaction(const CWalletTx& wtx, bool fNew, int nIndex)
SingleLine(strDescription), SingleLine(strDescription),
FormatMoney(-nValue, true), FormatMoney(-nValue, true),
""); "");
nIndex = -1;
wtx.nLinesDisplayed++; wtx.nLinesDisplayed++;
} }
} }

27
util.cpp
Unescape View File

@ -16,6 +16,7 @@ bool fShutdown = false;
bool fDaemon = false; bool fDaemon = false;
bool fCommandLine = false; bool fCommandLine = false;
string strMiscWarning; string strMiscWarning;
bool fTestNet = false;
@ -649,15 +650,11 @@ string GetDefaultDataDir()
void GetDataDir(char* pszDir) void GetDataDir(char* pszDir)
{ {
// pszDir must be at least MAX_PATH length. // pszDir must be at least MAX_PATH length.
int nVariation;
if (pszSetDataDir[0] != 0) if (pszSetDataDir[0] != 0)
{ {
strlcpy(pszDir, pszSetDataDir, MAX_PATH); strlcpy(pszDir, pszSetDataDir, MAX_PATH);
static bool fMkdirDone; nVariation = 0;
if (!fMkdirDone)
{
fMkdirDone = true;
filesystem::create_directory(pszDir);
}
} }
else else
{ {
@ -665,11 +662,23 @@ void GetDataDir(char* pszDir)
// value so we don't have to do memory allocations after that. // value so we don't have to do memory allocations after that.
static char pszCachedDir[MAX_PATH]; static char pszCachedDir[MAX_PATH];
if (pszCachedDir[0] == 0) if (pszCachedDir[0] == 0)
{
strlcpy(pszCachedDir, GetDefaultDataDir().c_str(), sizeof(pszCachedDir)); strlcpy(pszCachedDir, GetDefaultDataDir().c_str(), sizeof(pszCachedDir));
filesystem::create_directory(pszCachedDir);
}
strlcpy(pszDir, pszCachedDir, MAX_PATH); strlcpy(pszDir, pszCachedDir, MAX_PATH);
nVariation = 1;
}
if (fTestNet)
{
char* p = pszDir + strlen(pszDir);
if (p > pszDir && p[-1] != '/' && p[-1] != '\\')
*p++ = '/';
strcpy(p, "testnet");
nVariation += 2;
}
static bool pfMkdir[4];
if (!pfMkdir[nVariation])
{
pfMkdir[nVariation] = true;
filesystem::create_directory(pszDir);
} }
} }

25
util.h
Unescape View File

@ -145,6 +145,7 @@ extern bool fShutdown;
extern bool fDaemon; extern bool fDaemon;
extern bool fCommandLine; extern bool fCommandLine;
extern string strMiscWarning; extern string strMiscWarning;
extern bool fTestNet;
void RandAddSeed(); void RandAddSeed();
void RandAddSeedPerfmon(); void RandAddSeedPerfmon();
@ -621,3 +622,27 @@ inline void ExitThread(unsigned int nExitCode)
pthread_exit((void*)nExitCode); pthread_exit((void*)nExitCode);
} }
#endif #endif
inline bool AffinityBugWorkaround(void(*pfn)(void*))
{
#ifdef __WXMSW__
// Sometimes after a few hours affinity gets stuck on one processor
DWORD dwProcessAffinityMask = -1;
DWORD dwSystemAffinityMask = -1;
GetProcessAffinityMask(GetCurrentProcess(), &dwProcessAffinityMask, &dwSystemAffinityMask);
DWORD dwPrev1 = SetThreadAffinityMask(GetCurrentThread(), dwProcessAffinityMask);
DWORD dwPrev2 = SetThreadAffinityMask(GetCurrentThread(), dwProcessAffinityMask);
if (dwPrev2 != dwProcessAffinityMask)
{
printf("AffinityBugWorkaround() : SetThreadAffinityMask=%d, ProcessAffinityMask=%d, restarting thread\n", dwPrev2, dwProcessAffinityMask);
if (!CreateThread(pfn, NULL))
printf("Error: CreateThread() failed\n");
return true;
}
#endif
return false;
}

Write Preview
Loading…
Cancel
Save