Mercurial > hg > bitcoin
annotate src/util.cpp @ 1776:c25505b7a486 draft
Add DEBUG_LOCKCONTENTION, to warn each time a thread waits to lock.
If compiled with -DDEBUG_LOCKCONTENTION, Bitcoin will print to
debug.log each time a thread has to wait for a lock to continue.
author | Matt Corallo <matt@bluematt.me> |
---|---|
date | Sat, 07 Jan 2012 12:12:39 -0500 (2012-01-07) |
parents | 7b4383bddf3b |
children | b00fd0a54a85 |
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 |
846 | 2 // Copyright (c) 2011 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 |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
457 void ParseParameters(int argc, char* argv[]) |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
458 { |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
459 mapArgs.clear(); |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
460 mapMultiArgs.clear(); |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
461 for (int i = 1; i < argc; i++) |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
462 { |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
463 char psz[10000]; |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
464 strlcpy(psz, argv[i], sizeof(psz)); |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
465 char* pszValue = (char*)""; |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
466 if (strchr(psz, '=')) |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
467 { |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
468 pszValue = strchr(psz, '='); |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
469 *pszValue++ = '\0'; |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
470 } |
1390
97bac6569f62
Fix build on windows and mac
Gavin Andresen <gavinandresen@gmail.com>
parents:
1361
diff
changeset
|
471 #ifdef WIN32 |
575
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
472 _strlwr(psz); |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
473 if (psz[0] == '/') |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
474 psz[0] = '-'; |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
475 #endif |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
476 if (psz[0] != '-') |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
477 break; |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
478 mapArgs[psz] = pszValue; |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
479 mapMultiArgs[psz].push_back(pszValue); |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
480 } |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
481 } |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
482 |
1644
35ccaffca27e
Fix issue #659, and cleanup wallet/command-line argument handling a bit
Gavin Andresen <gavinandresen@gmail.com>
parents:
1616
diff
changeset
|
483 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
|
484 { |
35ccaffca27e
Fix issue #659, and cleanup wallet/command-line argument handling a bit
Gavin Andresen <gavinandresen@gmail.com>
parents:
1616
diff
changeset
|
485 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
|
486 return false; |
35ccaffca27e
Fix issue #659, and cleanup wallet/command-line argument handling a bit
Gavin Andresen <gavinandresen@gmail.com>
parents:
1616
diff
changeset
|
487 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
|
488 return true; |
35ccaffca27e
Fix issue #659, and cleanup wallet/command-line argument handling a bit
Gavin Andresen <gavinandresen@gmail.com>
parents:
1616
diff
changeset
|
489 } |
35ccaffca27e
Fix issue #659, and cleanup wallet/command-line argument handling a bit
Gavin Andresen <gavinandresen@gmail.com>
parents:
1616
diff
changeset
|
490 |
35ccaffca27e
Fix issue #659, and cleanup wallet/command-line argument handling a bit
Gavin Andresen <gavinandresen@gmail.com>
parents:
1616
diff
changeset
|
491 bool SoftSetArg(const std::string& strArg, bool fValue) |
35ccaffca27e
Fix issue #659, and cleanup wallet/command-line argument handling a bit
Gavin Andresen <gavinandresen@gmail.com>
parents:
1616
diff
changeset
|
492 { |
35ccaffca27e
Fix issue #659, and cleanup wallet/command-line argument handling a bit
Gavin Andresen <gavinandresen@gmail.com>
parents:
1616
diff
changeset
|
493 if (fValue) |
35ccaffca27e
Fix issue #659, and cleanup wallet/command-line argument handling a bit
Gavin Andresen <gavinandresen@gmail.com>
parents:
1616
diff
changeset
|
494 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
|
495 else |
35ccaffca27e
Fix issue #659, and cleanup wallet/command-line argument handling a bit
Gavin Andresen <gavinandresen@gmail.com>
parents:
1616
diff
changeset
|
496 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
|
497 } |
35ccaffca27e
Fix issue #659, and cleanup wallet/command-line argument handling a bit
Gavin Andresen <gavinandresen@gmail.com>
parents:
1616
diff
changeset
|
498 |
35ccaffca27e
Fix issue #659, and cleanup wallet/command-line argument handling a bit
Gavin Andresen <gavinandresen@gmail.com>
parents:
1616
diff
changeset
|
499 |
1327
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
500 string EncodeBase64(const unsigned char* pch, size_t len) |
1326
f70bb1af83c3
Faster Base64 decoder.
JoelKatz <DavidJoelSchwartz@GMail.com>
parents:
1320
diff
changeset
|
501 { |
1327
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
502 static const char *pbase64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
503 |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
504 string strRet=""; |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
505 strRet.reserve((len+2)/3*4); |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
506 |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
507 int mode=0, left=0; |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
508 const unsigned char *pchEnd = pch+len; |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
509 |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
510 while (pch<pchEnd) |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
511 { |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
512 int enc = *(pch++); |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
513 switch (mode) |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
514 { |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
515 case 0: // we have no bits |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
516 strRet += pbase64[enc >> 2]; |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
517 left = (enc & 3) << 4; |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
518 mode = 1; |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
519 break; |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
520 |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
521 case 1: // we have two bits |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
522 strRet += pbase64[left | (enc >> 4)]; |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
523 left = (enc & 15) << 2; |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
524 mode = 2; |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
525 break; |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
526 |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
527 case 2: // we have four bits |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
528 strRet += pbase64[left | (enc >> 6)]; |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
529 strRet += pbase64[enc & 63]; |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
530 mode = 0; |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
531 break; |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
532 } |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
533 } |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
534 |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
535 if (mode) |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
536 { |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
537 strRet += pbase64[left]; |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
538 strRet += '='; |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
539 if (mode == 1) |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
540 strRet += '='; |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
541 } |
1326
f70bb1af83c3
Faster Base64 decoder.
JoelKatz <DavidJoelSchwartz@GMail.com>
parents:
1320
diff
changeset
|
542 |
1327
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
543 return strRet; |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
544 } |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
545 |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
546 string EncodeBase64(const string& str) |
1326
f70bb1af83c3
Faster Base64 decoder.
JoelKatz <DavidJoelSchwartz@GMail.com>
parents:
1320
diff
changeset
|
547 { |
1327
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
548 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
|
549 } |
1326
f70bb1af83c3
Faster Base64 decoder.
JoelKatz <DavidJoelSchwartz@GMail.com>
parents:
1320
diff
changeset
|
550 |
1327
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
551 vector<unsigned char> DecodeBase64(const char* p, bool* pfInvalid) |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
552 { |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
553 static const int decode64_table[256] = |
1326
f70bb1af83c3
Faster Base64 decoder.
JoelKatz <DavidJoelSchwartz@GMail.com>
parents:
1320
diff
changeset
|
554 { |
1327
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
555 -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
|
556 -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
|
557 -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
|
558 -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
|
559 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
|
560 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
|
561 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
|
562 -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
|
563 -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
|
564 -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
|
565 -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
|
566 -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
|
567 -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
|
568 }; |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
569 |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
570 if (pfInvalid) |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
571 *pfInvalid = false; |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
572 |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
573 vector<unsigned char> vchRet; |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
574 vchRet.reserve(strlen(p)*3/4); |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
575 |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
576 int mode = 0; |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
577 int left = 0; |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
578 |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
579 while (1) |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
580 { |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
581 int dec = decode64_table[*p]; |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
582 if (dec == -1) break; |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
583 p++; |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
584 switch (mode) |
1326
f70bb1af83c3
Faster Base64 decoder.
JoelKatz <DavidJoelSchwartz@GMail.com>
parents:
1320
diff
changeset
|
585 { |
f70bb1af83c3
Faster Base64 decoder.
JoelKatz <DavidJoelSchwartz@GMail.com>
parents:
1320
diff
changeset
|
586 case 0: // we have no bits and get 6 |
f70bb1af83c3
Faster Base64 decoder.
JoelKatz <DavidJoelSchwartz@GMail.com>
parents:
1320
diff
changeset
|
587 left = dec; |
f70bb1af83c3
Faster Base64 decoder.
JoelKatz <DavidJoelSchwartz@GMail.com>
parents:
1320
diff
changeset
|
588 mode = 1; |
f70bb1af83c3
Faster Base64 decoder.
JoelKatz <DavidJoelSchwartz@GMail.com>
parents:
1320
diff
changeset
|
589 break; |
f70bb1af83c3
Faster Base64 decoder.
JoelKatz <DavidJoelSchwartz@GMail.com>
parents:
1320
diff
changeset
|
590 |
f70bb1af83c3
Faster Base64 decoder.
JoelKatz <DavidJoelSchwartz@GMail.com>
parents:
1320
diff
changeset
|
591 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
|
592 vchRet.push_back((left<<2) | (dec>>4)); |
1326
f70bb1af83c3
Faster Base64 decoder.
JoelKatz <DavidJoelSchwartz@GMail.com>
parents:
1320
diff
changeset
|
593 left = dec & 15; |
f70bb1af83c3
Faster Base64 decoder.
JoelKatz <DavidJoelSchwartz@GMail.com>
parents:
1320
diff
changeset
|
594 mode = 2; |
f70bb1af83c3
Faster Base64 decoder.
JoelKatz <DavidJoelSchwartz@GMail.com>
parents:
1320
diff
changeset
|
595 break; |
1327
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
596 |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
597 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
|
598 vchRet.push_back((left<<4) | (dec>>2)); |
1326
f70bb1af83c3
Faster Base64 decoder.
JoelKatz <DavidJoelSchwartz@GMail.com>
parents:
1320
diff
changeset
|
599 left = dec & 3; |
f70bb1af83c3
Faster Base64 decoder.
JoelKatz <DavidJoelSchwartz@GMail.com>
parents:
1320
diff
changeset
|
600 mode = 3; |
f70bb1af83c3
Faster Base64 decoder.
JoelKatz <DavidJoelSchwartz@GMail.com>
parents:
1320
diff
changeset
|
601 break; |
1327
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
602 |
1326
f70bb1af83c3
Faster Base64 decoder.
JoelKatz <DavidJoelSchwartz@GMail.com>
parents:
1320
diff
changeset
|
603 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
|
604 vchRet.push_back((left<<6) | dec); |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
605 mode = 0; |
1326
f70bb1af83c3
Faster Base64 decoder.
JoelKatz <DavidJoelSchwartz@GMail.com>
parents:
1320
diff
changeset
|
606 break; |
f70bb1af83c3
Faster Base64 decoder.
JoelKatz <DavidJoelSchwartz@GMail.com>
parents:
1320
diff
changeset
|
607 } |
f70bb1af83c3
Faster Base64 decoder.
JoelKatz <DavidJoelSchwartz@GMail.com>
parents:
1320
diff
changeset
|
608 } |
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 if (pfInvalid) |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
611 switch (mode) |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
612 { |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
613 case 0: // 4n base64 characters processed: ok |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
614 break; |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
615 |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
616 case 1: // 4n+1 base64 character processed: impossible |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
617 *pfInvalid = true; |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
618 break; |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
619 |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
620 case 2: // 4n+2 base64 characters processed: require '==' |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
621 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
|
622 *pfInvalid = true; |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
623 break; |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
624 |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
625 case 3: // 4n+3 base64 characters processed: require '=' |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
626 if (left || p[0] != '=' || decode64_table[p[1]] != -1) |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
627 *pfInvalid = true; |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
628 break; |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
629 } |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
630 |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
631 return vchRet; |
1326
f70bb1af83c3
Faster Base64 decoder.
JoelKatz <DavidJoelSchwartz@GMail.com>
parents:
1320
diff
changeset
|
632 } |
f70bb1af83c3
Faster Base64 decoder.
JoelKatz <DavidJoelSchwartz@GMail.com>
parents:
1320
diff
changeset
|
633 |
1327
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
634 string DecodeBase64(const string& str) |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
635 { |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
636 vector<unsigned char> vchRet = DecodeBase64(str.c_str()); |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
637 return string((const char*)&vchRet[0], vchRet.size()); |
ee5daf89604c
Inline base64 encoder/decoder
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1326
diff
changeset
|
638 } |
575
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
639 |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
640 |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
641 bool WildcardMatch(const char* psz, const char* mask) |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
642 { |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
643 loop |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
644 { |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
645 switch (*mask) |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
646 { |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
647 case '\0': |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
648 return (*psz == '\0'); |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
649 case '*': |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
650 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
|
651 case '?': |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
652 if (*psz == '\0') |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
653 return false; |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
654 break; |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
655 default: |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
656 if (*psz != *mask) |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
657 return false; |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
658 break; |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
659 } |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
660 psz++; |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
661 mask++; |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
662 } |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
663 } |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
664 |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
665 bool WildcardMatch(const string& str, const string& mask) |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
666 { |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
667 return WildcardMatch(str.c_str(), mask.c_str()); |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
668 } |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
669 |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
670 |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
671 |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
672 |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
673 |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
674 |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
675 |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
676 |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
677 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
|
678 { |
1390
97bac6569f62
Fix build on windows and mac
Gavin Andresen <gavinandresen@gmail.com>
parents:
1361
diff
changeset
|
679 #ifdef WIN32 |
575
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
680 char pszModule[MAX_PATH]; |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
681 pszModule[0] = '\0'; |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
682 GetModuleFileNameA(NULL, pszModule, sizeof(pszModule)); |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
683 #else |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
684 const char* pszModule = "bitcoin"; |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
685 #endif |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
686 if (pex) |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
687 snprintf(pszMessage, 1000, |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
688 "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
|
689 else |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
690 snprintf(pszMessage, 1000, |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
691 "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
|
692 } |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
693 |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
694 void LogException(std::exception* pex, const char* pszThread) |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
695 { |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
696 char pszMessage[10000]; |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
697 FormatException(pszMessage, pex, pszThread); |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
698 printf("\n%s", pszMessage); |
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 |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
701 void PrintException(std::exception* pex, const char* pszThread) |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
702 { |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
703 char pszMessage[10000]; |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
704 FormatException(pszMessage, pex, pszThread); |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
705 printf("\n\n************************\n%s\n", pszMessage); |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
706 fprintf(stderr, "\n\n************************\n%s\n", pszMessage); |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
707 strMiscWarning = pszMessage; |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
708 throw; |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
709 } |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
710 |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
711 void ThreadOneMessageBox(string strMessage) |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
712 { |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
713 // Skip message boxes if one is already open |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
714 static bool fMessageBoxOpen; |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
715 if (fMessageBoxOpen) |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
716 return; |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
717 fMessageBoxOpen = true; |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
718 ThreadSafeMessageBox(strMessage, "Bitcoin", wxOK | wxICON_EXCLAMATION); |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
719 fMessageBoxOpen = false; |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
720 } |
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 void PrintExceptionContinue(std::exception* pex, const char* pszThread) |
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 char pszMessage[10000]; |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
725 FormatException(pszMessage, pex, pszThread); |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
726 printf("\n\n************************\n%s\n", pszMessage); |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
727 fprintf(stderr, "\n\n************************\n%s\n", pszMessage); |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
728 strMiscWarning = pszMessage; |
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 |
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 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
|
740 |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
741 string MyGetSpecialFolderPath(int nFolder, bool fCreate) |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
742 { |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
743 char pszPath[MAX_PATH+100] = ""; |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
744 |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
745 // 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
|
746 HMODULE hShell32 = LoadLibraryA("shell32.dll"); |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
747 if (hShell32) |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
748 { |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
749 PSHGETSPECIALFOLDERPATHA pSHGetSpecialFolderPath = |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
750 (PSHGETSPECIALFOLDERPATHA)GetProcAddress(hShell32, "SHGetSpecialFolderPathA"); |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
751 if (pSHGetSpecialFolderPath) |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
752 (*pSHGetSpecialFolderPath)(NULL, pszPath, nFolder, fCreate); |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
753 FreeModule(hShell32); |
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 |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
756 // Backup option |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
757 if (pszPath[0] == '\0') |
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 if (nFolder == CSIDL_STARTUP) |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
760 { |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
761 strcpy(pszPath, getenv("USERPROFILE")); |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
762 strcat(pszPath, "\\Start Menu\\Programs\\Startup"); |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
763 } |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
764 else if (nFolder == CSIDL_APPDATA) |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
765 { |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
766 strcpy(pszPath, getenv("APPDATA")); |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
767 } |
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 return pszPath; |
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 #endif |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
773 |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
774 string GetDefaultDataDir() |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
775 { |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
776 // 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
|
777 // Mac: ~/Library/Application Support/Bitcoin |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
778 // Unix: ~/.bitcoin |
1390
97bac6569f62
Fix build on windows and mac
Gavin Andresen <gavinandresen@gmail.com>
parents:
1361
diff
changeset
|
779 #ifdef WIN32 |
575
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
780 // Windows |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
781 return MyGetSpecialFolderPath(CSIDL_APPDATA, true) + "\\Bitcoin"; |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
782 #else |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
783 char* pszHome = getenv("HOME"); |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
784 if (pszHome == NULL || strlen(pszHome) == 0) |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
785 pszHome = (char*)"/"; |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
786 string strHome = pszHome; |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
787 if (strHome[strHome.size()-1] != '/') |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
788 strHome += '/'; |
1390
97bac6569f62
Fix build on windows and mac
Gavin Andresen <gavinandresen@gmail.com>
parents:
1361
diff
changeset
|
789 #ifdef MAC_OSX |
575
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
790 // Mac |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
791 strHome += "Library/Application Support/"; |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
792 filesystem::create_directory(strHome.c_str()); |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
793 return strHome + "Bitcoin"; |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
794 #else |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
795 // Unix |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
796 return strHome + ".bitcoin"; |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
797 #endif |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
798 #endif |
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 |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
801 void GetDataDir(char* pszDir) |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
802 { |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
803 // pszDir must be at least MAX_PATH length. |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
804 int nVariation; |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
805 if (pszSetDataDir[0] != 0) |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
806 { |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
807 strlcpy(pszDir, pszSetDataDir, MAX_PATH); |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
808 nVariation = 0; |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
809 } |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
810 else |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
811 { |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
812 // 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
|
813 // 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
|
814 static char pszCachedDir[MAX_PATH]; |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
815 if (pszCachedDir[0] == 0) |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
816 strlcpy(pszCachedDir, GetDefaultDataDir().c_str(), sizeof(pszCachedDir)); |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
817 strlcpy(pszDir, pszCachedDir, MAX_PATH); |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
818 nVariation = 1; |
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 if (fTestNet) |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
821 { |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
822 char* p = pszDir + strlen(pszDir); |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
823 if (p > pszDir && p[-1] != '/' && p[-1] != '\\') |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
824 *p++ = '/'; |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
825 strcpy(p, "testnet"); |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
826 nVariation += 2; |
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 static bool pfMkdir[4]; |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
829 if (!pfMkdir[nVariation]) |
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 pfMkdir[nVariation] = true; |
595
e630bbb11629
make bitcoin include files more modular
Wladimir J. van der Laan <laanwj@gmail.com>
parents:
575
diff
changeset
|
832 boost::filesystem::create_directory(pszDir); |
575
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
833 } |
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 |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
836 string GetDataDir() |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
837 { |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
838 char pszDir[MAX_PATH]; |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
839 GetDataDir(pszDir); |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
840 return pszDir; |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
841 } |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
842 |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
843 string GetConfigFile() |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
844 { |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
845 namespace fs = boost::filesystem; |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
846 fs::path pathConfig(GetArg("-conf", "bitcoin.conf")); |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
847 if (!pathConfig.is_complete()) |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
848 pathConfig = fs::path(GetDataDir()) / pathConfig; |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
849 return pathConfig.string(); |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
850 } |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
851 |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
852 void ReadConfigFile(map<string, string>& mapSettingsRet, |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
853 map<string, vector<string> >& mapMultiSettingsRet) |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
854 { |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
855 namespace fs = boost::filesystem; |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
856 namespace pod = boost::program_options::detail; |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
857 |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
858 fs::ifstream streamConfig(GetConfigFile()); |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
859 if (!streamConfig.good()) |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
860 return; |
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 set<string> setOptions; |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
863 setOptions.insert("*"); |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
864 |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
865 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
|
866 { |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
867 // 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
|
868 string strKey = string("-") + it->string_key; |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
869 if (mapSettingsRet.count(strKey) == 0) |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
870 mapSettingsRet[strKey] = it->value[0]; |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
871 mapMultiSettingsRet[strKey].push_back(it->value[0]); |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
872 } |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
873 } |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
874 |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
875 string GetPidFile() |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
876 { |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
877 namespace fs = boost::filesystem; |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
878 fs::path pathConfig(GetArg("-pid", "bitcoind.pid")); |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
879 if (!pathConfig.is_complete()) |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
880 pathConfig = fs::path(GetDataDir()) / pathConfig; |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
881 return pathConfig.string(); |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
882 } |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
883 |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
884 void CreatePidFile(string pidFile, pid_t pid) |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
885 { |
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
|
886 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
|
887 if (file) |
575
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
888 { |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
889 fprintf(file, "%d\n", pid); |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
890 fclose(file); |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
891 } |
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 int GetFilesize(FILE* file) |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
895 { |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
896 int nSavePos = ftell(file); |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
897 int nFilesize = -1; |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
898 if (fseek(file, 0, SEEK_END) == 0) |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
899 nFilesize = ftell(file); |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
900 fseek(file, nSavePos, SEEK_SET); |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
901 return nFilesize; |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
902 } |
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 void ShrinkDebugFile() |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
905 { |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
906 // 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
|
907 string strFile = GetDataDir() + "/debug.log"; |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
908 FILE* file = fopen(strFile.c_str(), "r"); |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
909 if (file && GetFilesize(file) > 10 * 1000000) |
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 // Restart the file with some of the end |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
912 char pch[200000]; |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
913 fseek(file, -sizeof(pch), SEEK_END); |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
914 int nBytes = fread(pch, 1, sizeof(pch), file); |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
915 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
|
916 |
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
|
917 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
|
918 if (file) |
575
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
919 { |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
920 fwrite(pch, 1, nBytes, file); |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
921 fclose(file); |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
922 } |
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 } |
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 |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
927 |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
928 |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
929 |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
930 |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
931 |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
932 |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
933 // |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
934 // "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
|
935 // Our three time sources are: |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
936 // - System clock |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
937 // - Median of other nodes's clocks |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
938 // - 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
|
939 // |
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
|
940 static int64 nMockTime = 0; // For unit testing |
1299
432633b3e50d
SetMockTime() for cleaner unit testing
Gavin Andresen <gavinandresen@gmail.com>
parents:
909
diff
changeset
|
941 |
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
|
942 int64 GetTime() |
575
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
943 { |
1299
432633b3e50d
SetMockTime() for cleaner unit testing
Gavin Andresen <gavinandresen@gmail.com>
parents:
909
diff
changeset
|
944 if (nMockTime) return nMockTime; |
432633b3e50d
SetMockTime() for cleaner unit testing
Gavin Andresen <gavinandresen@gmail.com>
parents:
909
diff
changeset
|
945 |
575
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
946 return time(NULL); |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
947 } |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
948 |
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
|
949 void SetMockTime(int64 nMockTimeIn) |
1299
432633b3e50d
SetMockTime() for cleaner unit testing
Gavin Andresen <gavinandresen@gmail.com>
parents:
909
diff
changeset
|
950 { |
432633b3e50d
SetMockTime() for cleaner unit testing
Gavin Andresen <gavinandresen@gmail.com>
parents:
909
diff
changeset
|
951 nMockTime = nMockTimeIn; |
432633b3e50d
SetMockTime() for cleaner unit testing
Gavin Andresen <gavinandresen@gmail.com>
parents:
909
diff
changeset
|
952 } |
432633b3e50d
SetMockTime() for cleaner unit testing
Gavin Andresen <gavinandresen@gmail.com>
parents:
909
diff
changeset
|
953 |
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
|
954 static int64 nTimeOffset = 0; |
575
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
955 |
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
|
956 int64 GetAdjustedTime() |
575
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
957 { |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
958 return GetTime() + nTimeOffset; |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
959 } |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
960 |
1731
4a2d4c136998
Network stack refactor
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1644
diff
changeset
|
961 void AddTimeData(const CNetAddr& ip, int64 nTime) |
575
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
962 { |
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
|
963 int64 nOffsetSample = nTime - GetTime(); |
575
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
964 |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
965 // Ignore duplicates |
1731
4a2d4c136998
Network stack refactor
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1644
diff
changeset
|
966 static set<CNetAddr> setKnown; |
575
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
967 if (!setKnown.insert(ip).second) |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
968 return; |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
969 |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
970 // Add data |
1545
6158c8936f47
Retain only the most recent time samples
Michael Hendricks <michael@ndrix.org>
parents:
1544
diff
changeset
|
971 vTimeOffsets.input(nOffsetSample); |
6158c8936f47
Retain only the most recent time samples
Michael Hendricks <michael@ndrix.org>
parents:
1544
diff
changeset
|
972 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
|
973 if (vTimeOffsets.size() >= 5 && vTimeOffsets.size() % 2 == 1) |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
974 { |
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
|
975 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
|
976 std::vector<int64> vSorted = vTimeOffsets.sorted(); |
575
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
977 // 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
|
978 if (abs64(nMedian) < 70 * 60) |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
979 { |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
980 nTimeOffset = nMedian; |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
981 } |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
982 else |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
983 { |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
984 nTimeOffset = 0; |
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 static bool fDone; |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
987 if (!fDone) |
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 // 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
|
990 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
|
991 BOOST_FOREACH(int64 nOffset, vSorted) |
575
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
992 if (nOffset != 0 && abs64(nOffset) < 5 * 60) |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
993 fMatch = true; |
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 if (!fMatch) |
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 fDone = true; |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
998 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
|
999 strMiscWarning = strMessage; |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
1000 printf("*** %s\n", strMessage.c_str()); |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
1001 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
|
1002 } |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
1003 } |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
1004 } |
1544
5fba80d924d9
Only log time samples in debug mode
Michael Hendricks <michael@ndrix.org>
parents:
1390
diff
changeset
|
1005 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
|
1006 BOOST_FOREACH(int64 n, vSorted) |
1544
5fba80d924d9
Only log time samples in debug mode
Michael Hendricks <michael@ndrix.org>
parents:
1390
diff
changeset
|
1007 printf("%+"PRI64d" ", n); |
5fba80d924d9
Only log time samples in debug mode
Michael Hendricks <michael@ndrix.org>
parents:
1390
diff
changeset
|
1008 printf("| "); |
5fba80d924d9
Only log time samples in debug mode
Michael Hendricks <michael@ndrix.org>
parents:
1390
diff
changeset
|
1009 } |
5fba80d924d9
Only log time samples in debug mode
Michael Hendricks <michael@ndrix.org>
parents:
1390
diff
changeset
|
1010 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
|
1011 } |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
1012 } |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
1013 |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
1014 |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
1015 |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
1016 |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
1017 |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
1018 |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
1019 |
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 string FormatVersion(int nVersion) |
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 if (nVersion%100 == 0) |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
1024 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
|
1025 else |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
1026 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
|
1027 } |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
1028 |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
1029 string FormatFullVersion() |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
1030 { |
1584
a67f13278e2c
Implement BIP 14 : separate protocol version from client version
Gavin Andresen <gavinandresen@gmail.com>
parents:
1390
diff
changeset
|
1031 string s = FormatVersion(CLIENT_VERSION); |
687
ccaf25d00bd8
FormatFullVersion: build fix related to recent translation improvement
Jeff Garzik <jeff@garzik.org>
parents:
682
diff
changeset
|
1032 if (VERSION_IS_BETA) { |
ccaf25d00bd8
FormatFullVersion: build fix related to recent translation improvement
Jeff Garzik <jeff@garzik.org>
parents:
682
diff
changeset
|
1033 s += "-"; |
ccaf25d00bd8
FormatFullVersion: build fix related to recent translation improvement
Jeff Garzik <jeff@garzik.org>
parents:
682
diff
changeset
|
1034 s += _("beta"); |
ccaf25d00bd8
FormatFullVersion: build fix related to recent translation improvement
Jeff Garzik <jeff@garzik.org>
parents:
682
diff
changeset
|
1035 } |
575
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
1036 return s; |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
1037 } |
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
1038 |
1584
a67f13278e2c
Implement BIP 14 : separate protocol version from client version
Gavin Andresen <gavinandresen@gmail.com>
parents:
1390
diff
changeset
|
1039 // 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
|
1040 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
|
1041 { |
a67f13278e2c
Implement BIP 14 : separate protocol version from client version
Gavin Andresen <gavinandresen@gmail.com>
parents:
1390
diff
changeset
|
1042 std::ostringstream ss; |
a67f13278e2c
Implement BIP 14 : separate protocol version from client version
Gavin Andresen <gavinandresen@gmail.com>
parents:
1390
diff
changeset
|
1043 ss << "/"; |
a67f13278e2c
Implement BIP 14 : separate protocol version from client version
Gavin Andresen <gavinandresen@gmail.com>
parents:
1390
diff
changeset
|
1044 ss << name << ":" << FormatVersion(nClientVersion); |
a67f13278e2c
Implement BIP 14 : separate protocol version from client version
Gavin Andresen <gavinandresen@gmail.com>
parents:
1390
diff
changeset
|
1045 if (!comments.empty()) |
a67f13278e2c
Implement BIP 14 : separate protocol version from client version
Gavin Andresen <gavinandresen@gmail.com>
parents:
1390
diff
changeset
|
1046 ss << "(" << boost::algorithm::join(comments, "; ") << ")"; |
a67f13278e2c
Implement BIP 14 : separate protocol version from client version
Gavin Andresen <gavinandresen@gmail.com>
parents:
1390
diff
changeset
|
1047 ss << "/"; |
a67f13278e2c
Implement BIP 14 : separate protocol version from client version
Gavin Andresen <gavinandresen@gmail.com>
parents:
1390
diff
changeset
|
1048 return ss.str(); |
a67f13278e2c
Implement BIP 14 : separate protocol version from client version
Gavin Andresen <gavinandresen@gmail.com>
parents:
1390
diff
changeset
|
1049 } |
575
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
1050 |
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 |
872
3995c6aea28e
Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks
Gavin Andresen <gavinandresen@gmail.com>
parents:
846
diff
changeset
|
1053 #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
|
1054 // |
3995c6aea28e
Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks
Gavin Andresen <gavinandresen@gmail.com>
parents:
846
diff
changeset
|
1055 // 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
|
1056 // 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
|
1057 // 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
|
1058 // 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
|
1059 // --> 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
|
1060 // 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
|
1061 // 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
|
1062 // 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
|
1063 // |
575
1a0476fe825f
directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff
changeset
|
1064 |
872
3995c6aea28e
Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks
Gavin Andresen <gavinandresen@gmail.com>
parents:
846
diff
changeset
|
1065 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
|
1066 { |
3995c6aea28e
Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks
Gavin Andresen <gavinandresen@gmail.com>
parents:
846
diff
changeset
|
1067 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
|
1068 { |
3995c6aea28e
Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks
Gavin Andresen <gavinandresen@gmail.com>
parents:
846
diff
changeset
|
1069 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
|
1070 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
|
1071 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
|
1072 } |
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
|
1073 |
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
|
1074 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
|
1075 { |
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
|
1076 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
|
1077 } |
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
|
1078 |
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
|
1079 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
|
1080 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
|
1081 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
|
1082 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
|
1083 }; |
3995c6aea28e
Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks
Gavin Andresen <gavinandresen@gmail.com>
parents:
846
diff
changeset
|
1084 |
3995c6aea28e
Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks
Gavin Andresen <gavinandresen@gmail.com>
parents:
846
diff
changeset
|
1085 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
|
1086 |
3995c6aea28e
Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks
Gavin Andresen <gavinandresen@gmail.com>
parents:
846
diff
changeset
|
1087 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
|
1088 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
|
1089 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
|
1090 |
3995c6aea28e
Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks
Gavin Andresen <gavinandresen@gmail.com>
parents:
846
diff
changeset
|
1091 |
891
a3f0b2791d42
Highlight mis-matching locks
Gavin Andresen <gavinandresen@gmail.com>
parents:
872
diff
changeset
|
1092 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
|
1093 { |
3995c6aea28e
Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks
Gavin Andresen <gavinandresen@gmail.com>
parents:
846
diff
changeset
|
1094 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
|
1095 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
|
1096 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
|
1097 { |
891
a3f0b2791d42
Highlight mis-matching locks
Gavin Andresen <gavinandresen@gmail.com>
parents:
872
diff
changeset
|
1098 if (i.first == mismatch.first) printf(" (1)"); |
a3f0b2791d42
Highlight mis-matching locks
Gavin Andresen <gavinandresen@gmail.com>
parents:
872
diff
changeset
|
1099 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
|
1100 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
|
1101 } |
3995c6aea28e
Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks
Gavin Andresen <gavinandresen@gmail.com>
parents:
846
diff
changeset
|
1102 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
|
1103 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
|
1104 { |
891
a3f0b2791d42
Highlight mis-matching locks
Gavin Andresen <gavinandresen@gmail.com>
parents:
872
diff
changeset
|
1105 if (i.first == mismatch.first) printf(" (1)"); |
a3f0b2791d42
Highlight mis-matching locks
Gavin Andresen <gavinandresen@gmail.com>
parents:
872
diff
changeset
|
1106 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
|
1107 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
|
1108 } |
3995c6aea28e
Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks
Gavin Andresen <gavinandresen@gmail.com>
parents:
846
diff
changeset
|
1109 } |
3995c6aea28e
Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks
Gavin Andresen <gavinandresen@gmail.com>
parents:
846
diff
changeset
|
1110 |
3995c6aea28e
Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks
Gavin Andresen <gavinandresen@gmail.com>
parents:
846
diff
changeset
|
1111 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
|
1112 { |
3995c6aea28e
Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks
Gavin Andresen <gavinandresen@gmail.com>
parents:
846
diff
changeset
|
1113 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
|
1114 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
|
1115 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
|
1116 |
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
|
1117 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
|
1118 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
|
1119 |
3995c6aea28e
Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks
Gavin Andresen <gavinandresen@gmail.com>
parents:
846
diff
changeset
|
1120 (*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
|
1121 |
3995c6aea28e
Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks
Gavin Andresen <gavinandresen@gmail.com>
parents:
846
diff
changeset
|
1122 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
|
1123 { |
3995c6aea28e
Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks
Gavin Andresen <gavinandresen@gmail.com>
parents:
846
diff
changeset
|
1124 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
|
1125 |
3995c6aea28e
Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks
Gavin Andresen <gavinandresen@gmail.com>
parents:
846
diff
changeset
|
1126 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
|
1127 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
|
1128 continue; |
3995c6aea28e
Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks
Gavin Andresen <gavinandresen@gmail.com>
parents:
846
diff
changeset
|
1129 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
|
1130 |
3995c6aea28e
Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks
Gavin Andresen <gavinandresen@gmail.com>
parents:
846
diff
changeset
|
1131 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
|
1132 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
|
1133 { |
891
a3f0b2791d42
Highlight mis-matching locks
Gavin Andresen <gavinandresen@gmail.com>
parents:
872
diff
changeset
|
1134 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
|
1135 break; |
3995c6aea28e
Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks
Gavin Andresen <gavinandresen@gmail.com>
parents:
846
diff
changeset
|
1136 } |
3995c6aea28e
Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks
Gavin Andresen <gavinandresen@gmail.com>
parents:
846
diff
changeset
|
1137 } |
3995c6aea28e
Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks
Gavin Andresen <gavinandresen@gmail.com>
parents:
846
diff
changeset
|
1138 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
|
1139 } |
3995c6aea28e
Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks
Gavin Andresen <gavinandresen@gmail.com>
parents:
846
diff
changeset
|
1140 |
3995c6aea28e
Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks
Gavin Andresen <gavinandresen@gmail.com>
parents:
846
diff
changeset
|
1141 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
|
1142 { |
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
|
1143 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
|
1144 { |
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 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
|
1146 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
|
1147 } |
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
|
1148 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
|
1149 (*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
|
1150 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
|
1151 } |
3995c6aea28e
Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks
Gavin Andresen <gavinandresen@gmail.com>
parents:
846
diff
changeset
|
1152 |
3995c6aea28e
Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks
Gavin Andresen <gavinandresen@gmail.com>
parents:
846
diff
changeset
|
1153 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
|
1154 { |
3995c6aea28e
Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks
Gavin Andresen <gavinandresen@gmail.com>
parents:
846
diff
changeset
|
1155 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
|
1156 #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
|
1157 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
|
1158 if (!result) |
c25505b7a486
Add DEBUG_LOCKCONTENTION, to warn each time a thread waits to lock.
Matt Corallo <matt@bluematt.me>
parents:
1752
diff
changeset
|
1159 { |
c25505b7a486
Add DEBUG_LOCKCONTENTION, to warn each time a thread waits to lock.
Matt Corallo <matt@bluematt.me>
parents:
1752
diff
changeset
|
1160 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
|
1161 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
|
1162 mutex.lock(); |
c25505b7a486
Add DEBUG_LOCKCONTENTION, to warn each time a thread waits to lock.
Matt Corallo <matt@bluematt.me>
parents:
1752
diff
changeset
|
1163 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
|
1164 } |
c25505b7a486
Add DEBUG_LOCKCONTENTION, to warn each time a thread waits to lock.
Matt Corallo <matt@bluematt.me>
parents:
1752
diff
changeset
|
1165 #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
|
1166 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
|
1167 #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
|
1168 } |
3995c6aea28e
Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks
Gavin Andresen <gavinandresen@gmail.com>
parents:
846
diff
changeset
|
1169 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
|
1170 { |
3995c6aea28e
Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks
Gavin Andresen <gavinandresen@gmail.com>
parents:
846
diff
changeset
|
1171 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
|
1172 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
|
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 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
|
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 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
|
1177 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
|
1178 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
|
1179 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
|
1180 } |
3995c6aea28e
Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks
Gavin Andresen <gavinandresen@gmail.com>
parents:
846
diff
changeset
|
1181 |
3995c6aea28e
Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks
Gavin Andresen <gavinandresen@gmail.com>
parents:
846
diff
changeset
|
1182 #else |
3995c6aea28e
Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks
Gavin Andresen <gavinandresen@gmail.com>
parents:
846
diff
changeset
|
1183 |
1776
c25505b7a486
Add DEBUG_LOCKCONTENTION, to warn each time a thread waits to lock.
Matt Corallo <matt@bluematt.me>
parents:
1752
diff
changeset
|
1184 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
|
1185 { |
1776
c25505b7a486
Add DEBUG_LOCKCONTENTION, to warn each time a thread waits to lock.
Matt Corallo <matt@bluematt.me>
parents:
1752
diff
changeset
|
1186 #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
|
1187 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
|
1188 if (!result) |
c25505b7a486
Add DEBUG_LOCKCONTENTION, to warn each time a thread waits to lock.
Matt Corallo <matt@bluematt.me>
parents:
1752
diff
changeset
|
1189 { |
c25505b7a486
Add DEBUG_LOCKCONTENTION, to warn each time a thread waits to lock.
Matt Corallo <matt@bluematt.me>
parents:
1752
diff
changeset
|
1190 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
|
1191 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
|
1192 mutex.lock(); |
c25505b7a486
Add DEBUG_LOCKCONTENTION, to warn each time a thread waits to lock.
Matt Corallo <matt@bluematt.me>
parents:
1752
diff
changeset
|
1193 } |
c25505b7a486
Add DEBUG_LOCKCONTENTION, to warn each time a thread waits to lock.
Matt Corallo <matt@bluematt.me>
parents:
1752
diff
changeset
|
1194 #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
|
1195 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
|
1196 #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
|
1197 } |
3995c6aea28e
Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks
Gavin Andresen <gavinandresen@gmail.com>
parents:
846
diff
changeset
|
1198 |
3995c6aea28e
Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks
Gavin Andresen <gavinandresen@gmail.com>
parents:
846
diff
changeset
|
1199 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
|
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 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 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
|
1205 { |
3995c6aea28e
Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks
Gavin Andresen <gavinandresen@gmail.com>
parents:
846
diff
changeset
|
1206 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
|
1207 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
|
1208 } |
3995c6aea28e
Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks
Gavin Andresen <gavinandresen@gmail.com>
parents:
846
diff
changeset
|
1209 |
3995c6aea28e
Compile with DEBUG_LOCKORDER to detect inconsistent lock orderings that can cause deadlocks
Gavin Andresen <gavinandresen@gmail.com>
parents:
846
diff
changeset
|
1210 #endif /* DEBUG_LOCKORDER */ |
1731
4a2d4c136998
Network stack refactor
Pieter Wuille <pieter.wuille@gmail.com>
parents:
1644
diff
changeset
|
1211 |