Merge pull request #1054 from sipa/buildinfo

Build identification strings

diff --combined src/init.cpp
index a1e45b1,9d37eb3..8d33878
--- 1/src/init.cpp
--- 2/src/init.cpp
+++ b/src/init.cpp
@@@ -40,13 -40,10 +40,13 @@@ void Shutdown(void* parg
      static CCriticalSection cs_Shutdown;
      static bool fTaken;
      bool fFirstThread = false;
 -    TRY_CRITICAL_BLOCK(cs_Shutdown)
      {
 -        fFirstThread = !fTaken;
 -        fTaken = true;
 +        TRY_LOCK(cs_Shutdown, lockShutdown);
 +        if (lockShutdown)
 +        {
 +            fFirstThread = !fTaken;
 +            fTaken = true;
 +        }
      }
      static bool fExit;
      if (fFirstThread)
@@@ -310,7 -307,7 +310,7 @@@ bool AppInit2(int argc, char* argv[]
      if (!fDebug && !pszSetDataDir[0])
          ShrinkDebugFile();
      printf("\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
-     printf("Bitcoin version %s\n", FormatFullVersion().c_str());
+     printf("Bitcoin version %s (%s)\n", FormatFullVersion().c_str(), CLIENT_DATE.c_str());
      printf("Default data directory %s\n", GetDefaultDataDir().c_str());
  
      if (GetBoolArg("-loadblockindextest"))

diff --combined src/main.cpp
index dea60f0,7e257f4..3fe0732
--- 1/src/main.cpp
--- 2/src/main.cpp
+++ b/src/main.cpp
@@@ -18,11 -18,6 +18,6 @@@ using namespace boost
  // Global state
  //
  
- // Name of client reported in the 'version' message. Report the same name
- // for both bitcoind and bitcoin-qt, to make it harder for attackers to
- // target servers or GUI users specifically.
- const std::string CLIENT_NAME("Satoshi");
- 
  CCriticalSection cs_setpwalletRegistered;
  set<CWallet*> setpwalletRegistered;
  
@@@ -75,16 -70,16 +70,16 @@@ int64 nTransactionFee = 0
  
  void RegisterWallet(CWallet* pwalletIn)
  {
 -    CRITICAL_BLOCK(cs_setpwalletRegistered)
      {
 +        LOCK(cs_setpwalletRegistered);
          setpwalletRegistered.insert(pwalletIn);
      }
  }
  
  void UnregisterWallet(CWallet* pwalletIn)
  {
 -    CRITICAL_BLOCK(cs_setpwalletRegistered)
      {
 +        LOCK(cs_setpwalletRegistered);
          setpwalletRegistered.erase(pwalletIn);
      }
  }
@@@ -478,11 -473,9 +473,11 @@@ bool CTransaction::AcceptToMemoryPool(C
  
      // Do we already have it?
      uint256 hash = GetHash();
 -    CRITICAL_BLOCK(cs_mapTransactions)
 +    {
 +        LOCK(cs_mapTransactions);
          if (mapTransactions.count(hash))
              return false;
 +    }
      if (fCheckInputs)
          if (txdb.ContainsTx(hash))
              return false;
@@@ -554,8 -547,8 +549,8 @@@
              static int64 nLastTime;
              int64 nNow = GetTime();
  
 -            CRITICAL_BLOCK(cs)
              {
 +                LOCK(cs);
                  // Use an exponentially decaying ~10-minute window:
                  dFreeCount *= pow(1.0 - 1.0/600.0, (double)(nNow - nLastTime));
                  nLastTime = nNow;
@@@ -578,8 -571,8 +573,8 @@@
      }
  
      // Store transaction in memory
 -    CRITICAL_BLOCK(cs_mapTransactions)
      {
 +        LOCK(cs_mapTransactions);
          if (ptxOld)
          {
              printf("AcceptToMemoryPool() : replacing tx %s with new version\n", ptxOld->GetHash().ToString().c_str());
@@@ -610,8 -603,8 +605,8 @@@ bool CTransaction::AddToMemoryPoolUnche
      printf("AcceptToMemoryPoolUnchecked(): size %lu\n",  mapTransactions.size());
      // Add to memory pool without checking anything.  Don't call this directly,
      // call AcceptToMemoryPool to properly check the transaction first.
 -    CRITICAL_BLOCK(cs_mapTransactions)
      {
 +        LOCK(cs_mapTransactions);
          uint256 hash = GetHash();
          mapTransactions[hash] = *this;
          for (int i = 0; i < vin.size(); i++)
@@@ -626,8 -619,8 +621,8 @@@
  bool CTransaction::RemoveFromMemoryPool()
  {
      // Remove transaction from memory pool
 -    CRITICAL_BLOCK(cs_mapTransactions)
      {
 +        LOCK(cs_mapTransactions);
          uint256 hash = GetHash();
          if (mapTransactions.count(hash))
          {
@@@ -704,9 -697,8 +699,9 @@@ bool CMerkleTx::AcceptToMemoryPool(
  
  bool CWalletTx::AcceptWalletTransaction(CTxDB& txdb, bool fCheckInputs)
  {
 -    CRITICAL_BLOCK(cs_mapTransactions)
 +
      {
 +        LOCK(cs_mapTransactions);
          // Add previous supporting transactions first
          BOOST_FOREACH(CMerkleTx& tx, vtxPrev)
          {
@@@ -1027,8 -1019,8 +1022,8 @@@ bool CTransaction::FetchInputs(CTxDB& t
          if (!fFound || txindex.pos == CDiskTxPos(1,1,1))
          {
              // Get prev tx from single transactions in memory
 -            CRITICAL_BLOCK(cs_mapTransactions)
              {
 +                LOCK(cs_mapTransactions);
                  if (!mapTransactions.count(prevout.hash))
                      return error("FetchInputs() : %s mapTransactions prev not found %s", GetHash().ToString().substr(0,10).c_str(),  prevout.hash.ToString().substr(0,10).c_str());
                  txPrev = mapTransactions[prevout.hash];
@@@ -1193,8 -1185,8 +1188,8 @@@ bool CTransaction::ClientConnectInputs(
          return false;
  
      // Take over previous transactions' spent pointers
 -    CRITICAL_BLOCK(cs_mapTransactions)
      {
 +        LOCK(cs_mapTransactions);
          int64 nValueIn = 0;
          for (int i = 0; i < vin.size(); i++)
          {
@@@ -1710,12 -1702,10 +1705,12 @@@ bool CBlock::AcceptBlock(
      // Relay inventory, but don't relay old inventory during initial block download
      int nBlockEstimate = Checkpoints::GetTotalBlocksEstimate();
      if (hashBestChain == hash)
 -        CRITICAL_BLOCK(cs_vNodes)
 -            BOOST_FOREACH(CNode* pnode, vNodes)
 -                if (nBestHeight > (pnode->nStartingHeight != -1 ? pnode->nStartingHeight - 2000 : nBlockEstimate))
 -                    pnode->PushInventory(CInv(MSG_BLOCK, hash));
 +    {
 +        LOCK(cs_vNodes);
 +        BOOST_FOREACH(CNode* pnode, vNodes)
 +            if (nBestHeight > (pnode->nStartingHeight != -1 ? pnode->nStartingHeight - 2000 : nBlockEstimate))
 +                pnode->PushInventory(CInv(MSG_BLOCK, hash));
 +    }
  
      return true;
  }
@@@ -2057,8 -2047,8 +2052,8 @@@ string GetWarnings(string strFor
      }
  
      // Alerts
 -    CRITICAL_BLOCK(cs_mapAlerts)
      {
 +        LOCK(cs_mapAlerts);
          BOOST_FOREACH(PAIRTYPE(const uint256, CAlert)& item, mapAlerts)
          {
              const CAlert& alert = item.second;
@@@ -2085,8 -2075,8 +2080,8 @@@ bool CAlert::ProcessAlert(
      if (!IsInEffect())
          return false;
  
 -    CRITICAL_BLOCK(cs_mapAlerts)
      {
 +        LOCK(cs_mapAlerts);
          // Cancel previous alerts
          for (map<uint256, CAlert>::iterator mi = mapAlerts.begin(); mi != mapAlerts.end();)
          {
@@@ -2265,11 -2255,9 +2260,11 @@@ bool static ProcessMessage(CNode* pfrom
          }
  
          // Relay alerts
 -        CRITICAL_BLOCK(cs_mapAlerts)
 +        {
 +            LOCK(cs_mapAlerts);
              BOOST_FOREACH(PAIRTYPE(const uint256, CAlert)& item, mapAlerts)
                  item.second.RelayTo(pfrom);
 +        }
  
          pfrom->fSuccessfullyConnected = true;
  
@@@ -2323,8 -2311,8 +2318,8 @@@
              if (addr.nTime > nSince && !pfrom->fGetAddr && vAddr.size() <= 10 && addr.IsRoutable())
              {
                  // Relay to a limited number of other nodes
 -                CRITICAL_BLOCK(cs_vNodes)
                  {
 +                    LOCK(cs_vNodes);
                      // Use deterministic randomness to send to the same nodes for 24 hours
                      // at a time so the setAddrKnowns of the chosen nodes prevent repeats
                      static uint256 hashSalt;
@@@ -2435,8 -2423,8 +2430,8 @@@
              else if (inv.IsKnownType())
              {
                  // Send stream from relay memory
 -                CRITICAL_BLOCK(cs_mapRelay)
                  {
 +                    LOCK(cs_mapRelay);
                      map<CInv, CDataStream>::iterator mi = mapRelay.find(inv);
                      if (mi != mapRelay.end())
                          pfrom->PushMessage(inv.GetCommand(), (*mi).second);
@@@ -2641,8 -2629,8 +2636,8 @@@
          vRecv >> hashReply;
  
          CRequestTracker tracker;
 -        CRITICAL_BLOCK(pfrom->cs_mapRequests)
          {
 +            LOCK(pfrom->cs_mapRequests);
              map<uint256, CRequestTracker>::iterator mi = pfrom->mapRequests.find(hashReply);
              if (mi != pfrom->mapRequests.end())
              {
@@@ -2669,11 -2657,9 +2664,11 @@@
          {
              // Relay
              pfrom->setKnown.insert(alert.GetHash());
 -            CRITICAL_BLOCK(cs_vNodes)
 +            {
 +                LOCK(cs_vNodes);
                  BOOST_FOREACH(CNode* pnode, vNodes)
                      alert.RelayTo(pnode);
 +            }
          }
      }
  
@@@ -2772,10 -2758,8 +2767,10 @@@ bool ProcessMessages(CNode* pfrom
          bool fRet = false;
          try
          {
 -            CRITICAL_BLOCK(cs_main)
 +            {
 +                LOCK(cs_main);
                  fRet = ProcessMessage(pfrom, strCommand, vMsg);
 +            }
              if (fShutdown)
                  return true;
          }
@@@ -2813,8 -2797,8 +2808,8 @@@
  
  bool SendMessages(CNode* pto, bool fSendTrickle)
  {
 -    CRITICAL_BLOCK(cs_main)
      {
 +        LOCK(cs_main);
          // Don't send anything until we get their version message
          if (pto->nVersion == 0)
              return true;
@@@ -2830,8 -2814,8 +2825,8 @@@
          static int64 nLastRebroadcast;
          if (!IsInitialBlockDownload() && (GetTime() - nLastRebroadcast > 24 * 60 * 60))
          {
 -            CRITICAL_BLOCK(cs_vNodes)
              {
 +                LOCK(cs_vNodes);
                  BOOST_FOREACH(CNode* pnode, vNodes)
                  {
                      // Periodically clear setAddrKnown to allow refresh broadcasts
@@@ -2882,8 -2866,8 +2877,8 @@@
          //
          vector<CInv> vInv;
          vector<CInv> vInvWait;
 -        CRITICAL_BLOCK(pto->cs_inventory)
          {
 +            LOCK(pto->cs_inventory);
              vInv.reserve(pto->vInventoryToSend.size());
              vInvWait.reserve(pto->vInventoryToSend.size());
              BOOST_FOREACH(const CInv& inv, pto->vInventoryToSend)
@@@ -3098,8 -3082,9 +3093,8 @@@ CBlock* CreateNewBlock(CReserveKey& res
  
      // Collect memory pool transactions into the block
      int64 nFees = 0;
 -    CRITICAL_BLOCK(cs_main)
 -    CRITICAL_BLOCK(cs_mapTransactions)
      {
 +        LOCK2(cs_main, cs_mapTransactions);
          CTxDB txdb("r");
  
          // Priority order to process transactions
@@@ -3327,8 -3312,8 +3322,8 @@@ bool CheckWork(CBlock* pblock, CWallet
      printf("generated %s\n", FormatMoney(pblock->vtx[0].vout[0].nValue).c_str());
  
      // Found a solution
 -    CRITICAL_BLOCK(cs_main)
      {
 +        LOCK(cs_main);
          if (pblock->hashPrevBlock != hashBestChain)
              return error("BitcoinMiner : generated block is stale");
  
@@@ -3336,10 -3321,8 +3331,10 @@@
          reservekey.KeepKey();
  
          // Track how many getdata requests this block gets
 -        CRITICAL_BLOCK(wallet.cs_wallet)
 +        {
 +            LOCK(wallet.cs_wallet);
              wallet.mapRequestCount[pblock->GetHash()] = 0;
 +        }
  
          // Process this block the same as if we had received it from another node
          if (!ProcessBlock(NULL, pblock))
@@@ -3455,8 -3438,8 +3450,8 @@@ void static BitcoinMiner(CWallet *pwall
              if (GetTimeMillis() - nHPSTimerStart > 4000)
              {
                  static CCriticalSection cs;
 -                CRITICAL_BLOCK(cs)
                  {
 +                    LOCK(cs);
                      if (GetTimeMillis() - nHPSTimerStart > 4000)
                      {
                          dHashesPerSec = 1000.0 * nHashCounter / (GetTimeMillis() - nHPSTimerStart);

diff --combined src/util.cpp
index 19538a4,7354df6..cf8ff53
--- 1/src/util.cpp
--- 2/src/util.cpp
+++ b/src/util.cpp
@@@ -2,7 -2,6 +2,7 @@@
  // Copyright (c) 2009-2012 The Bitcoin developers
  // Distributed under the MIT/X11 software license, see the accompanying
  // file license.txt or http://www.opensource.org/licenses/mit-license.php.
 +
  #include "headers.h"
  #include "strlcpy.h"
  #include <boost/algorithm/string/join.hpp>
@@@ -196,8 -195,8 +196,8 @@@ inline int OutputDebugStringF(const cha
          static CCriticalSection cs_OutputDebugStringF;
  
          // accumulate a line at a time
 -        CRITICAL_BLOCK(cs_OutputDebugStringF)
          {
 +            LOCK(cs_OutputDebugStringF);
              static char pszBuffer[50000];
              static char* pend;
              if (pend == NULL)
@@@ -859,11 -858,10 +859,11 @@@ string GetDataDir(
  string GetConfigFile()
  {
      namespace fs = boost::filesystem;
 -    fs::path pathConfig(GetArg("-conf", "bitcoin.conf"));
 -    if (!pathConfig.is_complete())
 -        pathConfig = fs::path(GetDataDir()) / pathConfig;
 -    return pathConfig.string();
 +
 +    fs::path pathConfigFile(GetArg("-conf", "bitcoin.conf"));
 +    if (!pathConfigFile.is_complete()) pathConfigFile = fs::path(GetDataDir()) / pathConfigFile;
 +    pathConfigFile.make_preferred();
 +    return pathConfigFile.string();
  }
  
  bool ReadConfigFile(map<string, string>& mapSettingsRet,
@@@ -876,9 -874,7 +876,9 @@@
      {
          if (fs::is_directory(fs::system_complete(mapSettingsRet["-datadir"])))
          {
 -            fs::path pathDataDir = fs::system_complete(mapSettingsRet["-datadir"]);
 +            fs::path pathDataDir(fs::system_complete(mapSettingsRet["-datadir"]));
 +            pathDataDir.make_preferred();
 +
              strlcpy(pszSetDataDir, pathDataDir.string().c_str(), sizeof(pszSetDataDir));
          }
          else
@@@ -912,11 -908,10 +912,11 @@@
  string GetPidFile()
  {
      namespace fs = boost::filesystem;
 -    fs::path pathConfig(GetArg("-pid", "bitcoind.pid"));
 -    if (!pathConfig.is_complete())
 -        pathConfig = fs::path(GetDataDir()) / pathConfig;
 -    return pathConfig.string();
 +
 +    fs::path pathPidFile(GetArg("-pid", "bitcoind.pid"));
 +    if (!pathPidFile.is_complete()) pathPidFile = fs::path(GetDataDir()) / pathPidFile;
 +    pathPidFile.make_preferred();
 +    return pathPidFile.string();
  }
  
  void CreatePidFile(string pidFile, pid_t pid)
@@@ -1066,12 -1061,7 +1066,7 @@@ string FormatVersion(int nVersion
  
  string FormatFullVersion()
  {
-     string s = FormatVersion(CLIENT_VERSION);
-     if (VERSION_IS_BETA) {
-         s += "-";
-         s += _("beta");
-     }
-     return s;
+     return CLIENT_BUILD;
  }
  
  // Format the subversion field according to BIP 14 spec (https://en.bitcoin.it/wiki/BIP_0014)
@@@ -1120,25 -1110,25 +1115,25 @@@ private
      int sourceLine;
  };
  
 -typedef std::vector< std::pair<CCriticalSection*, CLockLocation> > LockStack;
 +typedef std::vector< std::pair<void*, CLockLocation> > LockStack;
  
  static boost::interprocess::interprocess_mutex dd_mutex;
 -static std::map<std::pair<CCriticalSection*, CCriticalSection*>, LockStack> lockorders;
 +static std::map<std::pair<void*, void*>, LockStack> lockorders;
  static boost::thread_specific_ptr<LockStack> lockstack;
  
  
 -static void potential_deadlock_detected(const std::pair<CCriticalSection*, CCriticalSection*>& mismatch, const LockStack& s1, const LockStack& s2)
 +static void potential_deadlock_detected(const std::pair<void*, void*>& mismatch, const LockStack& s1, const LockStack& s2)
  {
      printf("POTENTIAL DEADLOCK DETECTED\n");
      printf("Previous lock order was:\n");
 -    BOOST_FOREACH(const PAIRTYPE(CCriticalSection*, CLockLocation)& i, s2)
 +    BOOST_FOREACH(const PAIRTYPE(void*, CLockLocation)& i, s2)
      {
          if (i.first == mismatch.first) printf(" (1)");
          if (i.first == mismatch.second) printf(" (2)");
          printf(" %s\n", i.second.ToString().c_str());
      }
      printf("Current lock order is:\n");
 -    BOOST_FOREACH(const PAIRTYPE(CCriticalSection*, CLockLocation)& i, s1)
 +    BOOST_FOREACH(const PAIRTYPE(void*, CLockLocation)& i, s1)
      {
          if (i.first == mismatch.first) printf(" (1)");
          if (i.first == mismatch.second) printf(" (2)");
@@@ -1146,7 -1136,7 +1141,7 @@@
      }
  }
  
 -static void push_lock(CCriticalSection* c, const CLockLocation& locklocation)
 +static void push_lock(void* c, const CLockLocation& locklocation, bool fTry)
  {
      bool fOrderOK = true;
      if (lockstack.get() == NULL)
@@@ -1157,16 -1147,16 +1152,16 @@@
  
      (*lockstack).push_back(std::make_pair(c, locklocation));
  
 -    BOOST_FOREACH(const PAIRTYPE(CCriticalSection*, CLockLocation)& i, (*lockstack))
 +    if (!fTry) BOOST_FOREACH(const PAIRTYPE(void*, CLockLocation)& i, (*lockstack))
      {
          if (i.first == c) break;
  
 -        std::pair<CCriticalSection*, CCriticalSection*> p1 = std::make_pair(i.first, c);
 +        std::pair<void*, void*> p1 = std::make_pair(i.first, c);
          if (lockorders.count(p1))
              continue;
          lockorders[p1] = (*lockstack);
  
 -        std::pair<CCriticalSection*, CCriticalSection*> p2 = std::make_pair(c, i.first);
 +        std::pair<void*, void*> p2 = std::make_pair(c, i.first);
          if (lockorders.count(p2))
          {
              potential_deadlock_detected(p1, lockorders[p2], lockorders[p1]);
@@@ -1188,9 -1178,9 +1183,9 @@@ static void pop_lock(
      dd_mutex.unlock();
  }
  
 -void EnterCritical(const char* pszName, const char* pszFile, int nLine, void* cs)
 +void EnterCritical(const char* pszName, const char* pszFile, int nLine, void* cs, bool fTry)
  {
 -    push_lock(cs, CLockLocation(pszName, pszFile, nLine));
 +    push_lock(cs, CLockLocation(pszName, pszFile, nLine), fTry);
  }
  
  void LeaveCritical()