<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>0.3.25</string>
+ <string>0.4.00</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>325</string>
+ <string>400</string>
<key>LSMinimumSystemVersion</key>
<string>10.5</string>
<key>CFBundleIconFile</key>
-Bitcoin 0.3.25 BETA
+Bitcoin 0.4.0rc1 BETA
Copyright (c) 2009-2011 Bitcoin Developers
Distributed under the MIT/X11 software license, see the accompanying
-Bitcoin 0.3.25 BETA\r
+Bitcoin 0.4.00rc1 BETA\r
\r
Copyright (c) 2009-2011 Bitcoin Developers\r
Distributed under the MIT/X11 software license, see the accompanying\r
-------------------------\r
Locking/mutex usage notes\r
\r
-The code is multi-threaded, and uses mutexes and the CRITICAL_BLOCK/TRY_CRITICAL_BLOCK macros to protect data structures.\r
+The code is multi-threaded, and uses mutexes and the\r
+CRITICAL_BLOCK/TRY_CRITICAL_BLOCK macros to protect data structures.\r
\r
-Deadlocks due to inconsistent lock ordering (thread 1 locks cs_main and then cs_wallet, while thread 2 locks them in the opposite order: result, deadlock as each waits for the other to release its lock) are a problem. Compile with -DDEBUG_LOCKORDER to get lock order inconsistencies reported in the debug.log file.\r
+Deadlocks due to inconsistent lock ordering (thread 1 locks cs_main\r
+and then cs_wallet, while thread 2 locks them in the opposite order:\r
+result, deadlock as each waits for the other to release its lock) are\r
+a problem. Compile with -DDEBUG_LOCKORDER to get lock order\r
+inconsistencies reported in the debug.log file.\r
\r
-Re-architecting the core code so there are better-defined interfaces between the various components is a goal, with any necessary locking done by the components (e.g. see the self-contained CKeyStore class and its cs_KeyStore lock for example).\r
+Re-architecting the core code so there are better-defined interfaces\r
+between the various components is a goal, with any necessary locking\r
+done by the components (e.g. see the self-contained CKeyStore class\r
+and its cs_KeyStore lock for example).\r
\r
-------\r
Threads\r
\r
StartNode : Starts other threads.\r
\r
-ThreadGetMyExternalIP : Determines outside-the-firewall IP address, sends addr message to connected peers when it determines it.\r
+ThreadGetMyExternalIP : Determines outside-the-firewall IP address,\r
+sends addr message to connected peers when it determines it. \r
\r
-ThreadIRCSeed : Joins IRC bootstrapping channel, watching for new peers and advertising this node's IP address.\r
+ThreadIRCSeed : Joins IRC bootstrapping channel, watching for new\r
+peers and advertising this node's IP address. \r
\r
ThreadSocketHandler : Sends/Receives data from peers on port 8333.\r
\r
-ThreadMessageHandler : Higher-level message handling (sending and receiving).\r
+ThreadMessageHandler : Higher-level message handling (sending and\r
+receiving).\r
\r
ThreadOpenConnections : Initiates new connections to peers.\r
\r
ThreadTopUpKeyPool : replenishes the keystore's keypool.\r
\r
-ThreadCleanWalletPassphrase : re-locks an encrypted wallet after user has unlocked it for a period of time.\r
+ThreadCleanWalletPassphrase : re-locks an encrypted wallet after user\r
+has unlocked it for a period of time. \r
\r
SendingDialogStartTransfer : used by pay-via-ip-address code (obsolete)\r
\r
ThreadDelayedRepaint : repaint the gui \r
\r
-ThreadFlushWalletDB : Close the wallet.dat file if it hasn't been used in 500ms.\r
+ThreadFlushWalletDB : Close the wallet.dat file if it hasn't been used\r
+in 500ms.\r
\r
-ThreadRPCServer : Remote procedure call handler, listens on port 8332 for connections and services them.\r
+ThreadRPCServer : Remote procedure call handler, listens on port 8332\r
+for connections and services them.\r
\r
ThreadBitcoinMiner : Generates bitcoins\r
\r
* update (commit) version in sources
+ src/serialize.h
+ share/setup.nsi
* update (commit) version in OSX app bundle
+ contrib/Bitcoin.app/Contents/Info.plist
* CFBundleShortVersionString should have value like 0.3.23
* CFBundleVersion should have value like 323
\r
# General Symbol Definitions\r
!define REGKEY "SOFTWARE\$(^Name)"\r
-!define VERSION 0.3.25\r
+!define VERSION 0.4.00\r
!define COMPANY "Bitcoin project"\r
!define URL http://www.bitcoin.org/\r
\r
!insertmacro MUI_LANGUAGE English\r
\r
# Installer attributes\r
-OutFile bitcoin-0.3.25-win32-setup.exe\r
+OutFile bitcoin-0.4.00-win32-setup.exe\r
InstallDir $PROGRAMFILES\Bitcoin\r
CRCCheck on\r
XPStyle on\r
BrandingText " "\r
ShowInstDetails show\r
-VIProductVersion 0.3.25.0\r
+VIProductVersion 0.4.00.0\r
VIAddVersionKey ProductName Bitcoin\r
VIAddVersionKey ProductVersion "${VERSION}"\r
VIAddVersionKey CompanyName "${COMPANY}"\r
// Ask the first connected node for block updates
static int nAskedForBlocks;
- if (!pfrom->fClient && (nAskedForBlocks < 1 || vNodes.size() <= 1))
+ if (!pfrom->fClient &&
+ (pfrom->nVersion < 32000 || pfrom->nVersion >= 32400) &&
+ (nAskedForBlocks < 1 || vNodes.size() <= 1))
{
nAskedForBlocks++;
pfrom->PushGetBlocks(pindexBest, uint256(0));
CRITICAL_BLOCK(cs_mapAddresses)
{
// Add seed nodes if IRC isn't working
- static bool fSeedUsed;
bool fTOR = (fUseProxy && addrProxy.port == htons(9050));
if (mapAddresses.empty() && (GetTime() - nStart > 60 || fTOR) && !fTestNet)
{
addr.nTime = GetTime()-GetRand(nOneWeek)-nOneWeek;
AddAddress(addr);
}
- fSeedUsed = true;
- }
-
- if (fSeedUsed && mapAddresses.size() > ARRAYLEN(pnSeed) + 100)
- {
- // Disconnect seed nodes
- set<unsigned int> setSeed(pnSeed, pnSeed + ARRAYLEN(pnSeed));
- static int64 nSeedDisconnected;
- if (nSeedDisconnected == 0)
- {
- nSeedDisconnected = GetTime();
- CRITICAL_BLOCK(cs_vNodes)
- BOOST_FOREACH(CNode* pnode, vNodes)
- if (setSeed.count(pnode->addr.ip))
- pnode->fDisconnect = true;
- }
-
- // Keep setting timestamps to 0 so they won't reconnect
- if (GetTime() - nSeedDisconnected < 60 * 60)
- {
- BOOST_FOREACH(PAIRTYPE(const vector<unsigned char>, CAddress)& item, mapAddresses)
- {
- if (setSeed.count(item.second.ip) && item.second.nTime != 0)
- {
- item.second.nTime = 0;
- CAddrDB().WriteAddress(item.second);
- }
- }
- }
}
}
class CAutoFile;
static const unsigned int MAX_SIZE = 0x02000000;
-static const int VERSION = 32500;
+static const int VERSION = 40000;
static const char* pszSubVer = "";
static const bool VERSION_IS_BETA = true;
struct CLockLocation
{
- std::string mutexName;
- std::string sourceFile;
- int sourceLine;
-
CLockLocation(const char* pszName, const char* pszFile, int nLine)
{
mutexName = pszName;
sourceFile = pszFile;
sourceLine = nLine;
}
+
+ std::string ToString() const
+ {
+ return mutexName+" "+sourceFile+":"+itostr(sourceLine);
+ }
+
+private:
+ std::string mutexName;
+ std::string sourceFile;
+ int sourceLine;
};
typedef std::vector< std::pair<CCriticalSection*, CLockLocation> > LockStack;
{
if (i.first == mismatch.first) printf(" (1)");
if (i.first == mismatch.second) printf(" (2)");
- printf(" %s %s:%d\n", i.second.mutexName.c_str(), i.second.sourceFile.c_str(), i.second.sourceLine);
+ printf(" %s\n", i.second.ToString().c_str());
}
printf("Current lock order is:\n");
BOOST_FOREACH(const PAIRTYPE(CCriticalSection*, CLockLocation)& i, s1)
{
if (i.first == mismatch.first) printf(" (1)");
if (i.first == mismatch.second) printf(" (2)");
- printf(" %s %s:%d\n", i.second.mutexName.c_str(), i.second.sourceFile.c_str(), i.second.sourceLine);
+ printf(" %s\n", i.second.ToString().c_str());
}
}
if (lockstack.get() == NULL)
lockstack.reset(new LockStack);
+ if (fDebug) printf("Locking: %s\n", locklocation.ToString().c_str());
dd_mutex.lock();
(*lockstack).push_back(std::make_pair(c, locklocation));
static void pop_lock()
{
+ if (fDebug)
+ {
+ const CLockLocation& locklocation = (*lockstack).rbegin()->second;
+ printf("Unlocked: %s\n", locklocation.ToString().c_str());
+ }
+ dd_mutex.lock();
(*lockstack).pop_back();
+ dd_mutex.unlock();
}
void CCriticalSection::Enter(const char* pszName, const char* pszFile, int nLine)