bitcoin: src/util.cpp annotate

annotate src/util.cpp @ 1855:82511bef45d3 draft

Fix #846. Allow negative options such as "nolisten=1" in bitcoin.conf as well as on the command line.

author	Chris Moore <dooglus@gmail.com>
date	Thu, 16 Feb 2012 12:08:32 -0800 (2012-02-16)
parents	20667468f95b
children	38635f2c611a 4fa7530953de

rev	line source
575 1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1 // Copyright (c) 2009-2010 Satoshi Nakamoto
1818 20667468f95b Update all copyrights to 2012 Gavin Andresen <gavinandresen@gmail.com> parents: 1812 diff changeset	2 // Copyright (c) 2009-2012 The Bitcoin developers
575 1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	3 // Distributed under the MIT/X11 software license, see the accompanying
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	4 // file license.txt or http://www.opensource.org/licenses/mit-license.php.
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	5 #include "headers.h"
609 a75f7da5c78c Only include strlcpy.h when we have to Jordan Lewis <jordanthelewis@gmail.com> parents: 595 diff changeset	6 #include "strlcpy.h"
1584 a67f13278e2c Implement BIP 14 : separate protocol version from client version Gavin Andresen <gavinandresen@gmail.com> parents: 1390 diff changeset	7 #include <boost/algorithm/string/join.hpp>
611 503d51554676 Only include certain boost headers if necessary. Jordan Lewis <jordanthelewis@gmail.com> parents: 609 diff changeset	8 #include <boost/program_options/detail/config_file.hpp>
503d51554676 Only include certain boost headers if necessary. Jordan Lewis <jordanthelewis@gmail.com> parents: 609 diff changeset	9 #include <boost/program_options/parsers.hpp>
695 9609c7af94ba Fix missing includes needed for Boost 1.46. Shane Wegner <shane-github@csy.ca> parents: 688 diff changeset	10 #include <boost/filesystem.hpp>
611 503d51554676 Only include certain boost headers if necessary. Jordan Lewis <jordanthelewis@gmail.com> parents: 609 diff changeset	11 #include <boost/filesystem/fstream.hpp>
503d51554676 Only include certain boost headers if necessary. Jordan Lewis <jordanthelewis@gmail.com> parents: 609 diff changeset	12 #include <boost/interprocess/sync/interprocess_mutex.hpp>
503d51554676 Only include certain boost headers if necessary. Jordan Lewis <jordanthelewis@gmail.com> parents: 609 diff changeset	13 #include <boost/interprocess/sync/interprocess_recursive_mutex.hpp>
503d51554676 Only include certain boost headers if necessary. Jordan Lewis <jordanthelewis@gmail.com> parents: 609 diff changeset	14 #include <boost/foreach.hpp>
575 1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	15
595 e630bbb11629 make bitcoin include files more modular Wladimir J. van der Laan <laanwj@gmail.com> parents: 575 diff changeset	16 using namespace std;
e630bbb11629 make bitcoin include files more modular Wladimir J. van der Laan <laanwj@gmail.com> parents: 575 diff changeset	17 using namespace boost;
575 1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	18
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	19 map<string, string> mapArgs;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	20 map<string, vector<string> > mapMultiArgs;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	21 bool fDebug = false;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	22 bool fPrintToConsole = false;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	23 bool fPrintToDebugger = false;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	24 char pszSetDataDir[MAX_PATH] = "";
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	25 bool fRequestShutdown = false;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	26 bool fShutdown = false;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	27 bool fDaemon = false;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	28 bool fServer = false;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	29 bool fCommandLine = false;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	30 string strMiscWarning;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	31 bool fTestNet = false;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	32 bool fNoListen = false;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	33 bool fLogTimestamps = false;
1616 997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	34 CMedianFilter<int64> vTimeOffsets(200,0);
575 1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	35
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	36
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	37
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	38 // Workaround for "multiple definition of `_tls_used'"
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	39 // http://svn.boost.org/trac/boost/ticket/4258
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	40 extern "C" void tss_cleanup_implemented() { }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	41
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	42
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	43
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	44
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	45
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	46 // Init openssl library multithreading support
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	47 static boost::interprocess::interprocess_mutex** ppmutexOpenSSL;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	48 void locking_callback(int mode, int i, const char* file, int line)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	49 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	50 if (mode & CRYPTO_LOCK)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	51 ppmutexOpenSSL[i]->lock();
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	52 else
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	53 ppmutexOpenSSL[i]->unlock();
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	54 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	55
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	56 // Init
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	57 class CInit
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	58 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	59 public:
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	60 CInit()
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	61 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	62 // Init openssl library multithreading support
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	63 ppmutexOpenSSL = (boost::interprocess::interprocess_mutex*)OPENSSL_malloc(CRYPTO_num_locks() sizeof(boost::interprocess::interprocess_mutex*));
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	64 for (int i = 0; i < CRYPTO_num_locks(); i++)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	65 ppmutexOpenSSL[i] = new boost::interprocess::interprocess_mutex();
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	66 CRYPTO_set_locking_callback(locking_callback);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	67
1390 97bac6569f62 Fix build on windows and mac Gavin Andresen <gavinandresen@gmail.com> parents: 1361 diff changeset	68 #ifdef WIN32
575 1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	69 // Seed random number generator with screen scrape and other hardware sources
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	70 RAND_screen();
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	71 #endif
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	72
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	73 // Seed random number generator with performance counter
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	74 RandAddSeed();
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	75 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	76 ~CInit()
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	77 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	78 // Shutdown openssl library multithreading support
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	79 CRYPTO_set_locking_callback(NULL);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	80 for (int i = 0; i < CRYPTO_num_locks(); i++)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	81 delete ppmutexOpenSSL[i];
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	82 OPENSSL_free(ppmutexOpenSSL);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	83 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	84 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	85 instance_of_cinit;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	86
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	87
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	88
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	89
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	90
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	91
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	92
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	93
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	94 void RandAddSeed()
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	95 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	96 // Seed with CPU performance counter
1616 997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	97 int64 nCounter = GetPerformanceCounter();
575 1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	98 RAND_add(&nCounter, sizeof(nCounter), 1.5);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	99 memset(&nCounter, 0, sizeof(nCounter));
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	100 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	101
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	102 void RandAddSeedPerfmon()
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	103 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	104 RandAddSeed();
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	105
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	106 // This can take up to 2 seconds, so only do it every 10 minutes
1616 997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	107 static int64 nLastPerfmon;
575 1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	108 if (GetTime() < nLastPerfmon + 10 * 60)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	109 return;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	110 nLastPerfmon = GetTime();
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	111
1390 97bac6569f62 Fix build on windows and mac Gavin Andresen <gavinandresen@gmail.com> parents: 1361 diff changeset	112 #ifdef WIN32
575 1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	113 // Don't need this on Linux, OpenSSL automatically uses /dev/urandom
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	114 // Seed with the entire set of perfmon data
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	115 unsigned char pdata[250000];
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	116 memset(pdata, 0, sizeof(pdata));
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	117 unsigned long nSize = sizeof(pdata);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	118 long ret = RegQueryValueExA(HKEY_PERFORMANCE_DATA, "Global", NULL, NULL, pdata, &nSize);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	119 RegCloseKey(HKEY_PERFORMANCE_DATA);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	120 if (ret == ERROR_SUCCESS)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	121 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	122 RAND_add(pdata, nSize, nSize/100.0);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	123 memset(pdata, 0, nSize);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	124 printf("%s RandAddSeed() %d bytes\n", DateTimeStrFormat("%x %H:%M", GetTime()).c_str(), nSize);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	125 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	126 #endif
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	127 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	128
1616 997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	129 uint64 GetRand(uint64 nMax)
575 1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	130 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	131 if (nMax == 0)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	132 return 0;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	133
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	134 // The range of the random source must be a multiple of the modulus
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	135 // to give every possible output value an equal possibility
1616 997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	136 uint64 nRange = (std::numeric_limits<uint64>::max() / nMax) * nMax;
997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	137 uint64 nRand = 0;
575 1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	138 do
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	139 RAND_bytes((unsigned char*)&nRand, sizeof(nRand));
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	140 while (nRand >= nRange);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	141 return (nRand % nMax);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	142 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	143
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	144 int GetRandInt(int nMax)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	145 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	146 return GetRand(nMax);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	147 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	148
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	149
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	150
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	151
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	152
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	153
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	154
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	155
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	156
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	157
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	158
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	159 inline int OutputDebugStringF(const char* pszFormat, ...)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	160 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	161 int ret = 0;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	162 if (fPrintToConsole)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	163 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	164 // print to console
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	165 va_list arg_ptr;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	166 va_start(arg_ptr, pszFormat);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	167 ret = vprintf(pszFormat, arg_ptr);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	168 va_end(arg_ptr);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	169 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	170 else
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	171 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	172 // print to debug.log
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	173 static FILE* fileout = NULL;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	174
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	175 if (!fileout)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	176 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	177 char pszFile[MAX_PATH+100];
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	178 GetDataDir(pszFile);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	179 strlcat(pszFile, "/debug.log", sizeof(pszFile));
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	180 fileout = fopen(pszFile, "a");
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	181 if (fileout) setbuf(fileout, NULL); // unbuffered
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	182 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	183 if (fileout)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	184 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	185 static bool fStartedNewLine = true;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	186
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	187 // Debug print useful for profiling
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	188 if (fLogTimestamps && fStartedNewLine)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	189 fprintf(fileout, "%s ", DateTimeStrFormat("%x %H:%M:%S", GetTime()).c_str());
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	190 if (pszFormat[strlen(pszFormat) - 1] == '\n')
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	191 fStartedNewLine = true;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	192 else
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	193 fStartedNewLine = false;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	194
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	195 va_list arg_ptr;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	196 va_start(arg_ptr, pszFormat);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	197 ret = vfprintf(fileout, pszFormat, arg_ptr);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	198 va_end(arg_ptr);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	199 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	200 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	201
1390 97bac6569f62 Fix build on windows and mac Gavin Andresen <gavinandresen@gmail.com> parents: 1361 diff changeset	202 #ifdef WIN32
575 1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	203 if (fPrintToDebugger)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	204 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	205 static CCriticalSection cs_OutputDebugStringF;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	206
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	207 // accumulate a line at a time
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	208 CRITICAL_BLOCK(cs_OutputDebugStringF)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	209 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	210 static char pszBuffer[50000];
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	211 static char* pend;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	212 if (pend == NULL)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	213 pend = pszBuffer;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	214 va_list arg_ptr;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	215 va_start(arg_ptr, pszFormat);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	216 int limit = END(pszBuffer) - pend - 2;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	217 int ret = _vsnprintf(pend, limit, pszFormat, arg_ptr);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	218 va_end(arg_ptr);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	219 if (ret < 0 \|\| ret >= limit)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	220 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	221 pend = END(pszBuffer) - 2;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	222 *pend++ = '\n';
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	223 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	224 else
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	225 pend += ret;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	226 *pend = '\0';
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	227 char* p1 = pszBuffer;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	228 char* p2;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	229 while (p2 = strchr(p1, '\n'))
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	230 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	231 p2++;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	232 char c = *p2;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	233 *p2 = '\0';
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	234 OutputDebugStringA(p1);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	235 *p2 = c;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	236 p1 = p2;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	237 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	238 if (p1 != pszBuffer)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	239 memmove(pszBuffer, p1, pend - p1 + 1);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	240 pend -= (p1 - pszBuffer);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	241 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	242 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	243 #endif
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	244 return ret;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	245 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	246
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	247
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	248 // Safer snprintf
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	249 // - prints up to limit-1 characters
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	250 // - output string is always null terminated even if limit reached
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	251 // - return value is the number of characters actually printed
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	252 int my_snprintf(char* buffer, size_t limit, const char* format, ...)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	253 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	254 if (limit == 0)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	255 return 0;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	256 va_list arg_ptr;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	257 va_start(arg_ptr, format);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	258 int ret = _vsnprintf(buffer, limit, format, arg_ptr);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	259 va_end(arg_ptr);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	260 if (ret < 0 \|\| ret >= limit)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	261 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	262 ret = limit - 1;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	263 buffer[limit-1] = 0;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	264 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	265 return ret;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	266 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	267
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: 739 diff changeset	268 string strprintf(const std::string &format, ...)
575 1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	269 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	270 char buffer[50000];
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	271 char* p = buffer;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	272 int limit = sizeof(buffer);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	273 int ret;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	274 loop
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	275 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	276 va_list arg_ptr;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	277 va_start(arg_ptr, format);
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: 739 diff changeset	278 ret = _vsnprintf(p, limit, format.c_str(), arg_ptr);
575 1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	279 va_end(arg_ptr);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	280 if (ret >= 0 && ret < limit)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	281 break;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	282 if (p != buffer)
639 069da23e4507 Fixes #240 and #244 - delete delete[] mismatch. Matt Corallo <matt@bluematt.me> parents: 595 diff changeset	283 delete[] p;
575 1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	284 limit *= 2;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	285 p = new char[limit];
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	286 if (p == NULL)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	287 throw std::bad_alloc();
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	288 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	289 string str(p, p+ret);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	290 if (p != buffer)
639 069da23e4507 Fixes #240 and #244 - delete delete[] mismatch. Matt Corallo <matt@bluematt.me> parents: 595 diff changeset	291 delete[] p;
575 1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	292 return str;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	293 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	294
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: 739 diff changeset	295 bool error(const std::string &format, ...)
575 1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	296 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	297 char buffer[50000];
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	298 int limit = sizeof(buffer);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	299 va_list arg_ptr;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	300 va_start(arg_ptr, format);
1181 855f1d50bed7 temp patch for qtui Wladimir J. van der Laan <laanwj@gmail.com> parents: 739 diff changeset	301 int ret = _vsnprintf(buffer, limit, format.c_str(), arg_ptr);
575 1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	302 va_end(arg_ptr);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	303 if (ret < 0 \|\| ret >= limit)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	304 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	305 ret = limit - 1;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	306 buffer[limit-1] = 0;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	307 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	308 printf("ERROR: %s\n", buffer);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	309 return false;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	310 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	311
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	312
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	313 void ParseString(const string& str, char c, vector<string>& v)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	314 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	315 if (str.empty())
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	316 return;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	317 string::size_type i1 = 0;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	318 string::size_type i2;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	319 loop
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	320 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	321 i2 = str.find(c, i1);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	322 if (i2 == str.npos)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	323 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	324 v.push_back(str.substr(i1));
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	325 return;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	326 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	327 v.push_back(str.substr(i1, i2-i1));
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	328 i1 = i2+1;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	329 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	330 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	331
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	332
1616 997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	333 string FormatMoney(int64 n, bool fPlus)
575 1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	334 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	335 // Note: not using straight sprintf here because we do NOT want
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	336 // localized number formatting.
1616 997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	337 int64 n_abs = (n > 0 ? n : -n);
997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	338 int64 quotient = n_abs/COIN;
997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	339 int64 remainder = n_abs%COIN;
575 1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	340 string str = strprintf("%"PRI64d".%08"PRI64d, quotient, remainder);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	341
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	342 // Right-trim excess 0's before the decimal point:
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	343 int nTrim = 0;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	344 for (int i = str.size()-1; (str[i] == '0' && isdigit(str[i-2])); --i)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	345 ++nTrim;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	346 if (nTrim)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	347 str.erase(str.size()-nTrim, nTrim);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	348
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	349 if (n < 0)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	350 str.insert((unsigned int)0, 1, '-');
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	351 else if (fPlus && n > 0)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	352 str.insert((unsigned int)0, 1, '+');
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	353 return str;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	354 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	355
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	356
1616 997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	357 bool ParseMoney(const string& str, int64& nRet)
575 1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	358 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	359 return ParseMoney(str.c_str(), nRet);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	360 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	361
1616 997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	362 bool ParseMoney(const char* pszIn, int64& nRet)
575 1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	363 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	364 string strWhole;
1616 997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	365 int64 nUnits = 0;
575 1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	366 const char* p = pszIn;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	367 while (isspace(*p))
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	368 p++;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	369 for (; *p; p++)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	370 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	371 if (*p == '.')
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	372 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	373 p++;
1616 997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	374 int64 nMult = CENT*10;
575 1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	375 while (isdigit(*p) && (nMult > 0))
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	376 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	377 nUnits += nMult * (*p++ - '0');
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	378 nMult /= 10;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	379 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	380 break;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	381 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	382 if (isspace(*p))
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	383 break;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	384 if (!isdigit(*p))
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	385 return false;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	386 strWhole.insert(strWhole.end(), *p);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	387 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	388 for (; *p; p++)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	389 if (!isspace(*p))
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	390 return false;
1361 f82b42e087d7 remove possibility of 63 bit overflow in ParseMoney Wladimir J. van der Laan <laanwj@gmail.com> parents: 1327 diff changeset	391 if (strWhole.size() > 10) // guard against 63 bit overflow
575 1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	392 return false;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	393 if (nUnits < 0 \|\| nUnits > COIN)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	394 return false;
1616 997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	395 int64 nWhole = atoi64(strWhole);
997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	396 int64 nValue = nWhole*COIN + nUnits;
575 1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	397
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	398 nRet = nValue;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	399 return true;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	400 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	401
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	402
1752 7b4383bddf3b Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16). Gavin Andresen <gavinandresen@gmail.com> parents: 1731 diff changeset	403 static char phexdigit[256] =
7b4383bddf3b Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16). Gavin Andresen <gavinandresen@gmail.com> parents: 1731 diff changeset	404 { -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
7b4383bddf3b Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16). Gavin Andresen <gavinandresen@gmail.com> parents: 1731 diff changeset	405 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
7b4383bddf3b Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16). Gavin Andresen <gavinandresen@gmail.com> parents: 1731 diff changeset	406 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
7b4383bddf3b Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16). Gavin Andresen <gavinandresen@gmail.com> parents: 1731 diff changeset	407 0,1,2,3,4,5,6,7,8,9,-1,-1,-1,-1,-1,-1,
7b4383bddf3b Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16). Gavin Andresen <gavinandresen@gmail.com> parents: 1731 diff changeset	408 -1,0xa,0xb,0xc,0xd,0xe,0xf,-1,-1,-1,-1,-1,-1,-1,-1,-1,
7b4383bddf3b Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16). Gavin Andresen <gavinandresen@gmail.com> parents: 1731 diff changeset	409 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
7b4383bddf3b Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16). Gavin Andresen <gavinandresen@gmail.com> parents: 1731 diff changeset	410 -1,0xa,0xb,0xc,0xd,0xe,0xf,-1,-1,-1,-1,-1,-1,-1,-1,-1
7b4383bddf3b Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16). Gavin Andresen <gavinandresen@gmail.com> parents: 1731 diff changeset	411 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
7b4383bddf3b Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16). Gavin Andresen <gavinandresen@gmail.com> parents: 1731 diff changeset	412 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
7b4383bddf3b Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16). Gavin Andresen <gavinandresen@gmail.com> parents: 1731 diff changeset	413 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
7b4383bddf3b Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16). Gavin Andresen <gavinandresen@gmail.com> parents: 1731 diff changeset	414 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
7b4383bddf3b Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16). Gavin Andresen <gavinandresen@gmail.com> parents: 1731 diff changeset	415 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
7b4383bddf3b Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16). Gavin Andresen <gavinandresen@gmail.com> parents: 1731 diff changeset	416 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
7b4383bddf3b Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16). Gavin Andresen <gavinandresen@gmail.com> parents: 1731 diff changeset	417 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
7b4383bddf3b Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16). Gavin Andresen <gavinandresen@gmail.com> parents: 1731 diff changeset	418 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
7b4383bddf3b Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16). Gavin Andresen <gavinandresen@gmail.com> parents: 1731 diff changeset	419 -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, };
7b4383bddf3b Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16). Gavin Andresen <gavinandresen@gmail.com> parents: 1731 diff changeset	420
7b4383bddf3b Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16). Gavin Andresen <gavinandresen@gmail.com> parents: 1731 diff changeset	421 bool IsHex(const string& str)
7b4383bddf3b Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16). Gavin Andresen <gavinandresen@gmail.com> parents: 1731 diff changeset	422 {
7b4383bddf3b Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16). Gavin Andresen <gavinandresen@gmail.com> parents: 1731 diff changeset	423 BOOST_FOREACH(unsigned char c, str)
7b4383bddf3b Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16). Gavin Andresen <gavinandresen@gmail.com> parents: 1731 diff changeset	424 {
7b4383bddf3b Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16). Gavin Andresen <gavinandresen@gmail.com> parents: 1731 diff changeset	425 if (phexdigit[c] < 0)
7b4383bddf3b Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16). Gavin Andresen <gavinandresen@gmail.com> parents: 1731 diff changeset	426 return false;
7b4383bddf3b Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16). Gavin Andresen <gavinandresen@gmail.com> parents: 1731 diff changeset	427 }
7b4383bddf3b Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16). Gavin Andresen <gavinandresen@gmail.com> parents: 1731 diff changeset	428 return (str.size() > 0) && (str.size()%2 == 0);
7b4383bddf3b Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16). Gavin Andresen <gavinandresen@gmail.com> parents: 1731 diff changeset	429 }
7b4383bddf3b Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16). Gavin Andresen <gavinandresen@gmail.com> parents: 1731 diff changeset	430
575 1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	431 vector<unsigned char> ParseHex(const char* psz)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	432 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	433 // convert hex dump to vector
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	434 vector<unsigned char> vch;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	435 loop
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	436 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	437 while (isspace(*psz))
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	438 psz++;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	439 char c = phexdigit[(unsigned char)*psz++];
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	440 if (c == (char)-1)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	441 break;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	442 unsigned char n = (c << 4);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	443 c = phexdigit[(unsigned char)*psz++];
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	444 if (c == (char)-1)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	445 break;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	446 n \|= c;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	447 vch.push_back(n);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	448 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	449 return vch;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	450 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	451
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	452 vector<unsigned char> ParseHex(const string& str)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	453 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	454 return ParseHex(str.c_str());
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	455 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	456
1855 82511bef45d3 Fix #846. Allow negative options such as "nolisten=1" in bitcoin.conf as well as on the command line. Chris Moore <dooglus@gmail.com> parents: 1818 diff changeset	457 static void InterpretNegativeSetting(string name, map<string, string>& mapSettingsRet)
82511bef45d3 Fix #846. Allow negative options such as "nolisten=1" in bitcoin.conf as well as on the command line. Chris Moore <dooglus@gmail.com> parents: 1818 diff changeset	458 {
82511bef45d3 Fix #846. Allow negative options such as "nolisten=1" in bitcoin.conf as well as on the command line. Chris Moore <dooglus@gmail.com> parents: 1818 diff changeset	459 // interpret -nofoo as -foo=0 (and -nofoo=0 as -foo=1) as long as -foo not set
82511bef45d3 Fix #846. Allow negative options such as "nolisten=1" in bitcoin.conf as well as on the command line. Chris Moore <dooglus@gmail.com> parents: 1818 diff changeset	460 if (name.find("-no") == 0)
82511bef45d3 Fix #846. Allow negative options such as "nolisten=1" in bitcoin.conf as well as on the command line. Chris Moore <dooglus@gmail.com> parents: 1818 diff changeset	461 {
82511bef45d3 Fix #846. Allow negative options such as "nolisten=1" in bitcoin.conf as well as on the command line. Chris Moore <dooglus@gmail.com> parents: 1818 diff changeset	462 std::string positive("-");
82511bef45d3 Fix #846. Allow negative options such as "nolisten=1" in bitcoin.conf as well as on the command line. Chris Moore <dooglus@gmail.com> parents: 1818 diff changeset	463 positive.append(name.begin()+3, name.end());
82511bef45d3 Fix #846. Allow negative options such as "nolisten=1" in bitcoin.conf as well as on the command line. Chris Moore <dooglus@gmail.com> parents: 1818 diff changeset	464 if (mapSettingsRet.count(positive) == 0)
82511bef45d3 Fix #846. Allow negative options such as "nolisten=1" in bitcoin.conf as well as on the command line. Chris Moore <dooglus@gmail.com> parents: 1818 diff changeset	465 {
82511bef45d3 Fix #846. Allow negative options such as "nolisten=1" in bitcoin.conf as well as on the command line. Chris Moore <dooglus@gmail.com> parents: 1818 diff changeset	466 bool value = !GetBoolArg(name);
82511bef45d3 Fix #846. Allow negative options such as "nolisten=1" in bitcoin.conf as well as on the command line. Chris Moore <dooglus@gmail.com> parents: 1818 diff changeset	467 mapSettingsRet[positive] = (value ? "1" : "0");
82511bef45d3 Fix #846. Allow negative options such as "nolisten=1" in bitcoin.conf as well as on the command line. Chris Moore <dooglus@gmail.com> parents: 1818 diff changeset	468 }
82511bef45d3 Fix #846. Allow negative options such as "nolisten=1" in bitcoin.conf as well as on the command line. Chris Moore <dooglus@gmail.com> parents: 1818 diff changeset	469 }
82511bef45d3 Fix #846. Allow negative options such as "nolisten=1" in bitcoin.conf as well as on the command line. Chris Moore <dooglus@gmail.com> parents: 1818 diff changeset	470 }
82511bef45d3 Fix #846. Allow negative options such as "nolisten=1" in bitcoin.conf as well as on the command line. Chris Moore <dooglus@gmail.com> parents: 1818 diff changeset	471
1811 49f43cb2eab0 Unit tests for the GetArg() methods Gavin Andresen <gavinandresen@gmail.com> parents: 1809 diff changeset	472 void ParseParameters(int argc, const char*const argv[])
575 1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	473 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	474 mapArgs.clear();
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	475 mapMultiArgs.clear();
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	476 for (int i = 1; i < argc; i++)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	477 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	478 char psz[10000];
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	479 strlcpy(psz, argv[i], sizeof(psz));
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	480 char* pszValue = (char*)"";
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	481 if (strchr(psz, '='))
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	482 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	483 pszValue = strchr(psz, '=');
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	484 *pszValue++ = '\0';
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	485 }
1390 97bac6569f62 Fix build on windows and mac Gavin Andresen <gavinandresen@gmail.com> parents: 1361 diff changeset	486 #ifdef WIN32
575 1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	487 _strlwr(psz);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	488 if (psz[0] == '/')
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	489 psz[0] = '-';
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	490 #endif
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	491 if (psz[0] != '-')
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	492 break;
1812 0c3c32816278 New GetArg features: allow --, and booleans can be -foo or -nofoo Gavin Andresen <gavinandresen@gmail.com> parents: 1811 diff changeset	493
575 1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	494 mapArgs[psz] = pszValue;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	495 mapMultiArgs[psz].push_back(pszValue);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	496 }
1812 0c3c32816278 New GetArg features: allow --, and booleans can be -foo or -nofoo Gavin Andresen <gavinandresen@gmail.com> parents: 1811 diff changeset	497
0c3c32816278 New GetArg features: allow --, and booleans can be -foo or -nofoo Gavin Andresen <gavinandresen@gmail.com> parents: 1811 diff changeset	498 // New 0.6 features:
0c3c32816278 New GetArg features: allow --, and booleans can be -foo or -nofoo Gavin Andresen <gavinandresen@gmail.com> parents: 1811 diff changeset	499 BOOST_FOREACH(const PAIRTYPE(string,string)& entry, mapArgs)
0c3c32816278 New GetArg features: allow --, and booleans can be -foo or -nofoo Gavin Andresen <gavinandresen@gmail.com> parents: 1811 diff changeset	500 {
0c3c32816278 New GetArg features: allow --, and booleans can be -foo or -nofoo Gavin Andresen <gavinandresen@gmail.com> parents: 1811 diff changeset	501 string name = entry.first;
0c3c32816278 New GetArg features: allow --, and booleans can be -foo or -nofoo Gavin Andresen <gavinandresen@gmail.com> parents: 1811 diff changeset	502
0c3c32816278 New GetArg features: allow --, and booleans can be -foo or -nofoo Gavin Andresen <gavinandresen@gmail.com> parents: 1811 diff changeset	503 // interpret --foo as -foo (as long as both are not set)
0c3c32816278 New GetArg features: allow --, and booleans can be -foo or -nofoo Gavin Andresen <gavinandresen@gmail.com> parents: 1811 diff changeset	504 if (name.find("--") == 0)
0c3c32816278 New GetArg features: allow --, and booleans can be -foo or -nofoo Gavin Andresen <gavinandresen@gmail.com> parents: 1811 diff changeset	505 {
0c3c32816278 New GetArg features: allow --, and booleans can be -foo or -nofoo Gavin Andresen <gavinandresen@gmail.com> parents: 1811 diff changeset	506 std::string singleDash(name.begin()+1, name.end());
0c3c32816278 New GetArg features: allow --, and booleans can be -foo or -nofoo Gavin Andresen <gavinandresen@gmail.com> parents: 1811 diff changeset	507 if (mapArgs.count(singleDash) == 0)
0c3c32816278 New GetArg features: allow --, and booleans can be -foo or -nofoo Gavin Andresen <gavinandresen@gmail.com> parents: 1811 diff changeset	508 mapArgs[singleDash] = entry.second;
0c3c32816278 New GetArg features: allow --, and booleans can be -foo or -nofoo Gavin Andresen <gavinandresen@gmail.com> parents: 1811 diff changeset	509 name = singleDash;
0c3c32816278 New GetArg features: allow --, and booleans can be -foo or -nofoo Gavin Andresen <gavinandresen@gmail.com> parents: 1811 diff changeset	510 }
0c3c32816278 New GetArg features: allow --, and booleans can be -foo or -nofoo Gavin Andresen <gavinandresen@gmail.com> parents: 1811 diff changeset	511
1855 82511bef45d3 Fix #846. Allow negative options such as "nolisten=1" in bitcoin.conf as well as on the command line. Chris Moore <dooglus@gmail.com> parents: 1818 diff changeset	512 // interpret -nofoo as -foo=0 (and -nofoo=0 as -foo=1) as long as -foo not set
82511bef45d3 Fix #846. Allow negative options such as "nolisten=1" in bitcoin.conf as well as on the command line. Chris Moore <dooglus@gmail.com> parents: 1818 diff changeset	513 InterpretNegativeSetting(name, mapArgs);
1812 0c3c32816278 New GetArg features: allow --, and booleans can be -foo or -nofoo Gavin Andresen <gavinandresen@gmail.com> parents: 1811 diff changeset	514 }
575 1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	515 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	516
1811 49f43cb2eab0 Unit tests for the GetArg() methods Gavin Andresen <gavinandresen@gmail.com> parents: 1809 diff changeset	517 std::string GetArg(const std::string& strArg, const std::string& strDefault)
49f43cb2eab0 Unit tests for the GetArg() methods Gavin Andresen <gavinandresen@gmail.com> parents: 1809 diff changeset	518 {
49f43cb2eab0 Unit tests for the GetArg() methods Gavin Andresen <gavinandresen@gmail.com> parents: 1809 diff changeset	519 if (mapArgs.count(strArg))
49f43cb2eab0 Unit tests for the GetArg() methods Gavin Andresen <gavinandresen@gmail.com> parents: 1809 diff changeset	520 return mapArgs[strArg];
49f43cb2eab0 Unit tests for the GetArg() methods Gavin Andresen <gavinandresen@gmail.com> parents: 1809 diff changeset	521 return strDefault;
49f43cb2eab0 Unit tests for the GetArg() methods Gavin Andresen <gavinandresen@gmail.com> parents: 1809 diff changeset	522 }
49f43cb2eab0 Unit tests for the GetArg() methods Gavin Andresen <gavinandresen@gmail.com> parents: 1809 diff changeset	523
49f43cb2eab0 Unit tests for the GetArg() methods Gavin Andresen <gavinandresen@gmail.com> parents: 1809 diff changeset	524 int64 GetArg(const std::string& strArg, int64 nDefault)
49f43cb2eab0 Unit tests for the GetArg() methods Gavin Andresen <gavinandresen@gmail.com> parents: 1809 diff changeset	525 {
49f43cb2eab0 Unit tests for the GetArg() methods Gavin Andresen <gavinandresen@gmail.com> parents: 1809 diff changeset	526 if (mapArgs.count(strArg))
49f43cb2eab0 Unit tests for the GetArg() methods Gavin Andresen <gavinandresen@gmail.com> parents: 1809 diff changeset	527 return atoi64(mapArgs[strArg]);
49f43cb2eab0 Unit tests for the GetArg() methods Gavin Andresen <gavinandresen@gmail.com> parents: 1809 diff changeset	528 return nDefault;
49f43cb2eab0 Unit tests for the GetArg() methods Gavin Andresen <gavinandresen@gmail.com> parents: 1809 diff changeset	529 }
49f43cb2eab0 Unit tests for the GetArg() methods Gavin Andresen <gavinandresen@gmail.com> parents: 1809 diff changeset	530
49f43cb2eab0 Unit tests for the GetArg() methods Gavin Andresen <gavinandresen@gmail.com> parents: 1809 diff changeset	531 bool GetBoolArg(const std::string& strArg, bool fDefault)
49f43cb2eab0 Unit tests for the GetArg() methods Gavin Andresen <gavinandresen@gmail.com> parents: 1809 diff changeset	532 {
49f43cb2eab0 Unit tests for the GetArg() methods Gavin Andresen <gavinandresen@gmail.com> parents: 1809 diff changeset	533 if (mapArgs.count(strArg))
49f43cb2eab0 Unit tests for the GetArg() methods Gavin Andresen <gavinandresen@gmail.com> parents: 1809 diff changeset	534 {
49f43cb2eab0 Unit tests for the GetArg() methods Gavin Andresen <gavinandresen@gmail.com> parents: 1809 diff changeset	535 if (mapArgs[strArg].empty())
49f43cb2eab0 Unit tests for the GetArg() methods Gavin Andresen <gavinandresen@gmail.com> parents: 1809 diff changeset	536 return true;
49f43cb2eab0 Unit tests for the GetArg() methods Gavin Andresen <gavinandresen@gmail.com> parents: 1809 diff changeset	537 return (atoi(mapArgs[strArg]) != 0);
49f43cb2eab0 Unit tests for the GetArg() methods Gavin Andresen <gavinandresen@gmail.com> parents: 1809 diff changeset	538 }
49f43cb2eab0 Unit tests for the GetArg() methods Gavin Andresen <gavinandresen@gmail.com> parents: 1809 diff changeset	539 return fDefault;
49f43cb2eab0 Unit tests for the GetArg() methods Gavin Andresen <gavinandresen@gmail.com> parents: 1809 diff changeset	540 }
49f43cb2eab0 Unit tests for the GetArg() methods Gavin Andresen <gavinandresen@gmail.com> parents: 1809 diff changeset	541
1644 35ccaffca27e Fix issue #659, and cleanup wallet/command-line argument handling a bit Gavin Andresen <gavinandresen@gmail.com> parents: 1616 diff changeset	542 bool SoftSetArg(const std::string& strArg, const std::string& strValue)
35ccaffca27e Fix issue #659, and cleanup wallet/command-line argument handling a bit Gavin Andresen <gavinandresen@gmail.com> parents: 1616 diff changeset	543 {
35ccaffca27e Fix issue #659, and cleanup wallet/command-line argument handling a bit Gavin Andresen <gavinandresen@gmail.com> parents: 1616 diff changeset	544 if (mapArgs.count(strArg))
35ccaffca27e Fix issue #659, and cleanup wallet/command-line argument handling a bit Gavin Andresen <gavinandresen@gmail.com> parents: 1616 diff changeset	545 return false;
35ccaffca27e Fix issue #659, and cleanup wallet/command-line argument handling a bit Gavin Andresen <gavinandresen@gmail.com> parents: 1616 diff changeset	546 mapArgs[strArg] = strValue;
35ccaffca27e Fix issue #659, and cleanup wallet/command-line argument handling a bit Gavin Andresen <gavinandresen@gmail.com> parents: 1616 diff changeset	547 return true;
35ccaffca27e Fix issue #659, and cleanup wallet/command-line argument handling a bit Gavin Andresen <gavinandresen@gmail.com> parents: 1616 diff changeset	548 }
35ccaffca27e Fix issue #659, and cleanup wallet/command-line argument handling a bit Gavin Andresen <gavinandresen@gmail.com> parents: 1616 diff changeset	549
1809 b00fd0a54a85 -bip16 option (default: 1) to support / not support BIP 16. And bumped default BIP16 switchover date from Feb 15 to Mar 1 Gavin Andresen <gavinandresen@gmail.com> parents: 1776 diff changeset	550 bool SoftSetBoolArg(const std::string& strArg, bool fValue)
1644 35ccaffca27e Fix issue #659, and cleanup wallet/command-line argument handling a bit Gavin Andresen <gavinandresen@gmail.com> parents: 1616 diff changeset	551 {
35ccaffca27e Fix issue #659, and cleanup wallet/command-line argument handling a bit Gavin Andresen <gavinandresen@gmail.com> parents: 1616 diff changeset	552 if (fValue)
35ccaffca27e Fix issue #659, and cleanup wallet/command-line argument handling a bit Gavin Andresen <gavinandresen@gmail.com> parents: 1616 diff changeset	553 return SoftSetArg(strArg, std::string("1"));
35ccaffca27e Fix issue #659, and cleanup wallet/command-line argument handling a bit Gavin Andresen <gavinandresen@gmail.com> parents: 1616 diff changeset	554 else
35ccaffca27e Fix issue #659, and cleanup wallet/command-line argument handling a bit Gavin Andresen <gavinandresen@gmail.com> parents: 1616 diff changeset	555 return SoftSetArg(strArg, std::string("0"));
35ccaffca27e Fix issue #659, and cleanup wallet/command-line argument handling a bit Gavin Andresen <gavinandresen@gmail.com> parents: 1616 diff changeset	556 }
35ccaffca27e Fix issue #659, and cleanup wallet/command-line argument handling a bit Gavin Andresen <gavinandresen@gmail.com> parents: 1616 diff changeset	557
35ccaffca27e Fix issue #659, and cleanup wallet/command-line argument handling a bit Gavin Andresen <gavinandresen@gmail.com> parents: 1616 diff changeset	558
1327 ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	559 string EncodeBase64(const unsigned char* pch, size_t len)
1326 f70bb1af83c3 Faster Base64 decoder. JoelKatz <DavidJoelSchwartz@GMail.com> parents: 1320 diff changeset	560 {
1327 ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	561 static const char *pbase64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	562
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	563 string strRet="";
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	564 strRet.reserve((len+2)/3*4);
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	565
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	566 int mode=0, left=0;
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	567 const unsigned char *pchEnd = pch+len;
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	568
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	569 while (pch<pchEnd)
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	570 {
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	571 int enc = *(pch++);
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	572 switch (mode)
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	573 {
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	574 case 0: // we have no bits
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	575 strRet += pbase64[enc >> 2];
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	576 left = (enc & 3) << 4;
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	577 mode = 1;
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	578 break;
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	579
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	580 case 1: // we have two bits
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	581 strRet += pbase64[left \| (enc >> 4)];
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	582 left = (enc & 15) << 2;
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	583 mode = 2;
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	584 break;
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	585
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	586 case 2: // we have four bits
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	587 strRet += pbase64[left \| (enc >> 6)];
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	588 strRet += pbase64[enc & 63];
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	589 mode = 0;
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	590 break;
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	591 }
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	592 }
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	593
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	594 if (mode)
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	595 {
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	596 strRet += pbase64[left];
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	597 strRet += '=';
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	598 if (mode == 1)
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	599 strRet += '=';
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	600 }
1326 f70bb1af83c3 Faster Base64 decoder. JoelKatz <DavidJoelSchwartz@GMail.com> parents: 1320 diff changeset	601
1327 ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	602 return strRet;
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	603 }
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	604
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	605 string EncodeBase64(const string& str)
1326 f70bb1af83c3 Faster Base64 decoder. JoelKatz <DavidJoelSchwartz@GMail.com> parents: 1320 diff changeset	606 {
1327 ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	607 return EncodeBase64((const unsigned char*)str.c_str(), str.size());
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	608 }
1326 f70bb1af83c3 Faster Base64 decoder. JoelKatz <DavidJoelSchwartz@GMail.com> parents: 1320 diff changeset	609
1327 ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	610 vector<unsigned char> DecodeBase64(const char* p, bool* pfInvalid)
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	611 {
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	612 static const int decode64_table[256] =
1326 f70bb1af83c3 Faster Base64 decoder. JoelKatz <DavidJoelSchwartz@GMail.com> parents: 1320 diff changeset	613 {
1327 ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	614 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	615 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	616 -1, -1, -1, 62, -1, -1, -1, 63, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, -1, -1,
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	617 -1, -1, -1, -1, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	618 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1, -1, 26, 27, 28,
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	619 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48,
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	620 49, 50, 51, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	621 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	622 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	623 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	624 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	625 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	626 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	627 };
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	628
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	629 if (pfInvalid)
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	630 *pfInvalid = false;
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	631
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	632 vector<unsigned char> vchRet;
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	633 vchRet.reserve(strlen(p)*3/4);
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	634
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	635 int mode = 0;
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	636 int left = 0;
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	637
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	638 while (1)
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	639 {
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	640 int dec = decode64_table[*p];
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	641 if (dec == -1) break;
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	642 p++;
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	643 switch (mode)
1326 f70bb1af83c3 Faster Base64 decoder. JoelKatz <DavidJoelSchwartz@GMail.com> parents: 1320 diff changeset	644 {
f70bb1af83c3 Faster Base64 decoder. JoelKatz <DavidJoelSchwartz@GMail.com> parents: 1320 diff changeset	645 case 0: // we have no bits and get 6
f70bb1af83c3 Faster Base64 decoder. JoelKatz <DavidJoelSchwartz@GMail.com> parents: 1320 diff changeset	646 left = dec;
f70bb1af83c3 Faster Base64 decoder. JoelKatz <DavidJoelSchwartz@GMail.com> parents: 1320 diff changeset	647 mode = 1;
f70bb1af83c3 Faster Base64 decoder. JoelKatz <DavidJoelSchwartz@GMail.com> parents: 1320 diff changeset	648 break;
f70bb1af83c3 Faster Base64 decoder. JoelKatz <DavidJoelSchwartz@GMail.com> parents: 1320 diff changeset	649
f70bb1af83c3 Faster Base64 decoder. JoelKatz <DavidJoelSchwartz@GMail.com> parents: 1320 diff changeset	650 case 1: // we have 6 bits and keep 4
1327 ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	651 vchRet.push_back((left<<2) \| (dec>>4));
1326 f70bb1af83c3 Faster Base64 decoder. JoelKatz <DavidJoelSchwartz@GMail.com> parents: 1320 diff changeset	652 left = dec & 15;
f70bb1af83c3 Faster Base64 decoder. JoelKatz <DavidJoelSchwartz@GMail.com> parents: 1320 diff changeset	653 mode = 2;
f70bb1af83c3 Faster Base64 decoder. JoelKatz <DavidJoelSchwartz@GMail.com> parents: 1320 diff changeset	654 break;
1327 ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	655
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	656 case 2: // we have 4 bits and get 6, we keep 2
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	657 vchRet.push_back((left<<4) \| (dec>>2));
1326 f70bb1af83c3 Faster Base64 decoder. JoelKatz <DavidJoelSchwartz@GMail.com> parents: 1320 diff changeset	658 left = dec & 3;
f70bb1af83c3 Faster Base64 decoder. JoelKatz <DavidJoelSchwartz@GMail.com> parents: 1320 diff changeset	659 mode = 3;
f70bb1af83c3 Faster Base64 decoder. JoelKatz <DavidJoelSchwartz@GMail.com> parents: 1320 diff changeset	660 break;
1327 ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	661
1326 f70bb1af83c3 Faster Base64 decoder. JoelKatz <DavidJoelSchwartz@GMail.com> parents: 1320 diff changeset	662 case 3: // we have 2 bits and get 6
1327 ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	663 vchRet.push_back((left<<6) \| dec);
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	664 mode = 0;
1326 f70bb1af83c3 Faster Base64 decoder. JoelKatz <DavidJoelSchwartz@GMail.com> parents: 1320 diff changeset	665 break;
f70bb1af83c3 Faster Base64 decoder. JoelKatz <DavidJoelSchwartz@GMail.com> parents: 1320 diff changeset	666 }
f70bb1af83c3 Faster Base64 decoder. JoelKatz <DavidJoelSchwartz@GMail.com> parents: 1320 diff changeset	667 }
f70bb1af83c3 Faster Base64 decoder. JoelKatz <DavidJoelSchwartz@GMail.com> parents: 1320 diff changeset	668
1327 ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	669 if (pfInvalid)
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	670 switch (mode)
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	671 {
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	672 case 0: // 4n base64 characters processed: ok
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	673 break;
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	674
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	675 case 1: // 4n+1 base64 character processed: impossible
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	676 *pfInvalid = true;
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	677 break;
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	678
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	679 case 2: // 4n+2 base64 characters processed: require '=='
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	680 if (left \|\| p[0] != '=' \|\| p[1] != '=' \|\| decode64_table[p[2]] != -1)
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	681 *pfInvalid = true;
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	682 break;
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	683
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	684 case 3: // 4n+3 base64 characters processed: require '='
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	685 if (left \|\| p[0] != '=' \|\| decode64_table[p[1]] != -1)
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	686 *pfInvalid = true;
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	687 break;
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	688 }
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	689
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	690 return vchRet;
1326 f70bb1af83c3 Faster Base64 decoder. JoelKatz <DavidJoelSchwartz@GMail.com> parents: 1320 diff changeset	691 }
f70bb1af83c3 Faster Base64 decoder. JoelKatz <DavidJoelSchwartz@GMail.com> parents: 1320 diff changeset	692
1327 ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	693 string DecodeBase64(const string& str)
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	694 {
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	695 vector<unsigned char> vchRet = DecodeBase64(str.c_str());
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	696 return string((const char*)&vchRet[0], vchRet.size());
ee5daf89604c Inline base64 encoder/decoder Pieter Wuille <pieter.wuille@gmail.com> parents: 1326 diff changeset	697 }
575 1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	698
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	699
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	700 bool WildcardMatch(const char* psz, const char* mask)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	701 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	702 loop
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	703 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	704 switch (*mask)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	705 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	706 case '\0':
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	707 return (*psz == '\0');
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	708 case '*':
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	709 return WildcardMatch(psz, mask+1) \|\| (*psz && WildcardMatch(psz+1, mask));
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	710 case '?':
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	711 if (*psz == '\0')
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	712 return false;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	713 break;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	714 default:
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	715 if (psz != mask)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	716 return false;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	717 break;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	718 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	719 psz++;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	720 mask++;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	721 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	722 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	723
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	724 bool WildcardMatch(const string& str, const string& mask)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	725 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	726 return WildcardMatch(str.c_str(), mask.c_str());
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	727 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	728
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	729
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	730
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	731
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	732
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	733
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	734
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	735
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	736 void FormatException(char* pszMessage, std::exception* pex, const char* pszThread)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	737 {
1390 97bac6569f62 Fix build on windows and mac Gavin Andresen <gavinandresen@gmail.com> parents: 1361 diff changeset	738 #ifdef WIN32
575 1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	739 char pszModule[MAX_PATH];
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	740 pszModule[0] = '\0';
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	741 GetModuleFileNameA(NULL, pszModule, sizeof(pszModule));
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	742 #else
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	743 const char* pszModule = "bitcoin";
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	744 #endif
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	745 if (pex)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	746 snprintf(pszMessage, 1000,
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	747 "EXCEPTION: %s \n%s \n%s in %s \n", typeid(*pex).name(), pex->what(), pszModule, pszThread);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	748 else
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	749 snprintf(pszMessage, 1000,
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	750 "UNKNOWN EXCEPTION \n%s in %s \n", pszModule, pszThread);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	751 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	752
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	753 void LogException(std::exception* pex, const char* pszThread)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	754 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	755 char pszMessage[10000];
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	756 FormatException(pszMessage, pex, pszThread);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	757 printf("\n%s", pszMessage);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	758 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	759
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	760 void PrintException(std::exception* pex, const char* pszThread)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	761 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	762 char pszMessage[10000];
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	763 FormatException(pszMessage, pex, pszThread);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	764 printf("\n\n************************\n%s\n", pszMessage);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	765 fprintf(stderr, "\n\n************************\n%s\n", pszMessage);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	766 strMiscWarning = pszMessage;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	767 throw;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	768 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	769
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	770 void ThreadOneMessageBox(string strMessage)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	771 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	772 // Skip message boxes if one is already open
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	773 static bool fMessageBoxOpen;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	774 if (fMessageBoxOpen)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	775 return;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	776 fMessageBoxOpen = true;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	777 ThreadSafeMessageBox(strMessage, "Bitcoin", wxOK \| wxICON_EXCLAMATION);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	778 fMessageBoxOpen = false;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	779 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	780
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	781 void PrintExceptionContinue(std::exception* pex, const char* pszThread)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	782 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	783 char pszMessage[10000];
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	784 FormatException(pszMessage, pex, pszThread);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	785 printf("\n\n************************\n%s\n", pszMessage);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	786 fprintf(stderr, "\n\n************************\n%s\n", pszMessage);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	787 strMiscWarning = pszMessage;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	788 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	789
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	790
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	791
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	792
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	793
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	794
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	795
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	796
1390 97bac6569f62 Fix build on windows and mac Gavin Andresen <gavinandresen@gmail.com> parents: 1361 diff changeset	797 #ifdef WIN32
575 1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	798 typedef WINSHELLAPI BOOL (WINAPI *PSHGETSPECIALFOLDERPATHA)(HWND hwndOwner, LPSTR lpszPath, int nFolder, BOOL fCreate);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	799
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	800 string MyGetSpecialFolderPath(int nFolder, bool fCreate)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	801 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	802 char pszPath[MAX_PATH+100] = "";
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	803
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	804 // SHGetSpecialFolderPath isn't always available on old Windows versions
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	805 HMODULE hShell32 = LoadLibraryA("shell32.dll");
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	806 if (hShell32)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	807 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	808 PSHGETSPECIALFOLDERPATHA pSHGetSpecialFolderPath =
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	809 (PSHGETSPECIALFOLDERPATHA)GetProcAddress(hShell32, "SHGetSpecialFolderPathA");
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	810 if (pSHGetSpecialFolderPath)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	811 (*pSHGetSpecialFolderPath)(NULL, pszPath, nFolder, fCreate);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	812 FreeModule(hShell32);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	813 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	814
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	815 // Backup option
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	816 if (pszPath[0] == '\0')
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	817 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	818 if (nFolder == CSIDL_STARTUP)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	819 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	820 strcpy(pszPath, getenv("USERPROFILE"));
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	821 strcat(pszPath, "\\Start Menu\\Programs\\Startup");
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	822 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	823 else if (nFolder == CSIDL_APPDATA)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	824 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	825 strcpy(pszPath, getenv("APPDATA"));
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	826 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	827 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	828
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	829 return pszPath;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	830 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	831 #endif
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	832
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	833 string GetDefaultDataDir()
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	834 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	835 // Windows: C:\Documents and Settings\username\Application Data\Bitcoin
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	836 // Mac: ~/Library/Application Support/Bitcoin
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	837 // Unix: ~/.bitcoin
1390 97bac6569f62 Fix build on windows and mac Gavin Andresen <gavinandresen@gmail.com> parents: 1361 diff changeset	838 #ifdef WIN32
575 1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	839 // Windows
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	840 return MyGetSpecialFolderPath(CSIDL_APPDATA, true) + "\\Bitcoin";
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	841 #else
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	842 char* pszHome = getenv("HOME");
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	843 if (pszHome == NULL \|\| strlen(pszHome) == 0)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	844 pszHome = (char*)"/";
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	845 string strHome = pszHome;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	846 if (strHome[strHome.size()-1] != '/')
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	847 strHome += '/';
1390 97bac6569f62 Fix build on windows and mac Gavin Andresen <gavinandresen@gmail.com> parents: 1361 diff changeset	848 #ifdef MAC_OSX
575 1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	849 // Mac
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	850 strHome += "Library/Application Support/";
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	851 filesystem::create_directory(strHome.c_str());
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	852 return strHome + "Bitcoin";
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	853 #else
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	854 // Unix
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	855 return strHome + ".bitcoin";
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	856 #endif
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	857 #endif
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	858 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	859
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	860 void GetDataDir(char* pszDir)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	861 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	862 // pszDir must be at least MAX_PATH length.
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	863 int nVariation;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	864 if (pszSetDataDir[0] != 0)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	865 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	866 strlcpy(pszDir, pszSetDataDir, MAX_PATH);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	867 nVariation = 0;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	868 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	869 else
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	870 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	871 // This can be called during exceptions by printf, so we cache the
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	872 // value so we don't have to do memory allocations after that.
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	873 static char pszCachedDir[MAX_PATH];
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	874 if (pszCachedDir[0] == 0)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	875 strlcpy(pszCachedDir, GetDefaultDataDir().c_str(), sizeof(pszCachedDir));
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	876 strlcpy(pszDir, pszCachedDir, MAX_PATH);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	877 nVariation = 1;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	878 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	879 if (fTestNet)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	880 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	881 char* p = pszDir + strlen(pszDir);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	882 if (p > pszDir && p[-1] != '/' && p[-1] != '\\')
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	883 *p++ = '/';
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	884 strcpy(p, "testnet");
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	885 nVariation += 2;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	886 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	887 static bool pfMkdir[4];
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	888 if (!pfMkdir[nVariation])
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	889 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	890 pfMkdir[nVariation] = true;
595 e630bbb11629 make bitcoin include files more modular Wladimir J. van der Laan <laanwj@gmail.com> parents: 575 diff changeset	891 boost::filesystem::create_directory(pszDir);
575 1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	892 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	893 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	894
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	895 string GetDataDir()
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	896 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	897 char pszDir[MAX_PATH];
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	898 GetDataDir(pszDir);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	899 return pszDir;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	900 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	901
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	902 string GetConfigFile()
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	903 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	904 namespace fs = boost::filesystem;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	905 fs::path pathConfig(GetArg("-conf", "bitcoin.conf"));
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	906 if (!pathConfig.is_complete())
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	907 pathConfig = fs::path(GetDataDir()) / pathConfig;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	908 return pathConfig.string();
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	909 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	910
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	911 void ReadConfigFile(map<string, string>& mapSettingsRet,
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	912 map<string, vector<string> >& mapMultiSettingsRet)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	913 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	914 namespace fs = boost::filesystem;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	915 namespace pod = boost::program_options::detail;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	916
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	917 fs::ifstream streamConfig(GetConfigFile());
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	918 if (!streamConfig.good())
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	919 return;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	920
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	921 set<string> setOptions;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	922 setOptions.insert("*");
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	923
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	924 for (pod::config_file_iterator it(streamConfig, setOptions), end; it != end; ++it)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	925 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	926 // Don't overwrite existing settings so command line settings override bitcoin.conf
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	927 string strKey = string("-") + it->string_key;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	928 if (mapSettingsRet.count(strKey) == 0)
1855 82511bef45d3 Fix #846. Allow negative options such as "nolisten=1" in bitcoin.conf as well as on the command line. Chris Moore <dooglus@gmail.com> parents: 1818 diff changeset	929 {
575 1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	930 mapSettingsRet[strKey] = it->value[0];
1855 82511bef45d3 Fix #846. Allow negative options such as "nolisten=1" in bitcoin.conf as well as on the command line. Chris Moore <dooglus@gmail.com> parents: 1818 diff changeset	931 // interpret nofoo=1 as foo=0 (and nofoo=0 as foo=1) as long as foo not set)
82511bef45d3 Fix #846. Allow negative options such as "nolisten=1" in bitcoin.conf as well as on the command line. Chris Moore <dooglus@gmail.com> parents: 1818 diff changeset	932 InterpretNegativeSetting(strKey, mapSettingsRet);
82511bef45d3 Fix #846. Allow negative options such as "nolisten=1" in bitcoin.conf as well as on the command line. Chris Moore <dooglus@gmail.com> parents: 1818 diff changeset	933 }
575 1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	934 mapMultiSettingsRet[strKey].push_back(it->value[0]);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	935 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	936 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	937
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	938 string GetPidFile()
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	939 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	940 namespace fs = boost::filesystem;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	941 fs::path pathConfig(GetArg("-pid", "bitcoind.pid"));
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	942 if (!pathConfig.is_complete())
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	943 pathConfig = fs::path(GetDataDir()) / pathConfig;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	944 return pathConfig.string();
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	945 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	946
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	947 void CreatePidFile(string pidFile, pid_t pid)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	948 {
777 7e199b96a8d9 fix warnings: using the result of an assignment as a condition without parentheses [-Wparentheses] Giel van Schijndel <me@mortis.eu> parents: 739 diff changeset	949 FILE* file = fopen(pidFile.c_str(), "w");
7e199b96a8d9 fix warnings: using the result of an assignment as a condition without parentheses [-Wparentheses] Giel van Schijndel <me@mortis.eu> parents: 739 diff changeset	950 if (file)
575 1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	951 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	952 fprintf(file, "%d\n", pid);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	953 fclose(file);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	954 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	955 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	956
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	957 int GetFilesize(FILE* file)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	958 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	959 int nSavePos = ftell(file);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	960 int nFilesize = -1;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	961 if (fseek(file, 0, SEEK_END) == 0)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	962 nFilesize = ftell(file);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	963 fseek(file, nSavePos, SEEK_SET);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	964 return nFilesize;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	965 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	966
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	967 void ShrinkDebugFile()
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	968 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	969 // Scroll debug.log if it's getting too big
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	970 string strFile = GetDataDir() + "/debug.log";
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	971 FILE* file = fopen(strFile.c_str(), "r");
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	972 if (file && GetFilesize(file) > 10 * 1000000)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	973 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	974 // Restart the file with some of the end
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	975 char pch[200000];
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	976 fseek(file, -sizeof(pch), SEEK_END);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	977 int nBytes = fread(pch, 1, sizeof(pch), file);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	978 fclose(file);
777 7e199b96a8d9 fix warnings: using the result of an assignment as a condition without parentheses [-Wparentheses] Giel van Schijndel <me@mortis.eu> parents: 739 diff changeset	979
7e199b96a8d9 fix warnings: using the result of an assignment as a condition without parentheses [-Wparentheses] Giel van Schijndel <me@mortis.eu> parents: 739 diff changeset	980 file = fopen(strFile.c_str(), "w");
7e199b96a8d9 fix warnings: using the result of an assignment as a condition without parentheses [-Wparentheses] Giel van Schijndel <me@mortis.eu> parents: 739 diff changeset	981 if (file)
575 1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	982 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	983 fwrite(pch, 1, nBytes, file);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	984 fclose(file);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	985 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	986 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	987 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	988
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	989
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	990
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	991
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	992
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	993
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	994
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	995
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	996 //
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	997 // "Never go to sea with two chronometers; take one or three."
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	998 // Our three time sources are:
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	999 // - System clock
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1000 // - Median of other nodes's clocks
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1001 // - The user (asking the user to fix the system clock if the first two disagree)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1002 //
1616 997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	1003 static int64 nMockTime = 0; // For unit testing
1299 432633b3e50d SetMockTime() for cleaner unit testing Gavin Andresen <gavinandresen@gmail.com> parents: 909 diff changeset	1004
1616 997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	1005 int64 GetTime()
575 1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1006 {
1299 432633b3e50d SetMockTime() for cleaner unit testing Gavin Andresen <gavinandresen@gmail.com> parents: 909 diff changeset	1007 if (nMockTime) return nMockTime;
432633b3e50d SetMockTime() for cleaner unit testing Gavin Andresen <gavinandresen@gmail.com> parents: 909 diff changeset	1008
575 1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1009 return time(NULL);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1010 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1011
1616 997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	1012 void SetMockTime(int64 nMockTimeIn)
1299 432633b3e50d SetMockTime() for cleaner unit testing Gavin Andresen <gavinandresen@gmail.com> parents: 909 diff changeset	1013 {
432633b3e50d SetMockTime() for cleaner unit testing Gavin Andresen <gavinandresen@gmail.com> parents: 909 diff changeset	1014 nMockTime = nMockTimeIn;
432633b3e50d SetMockTime() for cleaner unit testing Gavin Andresen <gavinandresen@gmail.com> parents: 909 diff changeset	1015 }
432633b3e50d SetMockTime() for cleaner unit testing Gavin Andresen <gavinandresen@gmail.com> parents: 909 diff changeset	1016
1616 997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	1017 static int64 nTimeOffset = 0;
575 1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1018
1616 997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	1019 int64 GetAdjustedTime()
575 1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1020 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1021 return GetTime() + nTimeOffset;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1022 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1023
1731 4a2d4c136998 Network stack refactor Pieter Wuille <pieter.wuille@gmail.com> parents: 1644 diff changeset	1024 void AddTimeData(const CNetAddr& ip, int64 nTime)
575 1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1025 {
1616 997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	1026 int64 nOffsetSample = nTime - GetTime();
575 1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1027
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1028 // Ignore duplicates
1731 4a2d4c136998 Network stack refactor Pieter Wuille <pieter.wuille@gmail.com> parents: 1644 diff changeset	1029 static set<CNetAddr> setKnown;
575 1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1030 if (!setKnown.insert(ip).second)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1031 return;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1032
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1033 // Add data
1545 6158c8936f47 Retain only the most recent time samples Michael Hendricks <michael@ndrix.org> parents: 1544 diff changeset	1034 vTimeOffsets.input(nOffsetSample);
6158c8936f47 Retain only the most recent time samples Michael Hendricks <michael@ndrix.org> parents: 1544 diff changeset	1035 printf("Added time data, samples %d, offset %+"PRI64d" (%+"PRI64d" minutes)\n", vTimeOffsets.size(), nOffsetSample, nOffsetSample/60);
575 1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1036 if (vTimeOffsets.size() >= 5 && vTimeOffsets.size() % 2 == 1)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1037 {
1616 997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	1038 int64 nMedian = vTimeOffsets.median();
997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	1039 std::vector<int64> vSorted = vTimeOffsets.sorted();
575 1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1040 // Only let other nodes change our time by so much
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1041 if (abs64(nMedian) < 70 * 60)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1042 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1043 nTimeOffset = nMedian;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1044 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1045 else
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1046 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1047 nTimeOffset = 0;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1048
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1049 static bool fDone;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1050 if (!fDone)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1051 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1052 // If nobody has a time different than ours but within 5 minutes of ours, give a warning
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1053 bool fMatch = false;
1616 997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	1054 BOOST_FOREACH(int64 nOffset, vSorted)
575 1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1055 if (nOffset != 0 && abs64(nOffset) < 5 * 60)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1056 fMatch = true;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1057
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1058 if (!fMatch)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1059 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1060 fDone = true;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1061 string strMessage = _("Warning: Please check that your computer's date and time are correct. If your clock is wrong Bitcoin will not work properly.");
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1062 strMiscWarning = strMessage;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1063 printf("*** %s\n", strMessage.c_str());
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1064 boost::thread(boost::bind(ThreadSafeMessageBox, strMessage+" ", string("Bitcoin"), wxOK \| wxICON_EXCLAMATION, (wxWindow*)NULL, -1, -1));
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1065 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1066 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1067 }
1544 5fba80d924d9 Only log time samples in debug mode Michael Hendricks <michael@ndrix.org> parents: 1390 diff changeset	1068 if (fDebug) {
1616 997b708d15b8 Revert "Use standard C99 (and Qt) types for 64-bit integers" Wladimir J. van der Laan <laanwj@gmail.com> parents: 1615 diff changeset	1069 BOOST_FOREACH(int64 n, vSorted)
1544 5fba80d924d9 Only log time samples in debug mode Michael Hendricks <michael@ndrix.org> parents: 1390 diff changeset	1070 printf("%+"PRI64d" ", n);
5fba80d924d9 Only log time samples in debug mode Michael Hendricks <michael@ndrix.org> parents: 1390 diff changeset	1071 printf("\| ");
5fba80d924d9 Only log time samples in debug mode Michael Hendricks <michael@ndrix.org> parents: 1390 diff changeset	1072 }
5fba80d924d9 Only log time samples in debug mode Michael Hendricks <michael@ndrix.org> parents: 1390 diff changeset	1073 printf("nTimeOffset = %+"PRI64d" (%+"PRI64d" minutes)\n", nTimeOffset, nTimeOffset/60);
575 1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1074 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1075 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1076
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1077
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1078
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1079
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1080
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1081
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1082
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1083
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1084 string FormatVersion(int nVersion)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1085 {
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1086 if (nVersion%100 == 0)
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1087 return strprintf("%d.%d.%d", nVersion/1000000, (nVersion/10000)%100, (nVersion/100)%100);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1088 else
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1089 return strprintf("%d.%d.%d.%d", nVersion/1000000, (nVersion/10000)%100, (nVersion/100)%100, nVersion%100);
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1090 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1091
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1092 string FormatFullVersion()
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1093 {
1584 a67f13278e2c Implement BIP 14 : separate protocol version from client version Gavin Andresen <gavinandresen@gmail.com> parents: 1390 diff changeset	1094 string s = FormatVersion(CLIENT_VERSION);
687 ccaf25d00bd8 FormatFullVersion: build fix related to recent translation improvement Jeff Garzik <jeff@garzik.org> parents: 682 diff changeset	1095 if (VERSION_IS_BETA) {
ccaf25d00bd8 FormatFullVersion: build fix related to recent translation improvement Jeff Garzik <jeff@garzik.org> parents: 682 diff changeset	1096 s += "-";
ccaf25d00bd8 FormatFullVersion: build fix related to recent translation improvement Jeff Garzik <jeff@garzik.org> parents: 682 diff changeset	1097 s += _("beta");
ccaf25d00bd8 FormatFullVersion: build fix related to recent translation improvement Jeff Garzik <jeff@garzik.org> parents: 682 diff changeset	1098 }
575 1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1099 return s;
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1100 }
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1101
1584 a67f13278e2c Implement BIP 14 : separate protocol version from client version Gavin Andresen <gavinandresen@gmail.com> parents: 1390 diff changeset	1102 // Format the subversion field according to BIP 14 spec (https://en.bitcoin.it/wiki/BIP_0014)
a67f13278e2c Implement BIP 14 : separate protocol version from client version Gavin Andresen <gavinandresen@gmail.com> parents: 1390 diff changeset	1103 std::string FormatSubVersion(const std::string& name, int nClientVersion, const std::vector<std::string>& comments)
a67f13278e2c Implement BIP 14 : separate protocol version from client version Gavin Andresen <gavinandresen@gmail.com> parents: 1390 diff changeset	1104 {
a67f13278e2c Implement BIP 14 : separate protocol version from client version Gavin Andresen <gavinandresen@gmail.com> parents: 1390 diff changeset	1105 std::ostringstream ss;
a67f13278e2c Implement BIP 14 : separate protocol version from client version Gavin Andresen <gavinandresen@gmail.com> parents: 1390 diff changeset	1106 ss << "/";
a67f13278e2c Implement BIP 14 : separate protocol version from client version Gavin Andresen <gavinandresen@gmail.com> parents: 1390 diff changeset	1107 ss << name << ":" << FormatVersion(nClientVersion);
a67f13278e2c Implement BIP 14 : separate protocol version from client version Gavin Andresen <gavinandresen@gmail.com> parents: 1390 diff changeset	1108 if (!comments.empty())
a67f13278e2c Implement BIP 14 : separate protocol version from client version Gavin Andresen <gavinandresen@gmail.com> parents: 1390 diff changeset	1109 ss << "(" << boost::algorithm::join(comments, "; ") << ")";
a67f13278e2c Implement BIP 14 : separate protocol version from client version Gavin Andresen <gavinandresen@gmail.com> parents: 1390 diff changeset	1110 ss << "/";
a67f13278e2c Implement BIP 14 : separate protocol version from client version Gavin Andresen <gavinandresen@gmail.com> parents: 1390 diff changeset	1111 return ss.str();
a67f13278e2c Implement BIP 14 : separate protocol version from client version Gavin Andresen <gavinandresen@gmail.com> parents: 1390 diff changeset	1112 }
575 1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1113
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1114
1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1115
872 3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1116 #ifdef DEBUG_LOCKORDER
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1117 //
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1118 // Early deadlock detection.
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1119 // Problem being solved:
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1120 // Thread 1 locks A, then B, then C
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1121 // Thread 2 locks D, then C, then A
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1122 // --> may result in deadlock between the two threads, depending on when they run.
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1123 // Solution implemented here:
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1124 // Keep track of pairs of locks: (A before B), (A before C), etc.
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1125 // Complain if any thread trys to lock in a different order.
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1126 //
575 1a0476fe825f directory re-organization (keeps the old build system) Jaromil <jaromil@dyne.org> parents: diff changeset	1127
872 3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1128 struct CLockLocation
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1129 {
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1130 CLockLocation(const char* pszName, const char* pszFile, int nLine)
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1131 {
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1132 mutexName = pszName;
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1133 sourceFile = pszFile;
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1134 sourceLine = nLine;
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1135 }
909 b0a8d376ead4 If compiled -DDEBUG_LOCKORDER and run with -debug, print out every mutex lock/unlock (helpful for debugging something-is-holding-a-mutex-too-long problems) Gavin Andresen <gavinandresen@gmail.com> parents: 891 diff changeset	1136
b0a8d376ead4 If compiled -DDEBUG_LOCKORDER and run with -debug, print out every mutex lock/unlock (helpful for debugging something-is-holding-a-mutex-too-long problems) Gavin Andresen <gavinandresen@gmail.com> parents: 891 diff changeset	1137 std::string ToString() const
b0a8d376ead4 If compiled -DDEBUG_LOCKORDER and run with -debug, print out every mutex lock/unlock (helpful for debugging something-is-holding-a-mutex-too-long problems) Gavin Andresen <gavinandresen@gmail.com> parents: 891 diff changeset	1138 {
b0a8d376ead4 If compiled -DDEBUG_LOCKORDER and run with -debug, print out every mutex lock/unlock (helpful for debugging something-is-holding-a-mutex-too-long problems) Gavin Andresen <gavinandresen@gmail.com> parents: 891 diff changeset	1139 return mutexName+" "+sourceFile+":"+itostr(sourceLine);
b0a8d376ead4 If compiled -DDEBUG_LOCKORDER and run with -debug, print out every mutex lock/unlock (helpful for debugging something-is-holding-a-mutex-too-long problems) Gavin Andresen <gavinandresen@gmail.com> parents: 891 diff changeset	1140 }
b0a8d376ead4 If compiled -DDEBUG_LOCKORDER and run with -debug, print out every mutex lock/unlock (helpful for debugging something-is-holding-a-mutex-too-long problems) Gavin Andresen <gavinandresen@gmail.com> parents: 891 diff changeset	1141
b0a8d376ead4 If compiled -DDEBUG_LOCKORDER and run with -debug, print out every mutex lock/unlock (helpful for debugging something-is-holding-a-mutex-too-long problems) Gavin Andresen <gavinandresen@gmail.com> parents: 891 diff changeset	1142 private:
b0a8d376ead4 If compiled -DDEBUG_LOCKORDER and run with -debug, print out every mutex lock/unlock (helpful for debugging something-is-holding-a-mutex-too-long problems) Gavin Andresen <gavinandresen@gmail.com> parents: 891 diff changeset	1143 std::string mutexName;
b0a8d376ead4 If compiled -DDEBUG_LOCKORDER and run with -debug, print out every mutex lock/unlock (helpful for debugging something-is-holding-a-mutex-too-long problems) Gavin Andresen <gavinandresen@gmail.com> parents: 891 diff changeset	1144 std::string sourceFile;
b0a8d376ead4 If compiled -DDEBUG_LOCKORDER and run with -debug, print out every mutex lock/unlock (helpful for debugging something-is-holding-a-mutex-too-long problems) Gavin Andresen <gavinandresen@gmail.com> parents: 891 diff changeset	1145 int sourceLine;
872 3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1146 };
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1147
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1148 typedef std::vector< std::pair<CCriticalSection*, CLockLocation> > LockStack;
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1149
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1150 static boost::interprocess::interprocess_mutex dd_mutex;
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1151 static std::map<std::pair<CCriticalSection, CCriticalSection>, LockStack> lockorders;
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1152 static boost::thread_specific_ptr<LockStack> lockstack;
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1153
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1154
891 a3f0b2791d42 Highlight mis-matching locks Gavin Andresen <gavinandresen@gmail.com> parents: 872 diff changeset	1155 static void potential_deadlock_detected(const std::pair<CCriticalSection, CCriticalSection>& mismatch, const LockStack& s1, const LockStack& s2)
872 3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1156 {
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1157 printf("POTENTIAL DEADLOCK DETECTED\n");
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1158 printf("Previous lock order was:\n");
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1159 BOOST_FOREACH(const PAIRTYPE(CCriticalSection*, CLockLocation)& i, s2)
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1160 {
891 a3f0b2791d42 Highlight mis-matching locks Gavin Andresen <gavinandresen@gmail.com> parents: 872 diff changeset	1161 if (i.first == mismatch.first) printf(" (1)");
a3f0b2791d42 Highlight mis-matching locks Gavin Andresen <gavinandresen@gmail.com> parents: 872 diff changeset	1162 if (i.first == mismatch.second) printf(" (2)");
909 b0a8d376ead4 If compiled -DDEBUG_LOCKORDER and run with -debug, print out every mutex lock/unlock (helpful for debugging something-is-holding-a-mutex-too-long problems) Gavin Andresen <gavinandresen@gmail.com> parents: 891 diff changeset	1163 printf(" %s\n", i.second.ToString().c_str());
872 3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1164 }
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1165 printf("Current lock order is:\n");
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1166 BOOST_FOREACH(const PAIRTYPE(CCriticalSection*, CLockLocation)& i, s1)
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1167 {
891 a3f0b2791d42 Highlight mis-matching locks Gavin Andresen <gavinandresen@gmail.com> parents: 872 diff changeset	1168 if (i.first == mismatch.first) printf(" (1)");
a3f0b2791d42 Highlight mis-matching locks Gavin Andresen <gavinandresen@gmail.com> parents: 872 diff changeset	1169 if (i.first == mismatch.second) printf(" (2)");
909 b0a8d376ead4 If compiled -DDEBUG_LOCKORDER and run with -debug, print out every mutex lock/unlock (helpful for debugging something-is-holding-a-mutex-too-long problems) Gavin Andresen <gavinandresen@gmail.com> parents: 891 diff changeset	1170 printf(" %s\n", i.second.ToString().c_str());
872 3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1171 }
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1172 }
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1173
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1174 static void push_lock(CCriticalSection* c, const CLockLocation& locklocation)
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1175 {
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1176 bool fOrderOK = true;
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1177 if (lockstack.get() == NULL)
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1178 lockstack.reset(new LockStack);
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1179
909 b0a8d376ead4 If compiled -DDEBUG_LOCKORDER and run with -debug, print out every mutex lock/unlock (helpful for debugging something-is-holding-a-mutex-too-long problems) Gavin Andresen <gavinandresen@gmail.com> parents: 891 diff changeset	1180 if (fDebug) printf("Locking: %s\n", locklocation.ToString().c_str());
872 3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1181 dd_mutex.lock();
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1182
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1183 (*lockstack).push_back(std::make_pair(c, locklocation));
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1184
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1185 BOOST_FOREACH(const PAIRTYPE(CCriticalSection, CLockLocation)& i, (lockstack))
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1186 {
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1187 if (i.first == c) break;
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1188
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1189 std::pair<CCriticalSection, CCriticalSection> p1 = std::make_pair(i.first, c);
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1190 if (lockorders.count(p1))
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1191 continue;
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1192 lockorders[p1] = (*lockstack);
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1193
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1194 std::pair<CCriticalSection, CCriticalSection> p2 = std::make_pair(c, i.first);
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1195 if (lockorders.count(p2))
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1196 {
891 a3f0b2791d42 Highlight mis-matching locks Gavin Andresen <gavinandresen@gmail.com> parents: 872 diff changeset	1197 potential_deadlock_detected(p1, lockorders[p2], lockorders[p1]);
872 3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1198 break;
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1199 }
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1200 }
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1201 dd_mutex.unlock();
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1202 }
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1203
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1204 static void pop_lock()
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1205 {
909 b0a8d376ead4 If compiled -DDEBUG_LOCKORDER and run with -debug, print out every mutex lock/unlock (helpful for debugging something-is-holding-a-mutex-too-long problems) Gavin Andresen <gavinandresen@gmail.com> parents: 891 diff changeset	1206 if (fDebug)
b0a8d376ead4 If compiled -DDEBUG_LOCKORDER and run with -debug, print out every mutex lock/unlock (helpful for debugging something-is-holding-a-mutex-too-long problems) Gavin Andresen <gavinandresen@gmail.com> parents: 891 diff changeset	1207 {
b0a8d376ead4 If compiled -DDEBUG_LOCKORDER and run with -debug, print out every mutex lock/unlock (helpful for debugging something-is-holding-a-mutex-too-long problems) Gavin Andresen <gavinandresen@gmail.com> parents: 891 diff changeset	1208 const CLockLocation& locklocation = (*lockstack).rbegin()->second;
b0a8d376ead4 If compiled -DDEBUG_LOCKORDER and run with -debug, print out every mutex lock/unlock (helpful for debugging something-is-holding-a-mutex-too-long problems) Gavin Andresen <gavinandresen@gmail.com> parents: 891 diff changeset	1209 printf("Unlocked: %s\n", locklocation.ToString().c_str());
b0a8d376ead4 If compiled -DDEBUG_LOCKORDER and run with -debug, print out every mutex lock/unlock (helpful for debugging something-is-holding-a-mutex-too-long problems) Gavin Andresen <gavinandresen@gmail.com> parents: 891 diff changeset	1210 }
b0a8d376ead4 If compiled -DDEBUG_LOCKORDER and run with -debug, print out every mutex lock/unlock (helpful for debugging something-is-holding-a-mutex-too-long problems) Gavin Andresen <gavinandresen@gmail.com> parents: 891 diff changeset	1211 dd_mutex.lock();
872 3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1212 (*lockstack).pop_back();
909 b0a8d376ead4 If compiled -DDEBUG_LOCKORDER and run with -debug, print out every mutex lock/unlock (helpful for debugging something-is-holding-a-mutex-too-long problems) Gavin Andresen <gavinandresen@gmail.com> parents: 891 diff changeset	1213 dd_mutex.unlock();
872 3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1214 }
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1215
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1216 void CCriticalSection::Enter(const char* pszName, const char* pszFile, int nLine)
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1217 {
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1218 push_lock(this, CLockLocation(pszName, pszFile, nLine));
1776 c25505b7a486 Add DEBUG_LOCKCONTENTION, to warn each time a thread waits to lock. Matt Corallo <matt@bluematt.me> parents: 1752 diff changeset	1219 #ifdef DEBUG_LOCKCONTENTION
c25505b7a486 Add DEBUG_LOCKCONTENTION, to warn each time a thread waits to lock. Matt Corallo <matt@bluematt.me> parents: 1752 diff changeset	1220 bool result = mutex.try_lock();
c25505b7a486 Add DEBUG_LOCKCONTENTION, to warn each time a thread waits to lock. Matt Corallo <matt@bluematt.me> parents: 1752 diff changeset	1221 if (!result)
c25505b7a486 Add DEBUG_LOCKCONTENTION, to warn each time a thread waits to lock. Matt Corallo <matt@bluematt.me> parents: 1752 diff changeset	1222 {
c25505b7a486 Add DEBUG_LOCKCONTENTION, to warn each time a thread waits to lock. Matt Corallo <matt@bluematt.me> parents: 1752 diff changeset	1223 printf("LOCKCONTENTION: %s\n", pszName);
c25505b7a486 Add DEBUG_LOCKCONTENTION, to warn each time a thread waits to lock. Matt Corallo <matt@bluematt.me> parents: 1752 diff changeset	1224 printf("Locker: %s:%d\n", pszFile, nLine);
c25505b7a486 Add DEBUG_LOCKCONTENTION, to warn each time a thread waits to lock. Matt Corallo <matt@bluematt.me> parents: 1752 diff changeset	1225 mutex.lock();
c25505b7a486 Add DEBUG_LOCKCONTENTION, to warn each time a thread waits to lock. Matt Corallo <matt@bluematt.me> parents: 1752 diff changeset	1226 printf("Locked\n");
c25505b7a486 Add DEBUG_LOCKCONTENTION, to warn each time a thread waits to lock. Matt Corallo <matt@bluematt.me> parents: 1752 diff changeset	1227 }
c25505b7a486 Add DEBUG_LOCKCONTENTION, to warn each time a thread waits to lock. Matt Corallo <matt@bluematt.me> parents: 1752 diff changeset	1228 #else
872 3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1229 mutex.lock();
1776 c25505b7a486 Add DEBUG_LOCKCONTENTION, to warn each time a thread waits to lock. Matt Corallo <matt@bluematt.me> parents: 1752 diff changeset	1230 #endif
872 3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1231 }
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1232 void CCriticalSection::Leave()
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1233 {
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1234 mutex.unlock();
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1235 pop_lock();
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1236 }
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1237 bool CCriticalSection::TryEnter(const char* pszName, const char* pszFile, int nLine)
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1238 {
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1239 push_lock(this, CLockLocation(pszName, pszFile, nLine));
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1240 bool result = mutex.try_lock();
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1241 if (!result) pop_lock();
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1242 return result;
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1243 }
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1244
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1245 #else
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1246
1776 c25505b7a486 Add DEBUG_LOCKCONTENTION, to warn each time a thread waits to lock. Matt Corallo <matt@bluematt.me> parents: 1752 diff changeset	1247 void CCriticalSection::Enter(const char* pszName, const char* pszFile, int nLine)
872 3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1248 {
1776 c25505b7a486 Add DEBUG_LOCKCONTENTION, to warn each time a thread waits to lock. Matt Corallo <matt@bluematt.me> parents: 1752 diff changeset	1249 #ifdef DEBUG_LOCKCONTENTION
c25505b7a486 Add DEBUG_LOCKCONTENTION, to warn each time a thread waits to lock. Matt Corallo <matt@bluematt.me> parents: 1752 diff changeset	1250 bool result = mutex.try_lock();
c25505b7a486 Add DEBUG_LOCKCONTENTION, to warn each time a thread waits to lock. Matt Corallo <matt@bluematt.me> parents: 1752 diff changeset	1251 if (!result)
c25505b7a486 Add DEBUG_LOCKCONTENTION, to warn each time a thread waits to lock. Matt Corallo <matt@bluematt.me> parents: 1752 diff changeset	1252 {
c25505b7a486 Add DEBUG_LOCKCONTENTION, to warn each time a thread waits to lock. Matt Corallo <matt@bluematt.me> parents: 1752 diff changeset	1253 printf("LOCKCONTENTION: %s\n", pszName);
c25505b7a486 Add DEBUG_LOCKCONTENTION, to warn each time a thread waits to lock. Matt Corallo <matt@bluematt.me> parents: 1752 diff changeset	1254 printf("Locker: %s:%d\n", pszFile, nLine);
c25505b7a486 Add DEBUG_LOCKCONTENTION, to warn each time a thread waits to lock. Matt Corallo <matt@bluematt.me> parents: 1752 diff changeset	1255 mutex.lock();
c25505b7a486 Add DEBUG_LOCKCONTENTION, to warn each time a thread waits to lock. Matt Corallo <matt@bluematt.me> parents: 1752 diff changeset	1256 }
c25505b7a486 Add DEBUG_LOCKCONTENTION, to warn each time a thread waits to lock. Matt Corallo <matt@bluematt.me> parents: 1752 diff changeset	1257 #else
872 3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1258 mutex.lock();
1776 c25505b7a486 Add DEBUG_LOCKCONTENTION, to warn each time a thread waits to lock. Matt Corallo <matt@bluematt.me> parents: 1752 diff changeset	1259 #endif
872 3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1260 }
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1261
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1262 void CCriticalSection::Leave()
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1263 {
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1264 mutex.unlock();
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1265 }
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1266
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1267 bool CCriticalSection::TryEnter(const char, const char, int)
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1268 {
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1269 bool result = mutex.try_lock();
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1270 return result;
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1271 }
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1272
3995c6aea28e Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks Gavin Andresen <gavinandresen@gmail.com> parents: 846 diff changeset	1273 #endif /* DEBUG_LOCKORDER */
1731 4a2d4c136998 Network stack refactor Pieter Wuille <pieter.wuille@gmail.com> parents: 1644 diff changeset	1274

Mercurial > hg > bitcoin

annotate src/util.cpp @ 1855:82511bef45d3 draft