Mercurial > hg > bitcoin

annotate src/db.cpp @ 2635:c8269e1811c5 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Further CDBEnv encapsulation work.
author Jeff Garzik <jgarzik@exmulti.com>
date Fri, 18 May 2012 02:49:50 -0400
parents a558beaa5c57
children 967a37af0b50
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
575
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
1 // Copyright (c) 2009-2010 Satoshi Nakamoto
1818
20667468f95b Update all copyrights to 2012
Gavin Andresen <gavinandresen@gmail.com>
parents: 1813
diff changeset
2 // Copyright (c) 2009-2012 The Bitcoin developers
575
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
3 // Distributed under the MIT/X11 software license, see the accompanying
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
4 // file license.txt or http://www.opensource.org/licenses/mit-license.php.
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
5
605
1ae81ad9b0e5 Only include db.h when we have to.
Jordan Lewis <jordanthelewis@gmail.com>
parents: 595
diff changeset
6 #include "db.h"
2274
f2eba0cb504a Remove headers.h
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2246
diff changeset
7 #include "util.h"
f2eba0cb504a Remove headers.h
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2246
diff changeset
8 #include "main.h"
1840
0760e07f7938 Added 'Backup Wallet' menu option
sje397 <sje397@gmail.com>
parents: 1818
diff changeset
9 #include <boost/version.hpp>
695
9609c7af94ba Fix missing includes needed for Boost 1.46.
Shane Wegner <shane-github@csy.ca>
parents: 690
diff changeset
10 #include <boost/filesystem.hpp>
611
503d51554676 Only include certain boost headers if necessary.
Jordan Lewis <jordanthelewis@gmail.com>
parents: 607
diff changeset
11 #include <boost/filesystem/fstream.hpp>
575
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
12
2274
f2eba0cb504a Remove headers.h
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2246
diff changeset
13 #ifndef WIN32
f2eba0cb504a Remove headers.h
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2246
diff changeset
14 #include "sys/stat.h"
f2eba0cb504a Remove headers.h
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2246
diff changeset
15 #endif
f2eba0cb504a Remove headers.h
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2246
diff changeset
16
595
e630bbb11629 make bitcoin include files more modular
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 576
diff changeset
17 using namespace std;
e630bbb11629 make bitcoin include files more modular
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 576
diff changeset
18 using namespace boost;
e630bbb11629 make bitcoin include files more modular
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 576
diff changeset
19
575
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
20
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
21 unsigned int nWalletDBUpdated;
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
22
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
23
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
24
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
25 //
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
26 // CDB
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
27 //
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
28
2631
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
29 CDBEnv bitdb;
575
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
30
2631
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
31 void CDBEnv::EnvShutdown()
1501
26d0f350347a Obsolete keypool and make sure database removes log files on shutdown.
Gavin Andresen <gavinandresen@gmail.com>
parents: 1500
diff changeset
32 {
26d0f350347a Obsolete keypool and make sure database removes log files on shutdown.
Gavin Andresen <gavinandresen@gmail.com>
parents: 1500
diff changeset
33 if (!fDbEnvInit)
26d0f350347a Obsolete keypool and make sure database removes log files on shutdown.
Gavin Andresen <gavinandresen@gmail.com>
parents: 1500
diff changeset
34 return;
26d0f350347a Obsolete keypool and make sure database removes log files on shutdown.
Gavin Andresen <gavinandresen@gmail.com>
parents: 1500
diff changeset
35
26d0f350347a Obsolete keypool and make sure database removes log files on shutdown.
Gavin Andresen <gavinandresen@gmail.com>
parents: 1500
diff changeset
36 fDbEnvInit = false;
1505
d54fc7452031 Fix crash-on-osx-on-shutdown bug. And cleanup CDB handling in Rewrite.
Gavin Andresen <gavinandresen@gmail.com>
parents: 1504
diff changeset
37 try
d54fc7452031 Fix crash-on-osx-on-shutdown bug. And cleanup CDB handling in Rewrite.
Gavin Andresen <gavinandresen@gmail.com>
parents: 1504
diff changeset
38 {
d54fc7452031 Fix crash-on-osx-on-shutdown bug. And cleanup CDB handling in Rewrite.
Gavin Andresen <gavinandresen@gmail.com>
parents: 1504
diff changeset
39 dbenv.close(0);
d54fc7452031 Fix crash-on-osx-on-shutdown bug. And cleanup CDB handling in Rewrite.
Gavin Andresen <gavinandresen@gmail.com>
parents: 1504
diff changeset
40 }
d54fc7452031 Fix crash-on-osx-on-shutdown bug. And cleanup CDB handling in Rewrite.
Gavin Andresen <gavinandresen@gmail.com>
parents: 1504
diff changeset
41 catch (const DbException& e)
d54fc7452031 Fix crash-on-osx-on-shutdown bug. And cleanup CDB handling in Rewrite.
Gavin Andresen <gavinandresen@gmail.com>
parents: 1504
diff changeset
42 {
d54fc7452031 Fix crash-on-osx-on-shutdown bug. And cleanup CDB handling in Rewrite.
Gavin Andresen <gavinandresen@gmail.com>
parents: 1504
diff changeset
43 printf("EnvShutdown exception: %s (%d)\n", e.what(), e.get_errno());
d54fc7452031 Fix crash-on-osx-on-shutdown bug. And cleanup CDB handling in Rewrite.
Gavin Andresen <gavinandresen@gmail.com>
parents: 1504
diff changeset
44 }
2207
34d7dc611b26 Use filesystem::path instead of manual string tinkering
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2205
diff changeset
45 DbEnv(0).remove(GetDataDir().string().c_str(), 0);
1501
26d0f350347a Obsolete keypool and make sure database removes log files on shutdown.
Gavin Andresen <gavinandresen@gmail.com>
parents: 1500
diff changeset
46 }
26d0f350347a Obsolete keypool and make sure database removes log files on shutdown.
Gavin Andresen <gavinandresen@gmail.com>
parents: 1500
diff changeset
47
2631
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
48 CDBEnv::CDBEnv() : dbenv(0)
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
49 {
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
50 }
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
51
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
52 CDBEnv::~CDBEnv()
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
53 {
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
54 EnvShutdown();
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
55 }
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
56
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
57 void CDBEnv::Close()
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
58 {
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
59 EnvShutdown();
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
60 }
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
61
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
62 bool CDBEnv::Open(boost::filesystem::path pathEnv_)
575
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
63 {
2631
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
64 if (fDbEnvInit)
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
65 return true;
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
66
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
67 if (fShutdown)
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
68 return false;
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
69
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
70 pathEnv = pathEnv_;
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
71 filesystem::path pathDataDir = pathEnv;
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
72 filesystem::path pathLogDir = pathDataDir / "database";
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
73 filesystem::create_directory(pathLogDir);
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
74 filesystem::path pathErrorFile = pathDataDir / "db.log";
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
75 printf("dbenv.open LogDir=%s ErrorFile=%s\n", pathLogDir.string().c_str(), pathErrorFile.string().c_str());
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
76
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
77 int nDbCache = GetArg("-dbcache", 25);
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
78 dbenv.set_lg_dir(pathLogDir.string().c_str());
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
79 dbenv.set_cachesize(nDbCache / 1024, (nDbCache % 1024)*1048576, 1);
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
80 dbenv.set_lg_bsize(1048576);
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
81 dbenv.set_lg_max(10485760);
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
82 dbenv.set_lk_max_locks(10000);
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
83 dbenv.set_lk_max_objects(10000);
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
84 dbenv.set_errfile(fopen(pathErrorFile.string().c_str(), "a")); /// debug
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
85 dbenv.set_flags(DB_AUTO_COMMIT, 1);
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
86 dbenv.set_flags(DB_TXN_WRITE_NOSYNC, 1);
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
87 dbenv.log_set_config(DB_LOG_AUTO_REMOVE, 1);
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
88 int ret = dbenv.open(pathDataDir.string().c_str(),
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
89 DB_CREATE |
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
90 DB_INIT_LOCK |
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
91 DB_INIT_LOG |
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
92 DB_INIT_MPOOL |
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
93 DB_INIT_TXN |
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
94 DB_THREAD |
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
95 DB_RECOVER,
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
96 S_IRUSR | S_IWUSR);
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
97 if (ret > 0)
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
98 return error("CDB() : error %d opening database environment", ret);
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
99
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
100 fDbEnvInit = true;
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
101 return true;
575
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
102 }
2631
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
103
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
104 void CDBEnv::CheckpointLSN(std::string strFile)
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
105 {
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
106 dbenv.txn_checkpoint(0, 0, 0);
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
107 dbenv.lsn_reset(strFile.c_str(), 0);
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
108 }
575
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
109
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
110
2634
a558beaa5c57 CDB::CDB: properly initialize activeTxn to NULL
Jeff Garzik <jgarzik@exmulti.com>
parents: 2633
diff changeset
111 CDB::CDB(const char *pszFile, const char* pszMode) :
a558beaa5c57 CDB::CDB: properly initialize activeTxn to NULL
Jeff Garzik <jgarzik@exmulti.com>
parents: 2633
diff changeset
112 pdb(NULL), activeTxn(NULL)
575
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
113 {
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
114 int ret;
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
115 if (pszFile == NULL)
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
116 return;
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
117
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
118 fReadOnly = (!strchr(pszMode, '+') && !strchr(pszMode, 'w'));
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
119 bool fCreate = strchr(pszMode, 'c');
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
120 unsigned int nFlags = DB_THREAD;
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
121 if (fCreate)
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
122 nFlags |= DB_CREATE;
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
123
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
124 {
2631
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
125 LOCK(bitdb.cs_db);
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
126 if (!bitdb.Open(GetDataDir()))
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
127 throw runtime_error("env open failed");
575
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
128
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
129 strFile = pszFile;
2635
c8269e1811c5 Further CDBEnv encapsulation work.
Jeff Garzik <jgarzik@exmulti.com>
parents: 2634
diff changeset
130 ++bitdb.mapFileUseCount[strFile];
c8269e1811c5 Further CDBEnv encapsulation work.
Jeff Garzik <jgarzik@exmulti.com>
parents: 2634
diff changeset
131 pdb = bitdb.mapDb[strFile];
575
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
132 if (pdb == NULL)
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
133 {
2631
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
134 pdb = new Db(&bitdb.dbenv, 0);
575
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
135
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
136 ret = pdb->open(NULL, // Txn pointer
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
137 pszFile, // Filename
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
138 "main", // Logical db name
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
139 DB_BTREE, // Database type
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
140 nFlags, // Flags
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
141 0);
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 if (ret > 0)
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
144 {
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
145 delete pdb;
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
146 pdb = NULL;
2190
60fe81a4849b Use scoped locks instead of CRITICAL_BLOCK
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2176
diff changeset
147 {
2631
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
148 LOCK(bitdb.cs_db);
2635
c8269e1811c5 Further CDBEnv encapsulation work.
Jeff Garzik <jgarzik@exmulti.com>
parents: 2634
diff changeset
149 --bitdb.mapFileUseCount[strFile];
2190
60fe81a4849b Use scoped locks instead of CRITICAL_BLOCK
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2176
diff changeset
150 }
575
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
151 strFile = "";
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
152 throw runtime_error(strprintf("CDB() : can't open database file %s, error %d", pszFile, ret));
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 if (fCreate && !Exists(string("version")))
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 bool fTmp = fReadOnly;
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
158 fReadOnly = false;
1584
a67f13278e2c Implement BIP 14 : separate protocol version from client version
Gavin Andresen <gavinandresen@gmail.com>
parents: 1511
diff changeset
159 WriteVersion(CLIENT_VERSION);
575
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
160 fReadOnly = fTmp;
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
161 }
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
162
2635
c8269e1811c5 Further CDBEnv encapsulation work.
Jeff Garzik <jgarzik@exmulti.com>
parents: 2634
diff changeset
163 bitdb.mapDb[strFile] = pdb;
575
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
164 }
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
165 }
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
166 }
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
167
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
168 void CDB::Close()
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 if (!pdb)
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
171 return;
2633
a7a1bf716c1a Remove unused nested BDB transaction support
Jeff Garzik <jgarzik@exmulti.com>
parents: 2631
diff changeset
172 if (activeTxn)
a7a1bf716c1a Remove unused nested BDB transaction support
Jeff Garzik <jgarzik@exmulti.com>
parents: 2631
diff changeset
173 activeTxn->abort();
a7a1bf716c1a Remove unused nested BDB transaction support
Jeff Garzik <jgarzik@exmulti.com>
parents: 2631
diff changeset
174 activeTxn = NULL;
575
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
175 pdb = NULL;
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 // Flush database activity from memory pool to disk log
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
178 unsigned int nMinutes = 0;
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
179 if (fReadOnly)
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
180 nMinutes = 1;
2263
c8bc276d36eb Reduce sync frequency for blkindex.dat
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2246
diff changeset
181 if (strFile == "blkindex.dat")
c8bc276d36eb Reduce sync frequency for blkindex.dat
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2246
diff changeset
182 nMinutes = 2;
2116
94844608a7d7 Use transactions-updated as flush condition
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2114
diff changeset
183 if (strFile == "blkindex.dat" && IsInitialBlockDownload())
94844608a7d7 Use transactions-updated as flush condition
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2114
diff changeset
184 nMinutes = 5;
94844608a7d7 Use transactions-updated as flush condition
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2114
diff changeset
185
2631
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
186 bitdb.dbenv.txn_checkpoint(nMinutes ? GetArg("-dblogsize", 100)*1024 : 0, nMinutes, 0);
575
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
187
2190
60fe81a4849b Use scoped locks instead of CRITICAL_BLOCK
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2176
diff changeset
188 {
2631
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
189 LOCK(bitdb.cs_db);
2635
c8269e1811c5 Further CDBEnv encapsulation work.
Jeff Garzik <jgarzik@exmulti.com>
parents: 2634
diff changeset
190 --bitdb.mapFileUseCount[strFile];
2190
60fe81a4849b Use scoped locks instead of CRITICAL_BLOCK
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2176
diff changeset
191 }
575
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
192 }
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
193
2635
c8269e1811c5 Further CDBEnv encapsulation work.
Jeff Garzik <jgarzik@exmulti.com>
parents: 2634
diff changeset
194 void CDBEnv::CloseDb(const string& strFile)
575
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
195 {
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
196 {
2635
c8269e1811c5 Further CDBEnv encapsulation work.
Jeff Garzik <jgarzik@exmulti.com>
parents: 2634
diff changeset
197 LOCK(cs_db);
575
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
198 if (mapDb[strFile] != NULL)
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 // Close the database handle
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
201 Db* pdb = mapDb[strFile];
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
202 pdb->close(0);
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
203 delete pdb;
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
204 mapDb[strFile] = NULL;
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
205 }
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 }
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
208
1501
26d0f350347a Obsolete keypool and make sure database removes log files on shutdown.
Gavin Andresen <gavinandresen@gmail.com>
parents: 1500
diff changeset
209 bool CDB::Rewrite(const string& strFile, const char* pszSkip)
1500
7d93eeefa5ea Resilvering
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1390
diff changeset
210 {
7d93eeefa5ea Resilvering
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1390
diff changeset
211 while (!fShutdown)
7d93eeefa5ea Resilvering
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1390
diff changeset
212 {
7d93eeefa5ea Resilvering
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1390
diff changeset
213 {
2631
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
214 LOCK(bitdb.cs_db);
2635
c8269e1811c5 Further CDBEnv encapsulation work.
Jeff Garzik <jgarzik@exmulti.com>
parents: 2634
diff changeset
215 if (!bitdb.mapFileUseCount.count(strFile) || bitdb.mapFileUseCount[strFile] == 0)
1500
7d93eeefa5ea Resilvering
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1390
diff changeset
216 {
7d93eeefa5ea Resilvering
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1390
diff changeset
217 // Flush log data to the dat file
2635
c8269e1811c5 Further CDBEnv encapsulation work.
Jeff Garzik <jgarzik@exmulti.com>
parents: 2634
diff changeset
218 bitdb.CloseDb(strFile);
2631
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
219 bitdb.CheckpointLSN(strFile);
2635
c8269e1811c5 Further CDBEnv encapsulation work.
Jeff Garzik <jgarzik@exmulti.com>
parents: 2634
diff changeset
220 bitdb.mapFileUseCount.erase(strFile);
1500
7d93eeefa5ea Resilvering
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1390
diff changeset
221
7d93eeefa5ea Resilvering
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1390
diff changeset
222 bool fSuccess = true;
1501
26d0f350347a Obsolete keypool and make sure database removes log files on shutdown.
Gavin Andresen <gavinandresen@gmail.com>
parents: 1500
diff changeset
223 printf("Rewriting %s...\n", strFile.c_str());
26d0f350347a Obsolete keypool and make sure database removes log files on shutdown.
Gavin Andresen <gavinandresen@gmail.com>
parents: 1500
diff changeset
224 string strFileRes = strFile + ".rewrite";
1511
bdff5864eff3 close old db when rewriting
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1510
diff changeset
225 { // surround usage of db with extra {}
bdff5864eff3 close old db when rewriting
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1510
diff changeset
226 CDB db(strFile.c_str(), "r");
2631
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
227 Db* pdbCopy = new Db(&bitdb.dbenv, 0);
1511
bdff5864eff3 close old db when rewriting
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1510
diff changeset
228
bdff5864eff3 close old db when rewriting
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1510
diff changeset
229 int ret = pdbCopy->open(NULL, // Txn pointer
bdff5864eff3 close old db when rewriting
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1510
diff changeset
230 strFileRes.c_str(), // Filename
bdff5864eff3 close old db when rewriting
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1510
diff changeset
231 "main", // Logical db name
bdff5864eff3 close old db when rewriting
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1510
diff changeset
232 DB_BTREE, // Database type
bdff5864eff3 close old db when rewriting
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1510
diff changeset
233 DB_CREATE, // Flags
bdff5864eff3 close old db when rewriting
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1510
diff changeset
234 0);
bdff5864eff3 close old db when rewriting
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1510
diff changeset
235 if (ret > 0)
1500
7d93eeefa5ea Resilvering
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1390
diff changeset
236 {
1511
bdff5864eff3 close old db when rewriting
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1510
diff changeset
237 printf("Cannot create database file %s\n", strFileRes.c_str());
bdff5864eff3 close old db when rewriting
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1510
diff changeset
238 fSuccess = false;
bdff5864eff3 close old db when rewriting
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1510
diff changeset
239 }
bdff5864eff3 close old db when rewriting
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1510
diff changeset
240
bdff5864eff3 close old db when rewriting
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1510
diff changeset
241 Dbc* pcursor = db.GetCursor();
bdff5864eff3 close old db when rewriting
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1510
diff changeset
242 if (pcursor)
bdff5864eff3 close old db when rewriting
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1510
diff changeset
243 while (fSuccess)
1505
d54fc7452031 Fix crash-on-osx-on-shutdown bug. And cleanup CDB handling in Rewrite.
Gavin Andresen <gavinandresen@gmail.com>
parents: 1504
diff changeset
244 {
2277
0dcf927bc6b2 Further reduce header dependencies
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2275
diff changeset
245 CDataStream ssKey(SER_DISK, CLIENT_VERSION);
0dcf927bc6b2 Further reduce header dependencies
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2275
diff changeset
246 CDataStream ssValue(SER_DISK, CLIENT_VERSION);
1511
bdff5864eff3 close old db when rewriting
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1510
diff changeset
247 int ret = db.ReadAtCursor(pcursor, ssKey, ssValue, DB_NEXT);
bdff5864eff3 close old db when rewriting
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1510
diff changeset
248 if (ret == DB_NOTFOUND)
bdff5864eff3 close old db when rewriting
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1510
diff changeset
249 {
bdff5864eff3 close old db when rewriting
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1510
diff changeset
250 pcursor->close();
bdff5864eff3 close old db when rewriting
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1510
diff changeset
251 break;
bdff5864eff3 close old db when rewriting
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1510
diff changeset
252 }
bdff5864eff3 close old db when rewriting
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1510
diff changeset
253 else if (ret != 0)
bdff5864eff3 close old db when rewriting
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1510
diff changeset
254 {
bdff5864eff3 close old db when rewriting
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1510
diff changeset
255 pcursor->close();
bdff5864eff3 close old db when rewriting
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1510
diff changeset
256 fSuccess = false;
bdff5864eff3 close old db when rewriting
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1510
diff changeset
257 break;
bdff5864eff3 close old db when rewriting
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1510
diff changeset
258 }
bdff5864eff3 close old db when rewriting
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1510
diff changeset
259 if (pszSkip &&
bdff5864eff3 close old db when rewriting
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1510
diff changeset
260 strncmp(&ssKey[0], pszSkip, std::min(ssKey.size(), strlen(pszSkip))) == 0)
bdff5864eff3 close old db when rewriting
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1510
diff changeset
261 continue;
bdff5864eff3 close old db when rewriting
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1510
diff changeset
262 if (strncmp(&ssKey[0], "\x07version", 8) == 0)
bdff5864eff3 close old db when rewriting
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1510
diff changeset
263 {
bdff5864eff3 close old db when rewriting
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1510
diff changeset
264 // Update version:
bdff5864eff3 close old db when rewriting
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1510
diff changeset
265 ssValue.clear();
1584
a67f13278e2c Implement BIP 14 : separate protocol version from client version
Gavin Andresen <gavinandresen@gmail.com>
parents: 1511
diff changeset
266 ssValue << CLIENT_VERSION;
1511
bdff5864eff3 close old db when rewriting
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1510
diff changeset
267 }
bdff5864eff3 close old db when rewriting
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1510
diff changeset
268 Dbt datKey(&ssKey[0], ssKey.size());
bdff5864eff3 close old db when rewriting
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1510
diff changeset
269 Dbt datValue(&ssValue[0], ssValue.size());
bdff5864eff3 close old db when rewriting
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1510
diff changeset
270 int ret2 = pdbCopy->put(NULL, &datKey, &datValue, DB_NOOVERWRITE);
bdff5864eff3 close old db when rewriting
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1510
diff changeset
271 if (ret2 > 0)
bdff5864eff3 close old db when rewriting
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1510
diff changeset
272 fSuccess = false;
1505
d54fc7452031 Fix crash-on-osx-on-shutdown bug. And cleanup CDB handling in Rewrite.
Gavin Andresen <gavinandresen@gmail.com>
parents: 1504
diff changeset
273 }
1511
bdff5864eff3 close old db when rewriting
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1510
diff changeset
274 if (fSuccess)
bdff5864eff3 close old db when rewriting
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1510
diff changeset
275 {
bdff5864eff3 close old db when rewriting
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1510
diff changeset
276 db.Close();
2635
c8269e1811c5 Further CDBEnv encapsulation work.
Jeff Garzik <jgarzik@exmulti.com>
parents: 2634
diff changeset
277 bitdb.CloseDb(strFile);
1511
bdff5864eff3 close old db when rewriting
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1510
diff changeset
278 if (pdbCopy->close(0))
1500
7d93eeefa5ea Resilvering
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1390
diff changeset
279 fSuccess = false;
1511
bdff5864eff3 close old db when rewriting
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1510
diff changeset
280 delete pdbCopy;
1500
7d93eeefa5ea Resilvering
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1390
diff changeset
281 }
7d93eeefa5ea Resilvering
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1390
diff changeset
282 }
7d93eeefa5ea Resilvering
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1390
diff changeset
283 if (fSuccess)
7d93eeefa5ea Resilvering
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1390
diff changeset
284 {
2631
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
285 Db dbA(&bitdb.dbenv, 0);
1500
7d93eeefa5ea Resilvering
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1390
diff changeset
286 if (dbA.remove(strFile.c_str(), NULL, 0))
7d93eeefa5ea Resilvering
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1390
diff changeset
287 fSuccess = false;
2631
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
288 Db dbB(&bitdb.dbenv, 0);
1500
7d93eeefa5ea Resilvering
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1390
diff changeset
289 if (dbB.rename(strFileRes.c_str(), NULL, strFile.c_str(), 0))
7d93eeefa5ea Resilvering
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1390
diff changeset
290 fSuccess = false;
7d93eeefa5ea Resilvering
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1390
diff changeset
291 }
7d93eeefa5ea Resilvering
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1390
diff changeset
292 if (!fSuccess)
1501
26d0f350347a Obsolete keypool and make sure database removes log files on shutdown.
Gavin Andresen <gavinandresen@gmail.com>
parents: 1500
diff changeset
293 printf("Rewriting of %s FAILED!\n", strFileRes.c_str());
1500
7d93eeefa5ea Resilvering
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1390
diff changeset
294 return fSuccess;
7d93eeefa5ea Resilvering
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1390
diff changeset
295 }
7d93eeefa5ea Resilvering
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1390
diff changeset
296 }
7d93eeefa5ea Resilvering
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1390
diff changeset
297 Sleep(100);
7d93eeefa5ea Resilvering
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1390
diff changeset
298 }
7d93eeefa5ea Resilvering
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1390
diff changeset
299 return false;
7d93eeefa5ea Resilvering
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1390
diff changeset
300 }
7d93eeefa5ea Resilvering
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1390
diff changeset
301
7d93eeefa5ea Resilvering
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1390
diff changeset
302
2631
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
303 void CDBEnv::Flush(bool fShutdown)
575
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
304 {
2598
d1152dd63333 Report how long DBFlush took.
R E Broadley <rebroad+github@gmail.com>
parents: 2581
diff changeset
305 int64 nStart = GetTimeMillis();
575
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
306 // Flush log data to the actual data file
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
307 // on all files that are not in use
2631
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
308 printf("Flush(%s)%s\n", fShutdown ? "true" : "false", fDbEnvInit ? "" : " db not started");
575
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
309 if (!fDbEnvInit)
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
310 return;
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
311 {
2190
60fe81a4849b Use scoped locks instead of CRITICAL_BLOCK
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2176
diff changeset
312 LOCK(cs_db);
575
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
313 map<string, int>::iterator mi = mapFileUseCount.begin();
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
314 while (mi != mapFileUseCount.end())
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
315 {
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
316 string strFile = (*mi).first;
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
317 int nRefCount = (*mi).second;
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
318 printf("%s refcount=%d\n", strFile.c_str(), nRefCount);
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
319 if (nRefCount == 0)
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 // Move log data to the dat file
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
322 CloseDb(strFile);
2317
2d4c7d77f691 Make lsn_reset ("detach databases") optional and off by default.
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2313
diff changeset
323 printf("%s checkpoint\n", strFile.c_str());
575
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
324 dbenv.txn_checkpoint(0, 0, 0);
2578
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
325 if (strFile != "blkindex.dat" || fDetachDB) {
2317
2d4c7d77f691 Make lsn_reset ("detach databases") optional and off by default.
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2313
diff changeset
326 printf("%s detach\n", strFile.c_str());
2d4c7d77f691 Make lsn_reset ("detach databases") optional and off by default.
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2313
diff changeset
327 dbenv.lsn_reset(strFile.c_str(), 0);
2d4c7d77f691 Make lsn_reset ("detach databases") optional and off by default.
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2313
diff changeset
328 }
2d4c7d77f691 Make lsn_reset ("detach databases") optional and off by default.
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2313
diff changeset
329 printf("%s closed\n", strFile.c_str());
575
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
330 mapFileUseCount.erase(mi++);
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 else
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
333 mi++;
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
334 }
2598
d1152dd63333 Report how long DBFlush took.
R E Broadley <rebroad+github@gmail.com>
parents: 2581
diff changeset
335 printf("DBFlush(%s)%s ended %15"PRI64d"ms\n", fShutdown ? "true" : "false", fDbEnvInit ? "" : " db not started", GetTimeMillis() - nStart);
575
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
336 if (fShutdown)
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
337 {
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
338 char** listp;
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
339 if (mapFileUseCount.empty())
1501
26d0f350347a Obsolete keypool and make sure database removes log files on shutdown.
Gavin Andresen <gavinandresen@gmail.com>
parents: 1500
diff changeset
340 {
575
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
341 dbenv.log_archive(&listp, DB_ARCH_REMOVE);
2631
04775a4029eb Encapsulate BDB environment inside new CDBEnv class
Jeff Garzik <jgarzik@exmulti.com>
parents: 2623
diff changeset
342 Close();
1501
26d0f350347a Obsolete keypool and make sure database removes log files on shutdown.
Gavin Andresen <gavinandresen@gmail.com>
parents: 1500
diff changeset
343 }
575
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
344 }
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
345 }
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
346 }
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
347
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
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
350
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
351
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
352
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
353 //
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
354 // CTxDB
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
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
357 bool CTxDB::ReadTxIndex(uint256 hash, CTxIndex& txindex)
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 assert(!fClient);
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
360 txindex.SetNull();
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
361 return Read(make_pair(string("tx"), hash), txindex);
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
362 }
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 bool CTxDB::UpdateTxIndex(uint256 hash, const CTxIndex& txindex)
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
365 {
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
366 assert(!fClient);
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
367 return Write(make_pair(string("tx"), hash), txindex);
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
368 }
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
369
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
370 bool CTxDB::AddTxIndex(const CTransaction& tx, const CDiskTxPos& pos, int nHeight)
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
371 {
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
372 assert(!fClient);
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
373
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
374 // Add to tx index
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
375 uint256 hash = tx.GetHash();
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
376 CTxIndex txindex(pos, tx.vout.size());
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
377 return Write(make_pair(string("tx"), hash), txindex);
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
378 }
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 bool CTxDB::EraseTxIndex(const CTransaction& tx)
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 assert(!fClient);
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
383 uint256 hash = tx.GetHash();
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
384
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
385 return Erase(make_pair(string("tx"), hash));
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
386 }
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 bool CTxDB::ContainsTx(uint256 hash)
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
389 {
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
390 assert(!fClient);
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
391 return Exists(make_pair(string("tx"), hash));
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
392 }
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
393
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
394 bool CTxDB::ReadOwnerTxes(uint160 hash160, int nMinHeight, vector<CTransaction>& vtx)
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
395 {
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
396 assert(!fClient);
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
397 vtx.clear();
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
398
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
399 // Get cursor
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
400 Dbc* pcursor = GetCursor();
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
401 if (!pcursor)
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
402 return false;
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
403
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
404 unsigned int fFlags = DB_SET_RANGE;
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
405 loop
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
406 {
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
407 // Read next record
2277
0dcf927bc6b2 Further reduce header dependencies
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2275
diff changeset
408 CDataStream ssKey(SER_DISK, CLIENT_VERSION);
575
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
409 if (fFlags == DB_SET_RANGE)
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
410 ssKey << string("owner") << hash160 << CDiskTxPos(0, 0, 0);
2277
0dcf927bc6b2 Further reduce header dependencies
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2275
diff changeset
411 CDataStream ssValue(SER_DISK, CLIENT_VERSION);
575
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
412 int ret = ReadAtCursor(pcursor, ssKey, ssValue, fFlags);
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
413 fFlags = DB_NEXT;
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
414 if (ret == DB_NOTFOUND)
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
415 break;
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
416 else if (ret != 0)
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
417 {
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
418 pcursor->close();
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
419 return false;
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
420 }
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
421
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
422 // Unserialize
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
423 string strType;
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
424 uint160 hashItem;
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
425 CDiskTxPos pos;
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
426 ssKey >> strType >> hashItem >> pos;
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
427 int nItemHeight;
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
428 ssValue >> nItemHeight;
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
429
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
430 // Read transaction
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
431 if (strType != "owner" || hashItem != hash160)
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
432 break;
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
433 if (nItemHeight >= nMinHeight)
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
434 {
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
435 vtx.resize(vtx.size()+1);
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
436 if (!vtx.back().ReadFromDisk(pos))
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
437 {
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
438 pcursor->close();
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
439 return false;
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
440 }
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
441 }
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
442 }
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
443
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
444 pcursor->close();
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
445 return true;
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
446 }
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
447
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
448 bool CTxDB::ReadDiskTx(uint256 hash, CTransaction& tx, CTxIndex& txindex)
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
449 {
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
450 assert(!fClient);
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
451 tx.SetNull();
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
452 if (!ReadTxIndex(hash, txindex))
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
453 return false;
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
454 return (tx.ReadFromDisk(txindex.pos));
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 bool CTxDB::ReadDiskTx(uint256 hash, CTransaction& tx)
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 CTxIndex txindex;
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
460 return ReadDiskTx(hash, tx, txindex);
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
461 }
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 bool CTxDB::ReadDiskTx(COutPoint outpoint, CTransaction& tx, CTxIndex& txindex)
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
464 {
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
465 return ReadDiskTx(outpoint.hash, tx, txindex);
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
466 }
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 bool CTxDB::ReadDiskTx(COutPoint outpoint, CTransaction& tx)
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
469 {
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
470 CTxIndex txindex;
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
471 return ReadDiskTx(outpoint.hash, tx, txindex);
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
472 }
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
473
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
474 bool CTxDB::WriteBlockIndex(const CDiskBlockIndex& blockindex)
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
475 {
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
476 return Write(make_pair(string("blockindex"), blockindex.GetBlockHash()), blockindex);
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
477 }
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
478
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
479 bool CTxDB::ReadHashBestChain(uint256& hashBestChain)
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 return Read(string("hashBestChain"), hashBestChain);
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
482 }
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
483
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
484 bool CTxDB::WriteHashBestChain(uint256 hashBestChain)
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
485 {
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
486 return Write(string("hashBestChain"), hashBestChain);
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
487 }
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
488
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
489 bool CTxDB::ReadBestInvalidWork(CBigNum& bnBestInvalidWork)
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
490 {
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
491 return Read(string("bnBestInvalidWork"), bnBestInvalidWork);
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
492 }
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
493
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
494 bool CTxDB::WriteBestInvalidWork(CBigNum bnBestInvalidWork)
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
495 {
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
496 return Write(string("bnBestInvalidWork"), bnBestInvalidWork);
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
497 }
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
498
690
389b559a397f CWallet class
Pieter Wuille <pieter.wuille@gmail.com>
parents: 689
diff changeset
499 CBlockIndex static * InsertBlockIndex(uint256 hash)
575
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
500 {
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
501 if (hash == 0)
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
502 return NULL;
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
503
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
504 // Return existing
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
505 map<uint256, CBlockIndex*>::iterator mi = mapBlockIndex.find(hash);
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
506 if (mi != mapBlockIndex.end())
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
507 return (*mi).second;
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
508
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
509 // Create new
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
510 CBlockIndex* pindexNew = new CBlockIndex();
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
511 if (!pindexNew)
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
512 throw runtime_error("LoadBlockIndex() : new CBlockIndex failed");
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
513 mi = mapBlockIndex.insert(make_pair(hash, pindexNew)).first;
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
514 pindexNew->phashBlock = &((*mi).first);
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
515
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
516 return pindexNew;
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
517 }
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
518
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
519 bool CTxDB::LoadBlockIndex()
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
520 {
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
521 // Get database cursor
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
522 Dbc* pcursor = GetCursor();
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
523 if (!pcursor)
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
524 return false;
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
525
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
526 // Load mapBlockIndex
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
527 unsigned int fFlags = DB_SET_RANGE;
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
528 loop
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
529 {
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
530 // Read next record
2277
0dcf927bc6b2 Further reduce header dependencies
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2275
diff changeset
531 CDataStream ssKey(SER_DISK, CLIENT_VERSION);
575
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
532 if (fFlags == DB_SET_RANGE)
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
533 ssKey << make_pair(string("blockindex"), uint256(0));
2277
0dcf927bc6b2 Further reduce header dependencies
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2275
diff changeset
534 CDataStream ssValue(SER_DISK, CLIENT_VERSION);
575
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
535 int ret = ReadAtCursor(pcursor, ssKey, ssValue, fFlags);
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
536 fFlags = DB_NEXT;
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
537 if (ret == DB_NOTFOUND)
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
538 break;
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
539 else if (ret != 0)
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
540 return false;
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
541
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
542 // Unserialize
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
543 string strType;
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
544 ssKey >> strType;
2287
ccef6e0f4b0a Added ability to respond to signals during Block Loading stage.
R E Broadley <rebroad+github@gmail.com>
parents: 2282
diff changeset
545 if (strType == "blockindex" && !fRequestShutdown)
575
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
546 {
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
547 CDiskBlockIndex diskindex;
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
548 ssValue >> diskindex;
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
549
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
550 // Construct block index object
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
551 CBlockIndex* pindexNew = InsertBlockIndex(diskindex.GetBlockHash());
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
552 pindexNew->pprev = InsertBlockIndex(diskindex.hashPrev);
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
553 pindexNew->pnext = InsertBlockIndex(diskindex.hashNext);
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
554 pindexNew->nFile = diskindex.nFile;
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
555 pindexNew->nBlockPos = diskindex.nBlockPos;
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
556 pindexNew->nHeight = diskindex.nHeight;
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
557 pindexNew->nVersion = diskindex.nVersion;
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
558 pindexNew->hashMerkleRoot = diskindex.hashMerkleRoot;
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
559 pindexNew->nTime = diskindex.nTime;
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
560 pindexNew->nBits = diskindex.nBits;
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
561 pindexNew->nNonce = diskindex.nNonce;
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
562
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
563 // Watch for genesis block
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
564 if (pindexGenesisBlock == NULL && diskindex.GetBlockHash() == hashGenesisBlock)
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
565 pindexGenesisBlock = pindexNew;
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
566
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
567 if (!pindexNew->CheckIndex())
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
568 return error("LoadBlockIndex() : CheckIndex failed at %d", pindexNew->nHeight);
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
569 }
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
570 else
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
571 {
2287
ccef6e0f4b0a Added ability to respond to signals during Block Loading stage.
R E Broadley <rebroad+github@gmail.com>
parents: 2282
diff changeset
572 break; // if shutdown requested or finished loading block index
575
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
573 }
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
574 }
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
575 pcursor->close();
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
576
2287
ccef6e0f4b0a Added ability to respond to signals during Block Loading stage.
R E Broadley <rebroad+github@gmail.com>
parents: 2282
diff changeset
577 if (fRequestShutdown)
ccef6e0f4b0a Added ability to respond to signals during Block Loading stage.
R E Broadley <rebroad+github@gmail.com>
parents: 2282
diff changeset
578 return true;
ccef6e0f4b0a Added ability to respond to signals during Block Loading stage.
R E Broadley <rebroad+github@gmail.com>
parents: 2282
diff changeset
579
575
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
580 // Calculate bnChainWork
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
581 vector<pair<int, CBlockIndex*> > vSortedByHeight;
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
582 vSortedByHeight.reserve(mapBlockIndex.size());
595
e630bbb11629 make bitcoin include files more modular
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 576
diff changeset
583 BOOST_FOREACH(const PAIRTYPE(uint256, CBlockIndex*)& item, mapBlockIndex)
575
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
584 {
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
585 CBlockIndex* pindex = item.second;
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
586 vSortedByHeight.push_back(make_pair(pindex->nHeight, pindex));
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
587 }
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
588 sort(vSortedByHeight.begin(), vSortedByHeight.end());
595
e630bbb11629 make bitcoin include files more modular
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 576
diff changeset
589 BOOST_FOREACH(const PAIRTYPE(int, CBlockIndex*)& item, vSortedByHeight)
575
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
590 {
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
591 CBlockIndex* pindex = item.second;
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
592 pindex->bnChainWork = (pindex->pprev ? pindex->pprev->bnChainWork : 0) + pindex->GetBlockWork();
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
593 }
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
594
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
595 // Load hashBestChain pointer to end of best chain
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
596 if (!ReadHashBestChain(hashBestChain))
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
597 {
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
598 if (pindexGenesisBlock == NULL)
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
599 return true;
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
600 return error("CTxDB::LoadBlockIndex() : hashBestChain not loaded");
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
601 }
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
602 if (!mapBlockIndex.count(hashBestChain))
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
603 return error("CTxDB::LoadBlockIndex() : hashBestChain not found in the block index");
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
604 pindexBest = mapBlockIndex[hashBestChain];
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
605 nBestHeight = pindexBest->nHeight;
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
606 bnBestChainWork = pindexBest->bnChainWork;
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
607 printf("LoadBlockIndex(): hashBestChain=%s height=%d\n", hashBestChain.ToString().substr(0,20).c_str(), nBestHeight);
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
608
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
609 // Load bnBestInvalidWork, OK if it doesn't exist
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
610 ReadBestInvalidWork(bnBestInvalidWork);
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
611
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
612 // Verify blocks in the best chain
2076
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
613 int nCheckLevel = GetArg("-checklevel", 1);
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
614 int nCheckDepth = GetArg( "-checkblocks", 2500);
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
615 if (nCheckDepth == 0)
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
616 nCheckDepth = 1000000000; // suffices until the year 19000
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
617 if (nCheckDepth > nBestHeight)
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
618 nCheckDepth = nBestHeight;
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
619 printf("Verifying last %i blocks at level %i\n", nCheckDepth, nCheckLevel);
575
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
620 CBlockIndex* pindexFork = NULL;
2076
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
621 map<pair<unsigned int, unsigned int>, CBlockIndex*> mapBlockPos;
575
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
622 for (CBlockIndex* pindex = pindexBest; pindex && pindex->pprev; pindex = pindex->pprev)
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
623 {
2304
2c9b9d05a987 -loadblock to load from an external blk000?.dat file
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2287
diff changeset
624 if (fRequestShutdown || pindex->nHeight < nBestHeight-nCheckDepth)
575
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
625 break;
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
626 CBlock block;
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
627 if (!block.ReadFromDisk(pindex))
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
628 return error("LoadBlockIndex() : block.ReadFromDisk failed");
2076
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
629 // check level 1: verify block validity
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
630 if (nCheckLevel>0 && !block.CheckBlock())
575
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
631 {
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
632 printf("LoadBlockIndex() : *** found bad block at %d, hash=%s\n", pindex->nHeight, pindex->GetBlockHash().ToString().c_str());
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
633 pindexFork = pindex->pprev;
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
634 }
2076
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
635 // check level 2: verify transaction index validity
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
636 if (nCheckLevel>1)
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
637 {
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
638 pair<unsigned int, unsigned int> pos = make_pair(pindex->nFile, pindex->nBlockPos);
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
639 mapBlockPos[pos] = pindex;
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
640 BOOST_FOREACH(const CTransaction &tx, block.vtx)
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
641 {
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
642 uint256 hashTx = tx.GetHash();
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
643 CTxIndex txindex;
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
644 if (ReadTxIndex(hashTx, txindex))
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
645 {
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
646 // check level 3: checker transaction hashes
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
647 if (nCheckLevel>2 || pindex->nFile != txindex.pos.nFile || pindex->nBlockPos != txindex.pos.nBlockPos)
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
648 {
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
649 // either an error or a duplicate transaction
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
650 CTransaction txFound;
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
651 if (!txFound.ReadFromDisk(txindex.pos))
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
652 {
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
653 printf("LoadBlockIndex() : *** cannot read mislocated transaction %s\n", hashTx.ToString().c_str());
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
654 pindexFork = pindex->pprev;
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
655 }
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
656 else
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
657 if (txFound.GetHash() != hashTx) // not a duplicate tx
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
658 {
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
659 printf("LoadBlockIndex(): *** invalid tx position for %s\n", hashTx.ToString().c_str());
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
660 pindexFork = pindex->pprev;
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
661 }
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
662 }
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
663 // check level 4: check whether spent txouts were spent within the main chain
2313
3e48c4d044d5 Change signed->unsigned at 3 code sites
Jeff Garzik <jgarzik@exmulti.com>
parents: 2287
diff changeset
664 unsigned int nOutput = 0;
2076
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
665 if (nCheckLevel>3)
2246
b26677f778d1 fix warnings: suggest explicit braces to avoid ambiguous 'else' [-Wparentheses]
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2207
diff changeset
666 {
2076
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
667 BOOST_FOREACH(const CDiskTxPos &txpos, txindex.vSpent)
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
668 {
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
669 if (!txpos.IsNull())
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
670 {
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
671 pair<unsigned int, unsigned int> posFind = make_pair(txpos.nFile, txpos.nBlockPos);
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
672 if (!mapBlockPos.count(posFind))
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
673 {
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
674 printf("LoadBlockIndex(): *** found bad spend at %d, hashBlock=%s, hashTx=%s\n", pindex->nHeight, pindex->GetBlockHash().ToString().c_str(), hashTx.ToString().c_str());
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
675 pindexFork = pindex->pprev;
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
676 }
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
677 // check level 6: check whether spent txouts were spent by a valid transaction that consume them
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
678 if (nCheckLevel>5)
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
679 {
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
680 CTransaction txSpend;
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
681 if (!txSpend.ReadFromDisk(txpos))
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
682 {
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
683 printf("LoadBlockIndex(): *** cannot read spending transaction of %s:%i from disk\n", hashTx.ToString().c_str(), nOutput);
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
684 pindexFork = pindex->pprev;
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
685 }
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
686 else if (!txSpend.CheckTransaction())
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
687 {
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
688 printf("LoadBlockIndex(): *** spending transaction of %s:%i is invalid\n", hashTx.ToString().c_str(), nOutput);
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
689 pindexFork = pindex->pprev;
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
690 }
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
691 else
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
692 {
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
693 bool fFound = false;
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
694 BOOST_FOREACH(const CTxIn &txin, txSpend.vin)
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
695 if (txin.prevout.hash == hashTx && txin.prevout.n == nOutput)
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
696 fFound = true;
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
697 if (!fFound)
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
698 {
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
699 printf("LoadBlockIndex(): *** spending transaction of %s:%i does not spend it\n", hashTx.ToString().c_str(), nOutput);
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
700 pindexFork = pindex->pprev;
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
701 }
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
702 }
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
703 }
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
704 }
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
705 nOutput++;
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
706 }
2246
b26677f778d1 fix warnings: suggest explicit braces to avoid ambiguous 'else' [-Wparentheses]
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2207
diff changeset
707 }
2076
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
708 }
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
709 // check level 5: check whether all prevouts are marked spent
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
710 if (nCheckLevel>4)
2246
b26677f778d1 fix warnings: suggest explicit braces to avoid ambiguous 'else' [-Wparentheses]
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2207
diff changeset
711 {
2076
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
712 BOOST_FOREACH(const CTxIn &txin, tx.vin)
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
713 {
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
714 CTxIndex txindex;
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
715 if (ReadTxIndex(txin.prevout.hash, txindex))
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
716 if (txindex.vSpent.size()-1 < txin.prevout.n || txindex.vSpent[txin.prevout.n].IsNull())
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
717 {
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
718 printf("LoadBlockIndex(): *** found unspent prevout %s:%i in %s\n", txin.prevout.hash.ToString().c_str(), txin.prevout.n, hashTx.ToString().c_str());
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
719 pindexFork = pindex->pprev;
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
720 }
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
721 }
2246
b26677f778d1 fix warnings: suggest explicit braces to avoid ambiguous 'else' [-Wparentheses]
Wladimir J. van der Laan <laanwj@gmail.com>
parents: 2207
diff changeset
722 }
2076
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
723 }
17f721892510 Add -checklevel and improve -checkblocks
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2033
diff changeset
724 }
575
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
725 }
2304
2c9b9d05a987 -loadblock to load from an external blk000?.dat file
Pieter Wuille <pieter.wuille@gmail.com>
parents: 2287
diff changeset
726 if (pindexFork && !fRequestShutdown)
575
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
727 {
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
728 // Reorg back to the fork
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
729 printf("LoadBlockIndex() : *** moving best chain pointer back to block %d\n", pindexFork->nHeight);
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
730 CBlock block;
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
731 if (!block.ReadFromDisk(pindexFork))
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
732 return error("LoadBlockIndex() : block.ReadFromDisk failed");
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
733 CTxDB txdb;
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
734 block.SetBestChain(txdb, pindexFork);
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 return true;
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
738 }
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
739
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
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
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 // CAddrDB
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
746 //
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
747
2578
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
748
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
749 CAddrDB::CAddrDB()
1911
a9190d020909 CAddrMan: stochastic address manager
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1873
diff changeset
750 {
2578
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
751 pathAddr = GetDataDir() / "peers.dat";
1911
a9190d020909 CAddrMan: stochastic address manager
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1873
diff changeset
752 }
a9190d020909 CAddrMan: stochastic address manager
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1873
diff changeset
753
2578
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
754 bool CAddrDB::Write(const CAddrMan& addr)
575
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
755 {
2578
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
756 // Generate random temporary filename
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
757 unsigned short randv = 0;
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
758 RAND_bytes((unsigned char *)&randv, sizeof(randv));
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
759 std::string tmpfn = strprintf("peers.dat.%04x", randv);
1911
a9190d020909 CAddrMan: stochastic address manager
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1873
diff changeset
760
2578
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
761 // serialize addresses, checksum data up to that point, then append csum
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
762 CDataStream ssPeers(SER_DISK, CLIENT_VERSION);
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
763 ssPeers << FLATDATA(pchMessageStart);
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
764 ssPeers << addr;
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
765 uint256 hash = Hash(ssPeers.begin(), ssPeers.end());
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
766 ssPeers << hash;
1911
a9190d020909 CAddrMan: stochastic address manager
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1873
diff changeset
767
2578
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
768 // open temp output file, and associate with CAutoFile
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
769 boost::filesystem::path pathTmp = GetDataDir() / tmpfn;
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
770 FILE *file = fopen(pathTmp.string().c_str(), "wb");
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
771 CAutoFile fileout = CAutoFile(file, SER_DISK, CLIENT_VERSION);
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
772 if (!fileout)
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
773 return error("CAddrman::Write() : open failed");
575
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
774
2578
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
775 // Write and commit header, data
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
776 try {
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
777 fileout << ssPeers;
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
778 }
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
779 catch (std::exception &e) {
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
780 return error("CAddrman::Write() : I/O error");
1911
a9190d020909 CAddrMan: stochastic address manager
Pieter Wuille <pieter.wuille@gmail.com>
parents: 1873
diff changeset
781 }
2578
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
782 FileCommit(fileout);
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
783 fileout.fclose();
575
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
784
2578
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
785 // replace existing peers.dat, if any, with new peers.dat.XXXX
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
786 if (!RenameOver(pathTmp, pathAddr))
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
787 return error("CAddrman::Write() : Rename-into-place failed");
575
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
788
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
789 return true;
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
790 }
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
791
2578
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
792 bool CAddrDB::Read(CAddrMan& addr)
575
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
793 {
2578
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
794 // open input file, and associate with CAutoFile
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
795 FILE *file = fopen(pathAddr.string().c_str(), "rb");
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
796 CAutoFile filein = CAutoFile(file, SER_DISK, CLIENT_VERSION);
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
797 if (!filein)
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
798 return error("CAddrman::Read() : open failed");
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
799
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
800 // use file size to size memory buffer
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
801 int fileSize = GetFilesize(filein);
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
802 int dataSize = fileSize - sizeof(uint256);
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
803 vector<unsigned char> vchData;
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
804 vchData.resize(dataSize);
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
805 uint256 hashIn;
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
806
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
807 // read data and checksum from file
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
808 try {
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
809 filein.read((char *)&vchData[0], dataSize);
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
810 filein >> hashIn;
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
811 }
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
812 catch (std::exception &e) {
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
813 return error("CAddrman::Read() 2 : I/O error or stream data corrupted");
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
814 }
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
815 filein.fclose();
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
816
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
817 CDataStream ssPeers(vchData, SER_DISK, CLIENT_VERSION);
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
818
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
819 // verify stored checksum matches input data
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
820 uint256 hashTmp = Hash(ssPeers.begin(), ssPeers.end());
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
821 if (hashIn != hashTmp)
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
822 return error("CAddrman::Read() : checksum mismatch; data corrupted");
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
823
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
824 // de-serialize address data
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
825 unsigned char pchMsgTmp[4];
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
826 try {
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
827 ssPeers >> FLATDATA(pchMsgTmp);
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
828 ssPeers >> addr;
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
829 }
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
830 catch (std::exception &e) {
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
831 return error("CAddrman::Read() : I/O error or stream data corrupted");
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
832 }
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
833
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
834 // finally, verify the network matches ours
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
835 if (memcmp(pchMsgTmp, pchMessageStart, sizeof(pchMsgTmp)))
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
836 return error("CAddrman::Read() : invalid network magic number");
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
837
038e24060817 CAddrDB: Replace BDB-managed addr.dat with internally managed peers.dat
Jeff Garzik <jgarzik@exmulti.com>
parents: 2404
diff changeset
838 return true;
575
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
839 }
1a0476fe825f directory re-organization (keeps the old build system)
Jaromil <jaromil@dyne.org>
parents:
diff changeset
840