Browse Source

Merge branch 'master' of https://github.com/bitcoin/bitcoin

pull/1/head
Wladimir J. van der Laan 11 years ago
parent
commit
0a70a3f4d8
  1. 4
      contrib/Bitcoin.app/Contents/Info.plist
  2. 2
      doc/README
  3. 2
      doc/README_windows.txt
  4. 32
      doc/coding.txt
  5. 3
      doc/release-process.txt
  6. BIN
      locale/cs/LC_MESSAGES/bitcoin.mo
  7. BIN
      locale/fr/LC_MESSAGES/bitcoin.mo
  8. BIN
      locale/nl/LC_MESSAGES/bitcoin.mo
  9. BIN
      locale/pt/LC_MESSAGES/bitcoin.mo
  10. 6
      share/setup.nsi
  11. 4
      src/main.cpp
  12. 30
      src/net.cpp
  13. 2
      src/serialize.h
  14. 26
      src/util.cpp

4
contrib/Bitcoin.app/Contents/Info.plist

@ -17,11 +17,11 @@ @@ -17,11 +17,11 @@
<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>

2
doc/README

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
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

2
doc/README_windows.txt

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
Bitcoin 0.3.25 BETA
Bitcoin 0.4.00rc1 BETA
Copyright (c) 2009-2011 Bitcoin Developers
Distributed under the MIT/X11 software license, see the accompanying

32
doc/coding.txt

@ -43,38 +43,52 @@ bn CBigNum @@ -43,38 +43,52 @@ bn CBigNum
-------------------------
Locking/mutex usage notes
The code is multi-threaded, and uses mutexes and the CRITICAL_BLOCK/TRY_CRITICAL_BLOCK macros to protect data structures.
The code is multi-threaded, and uses mutexes and the
CRITICAL_BLOCK/TRY_CRITICAL_BLOCK macros to protect data structures.
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.
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.
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).
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).
-------
Threads
StartNode : Starts other threads.
ThreadGetMyExternalIP : Determines outside-the-firewall IP address, sends addr message to connected peers when it determines it.
ThreadGetMyExternalIP : Determines outside-the-firewall IP address,
sends addr message to connected peers when it determines it.
ThreadIRCSeed : Joins IRC bootstrapping channel, watching for new peers and advertising this node's IP address.
ThreadIRCSeed : Joins IRC bootstrapping channel, watching for new
peers and advertising this node's IP address.
ThreadSocketHandler : Sends/Receives data from peers on port 8333.
ThreadMessageHandler : Higher-level message handling (sending and receiving).
ThreadMessageHandler : Higher-level message handling (sending and
receiving).
ThreadOpenConnections : Initiates new connections to peers.
ThreadTopUpKeyPool : replenishes the keystore's keypool.
ThreadCleanWalletPassphrase : re-locks an encrypted wallet after user has unlocked it for a period of time.
ThreadCleanWalletPassphrase : re-locks an encrypted wallet after user
has unlocked it for a period of time.
SendingDialogStartTransfer : used by pay-via-ip-address code (obsolete)
ThreadDelayedRepaint : repaint the gui
ThreadFlushWalletDB : Close the wallet.dat file if it hasn't been used in 500ms.
ThreadFlushWalletDB : Close the wallet.dat file if it hasn't been used
in 500ms.
ThreadRPCServer : Remote procedure call handler, listens on port 8332 for connections and services them.
ThreadRPCServer : Remote procedure call handler, listens on port 8332
for connections and services them.
ThreadBitcoinMiner : Generates bitcoins

3
doc/release-process.txt

@ -1,6 +1,9 @@ @@ -1,6 +1,9 @@
* 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

BIN
locale/cs/LC_MESSAGES/bitcoin.mo

Binary file not shown.

BIN
locale/fr/LC_MESSAGES/bitcoin.mo

Binary file not shown.

BIN
locale/nl/LC_MESSAGES/bitcoin.mo

Binary file not shown.

BIN
locale/pt/LC_MESSAGES/bitcoin.mo

Binary file not shown.

6
share/setup.nsi

@ -5,7 +5,7 @@ SetCompressor /SOLID lzma @@ -5,7 +5,7 @@ SetCompressor /SOLID lzma
# General Symbol Definitions
!define REGKEY "SOFTWARE\$(^Name)"
!define VERSION 0.3.25
!define VERSION 0.4.00
!define COMPANY "Bitcoin project"
!define URL http://www.bitcoin.org/
@ -45,13 +45,13 @@ Var StartMenuGroup @@ -45,13 +45,13 @@ Var StartMenuGroup
!insertmacro MUI_LANGUAGE English
# Installer attributes
OutFile bitcoin-0.3.25-win32-setup.exe
OutFile bitcoin-0.4.00-win32-setup.exe
InstallDir $PROGRAMFILES\Bitcoin
CRCCheck on
XPStyle on
BrandingText " "
ShowInstDetails show
VIProductVersion 0.3.25.0
VIProductVersion 0.4.00.0
VIAddVersionKey ProductName Bitcoin
VIAddVersionKey ProductVersion "${VERSION}"
VIAddVersionKey CompanyName "${COMPANY}"

4
src/main.cpp

@ -1830,7 +1830,9 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv) @@ -1830,7 +1830,9 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
// 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));

30
src/net.cpp

@ -1349,7 +1349,6 @@ void ThreadOpenConnections2(void* parg) @@ -1349,7 +1349,6 @@ void ThreadOpenConnections2(void* parg)
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)
{
@ -1365,35 +1364,6 @@ void ThreadOpenConnections2(void* parg) @@ -1365,35 +1364,6 @@ void ThreadOpenConnections2(void* parg)
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);
}
}
}
}
}

2
src/serialize.h

@ -60,7 +60,7 @@ class CDataStream; @@ -60,7 +60,7 @@ class CDataStream;
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;

26
src/util.cpp

@ -921,16 +921,22 @@ string FormatFullVersion() @@ -921,16 +921,22 @@ string FormatFullVersion()
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;
@ -948,14 +954,14 @@ static void potential_deadlock_detected(const std::pair<CCriticalSection*, CCrit @@ -948,14 +954,14 @@ static void potential_deadlock_detected(const std::pair<CCriticalSection*, CCrit
{
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());
}
}
@ -965,6 +971,7 @@ static void push_lock(CCriticalSection* c, const CLockLocation& locklocation) @@ -965,6 +971,7 @@ static void push_lock(CCriticalSection* c, const CLockLocation& locklocation)
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));
@ -990,7 +997,14 @@ static void push_lock(CCriticalSection* c, const CLockLocation& locklocation) @@ -990,7 +997,14 @@ static void push_lock(CCriticalSection* c, const CLockLocation& 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)

Loading…
Cancel
Save