Skip to content

Commit d5f985e

Browse files
ryanofskyryanofsky
committed
multiprocess: Add new bitcoin-gui, bitcoin-qt, bitcoin-wallet init implementations
Add separate init implementations instead of sharing existing bitcoind and bitcoin-node ones, so they can start to be differentiated in upcoming commits with node and wallet code no longer linked into the bitcoin-gui binary and wallet code no longer linked into the bitcoin-node binary.
1 parent 6ef84e0 commit d5f985e

File tree

12 files changed

+121
-13
lines changed

12 files changed

+121
-13
lines changed

‎build_msvc/bitcoin-qt/bitcoin-qt.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</PropertyGroup>
1010
<ItemGroup>
1111
<ClCompile Include="..\..\src\qt\main.cpp" />
12-
<ClCompile Include="..\..\src\init\bitcoind.cpp" />
12+
<ClCompile Include="..\..\src\init\bitcoin-qt.cpp" />
1313
<ResourceCompile Include="..\..\src\qt\res\bitcoin-qt-res.rc" />
1414
</ItemGroup>
1515
<ItemGroup>

‎build_msvc/bitcoin-wallet/bitcoin-wallet.vcxproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
</PropertyGroup>
1111
<ItemGroup>
1212
<ClCompile Include="..\..\src\bitcoin-wallet.cpp" />
13+
<ClCompile Include="..\..\src\init\bitcoin-wallet.cpp">
14+
<ObjectFileName>$(IntDir)init_bitcoin-wallet.obj</ObjectFileName>
15+
</ClCompile>
1316
</ItemGroup>
1417
<ItemGroup>
1518
<ProjectReference Include="..\libbitcoinconsensus\libbitcoinconsensus.vcxproj">

‎build_msvc/test_bitcoin-qt/test_bitcoin-qt.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
99
</PropertyGroup>
1010
<ItemGroup>
11-
<ClCompile Include="..\..\src\init\bitcoind.cpp" />
11+
<ClCompile Include="..\..\src\init\bitcoin-qt.cpp" />
1212
<ClCompile Include="..\..\src\test\util\setup_common.cpp" />
1313
<ClCompile Include="..\..\src\qt\test\addressbooktests.cpp" />
1414
<ClCompile Include="..\..\src\qt\test\apptests.cpp" />

‎src/Makefile.am‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -710,6 +710,7 @@ bitcoin_tx_LDADD += $(BOOST_LIBS)
710710

711711
# bitcoin-wallet binary #
712712
bitcoin_wallet_SOURCES = bitcoin-wallet.cpp
713+
bitcoin_wallet_SOURCES += init/bitcoin-wallet.cpp
713714
bitcoin_wallet_CPPFLAGS = $(bitcoin_bin_cppflags)
714715
bitcoin_wallet_CXXFLAGS = $(bitcoin_bin_cxxflags)
715716
bitcoin_wallet_LDFLAGS = $(bitcoin_bin_ldflags)

‎src/Makefile.qt.include‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -338,15 +338,15 @@ bitcoin_qt_libtoolflags = $(AM_LIBTOOLFLAGS) --tag CXX
338338

339339
qt_bitcoin_qt_CPPFLAGS = $(bitcoin_qt_cppflags)
340340
qt_bitcoin_qt_CXXFLAGS = $(bitcoin_qt_cxxflags)
341-
qt_bitcoin_qt_SOURCES = $(bitcoin_qt_sources) init/bitcoind.cpp
341+
qt_bitcoin_qt_SOURCES = $(bitcoin_qt_sources) init/bitcoin-qt.cpp
342342
qt_bitcoin_qt_LDADD = $(bitcoin_qt_ldadd)
343343
qt_bitcoin_qt_LDFLAGS = $(bitcoin_qt_ldflags)
344344
qt_bitcoin_qt_LIBTOOLFLAGS = $(bitcoin_qt_libtoolflags)
345345

346346
bitcoin_gui_CPPFLAGS = $(bitcoin_qt_cppflags)
347347
bitcoin_gui_CXXFLAGS = $(bitcoin_qt_cxxflags)
348-
bitcoin_gui_SOURCES = $(bitcoin_qt_sources) init/bitcoind.cpp
349-
bitcoin_gui_LDADD = $(bitcoin_qt_ldadd)
348+
bitcoin_gui_SOURCES = $(bitcoin_qt_sources) init/bitcoin-gui.cpp
349+
bitcoin_gui_LDADD = $(bitcoin_qt_ldadd) $(LIBBITCOIN_IPC) $(LIBBITCOIN_UTIL) $(LIBMULTIPROCESS_LIBS)
350350
bitcoin_gui_LDFLAGS = $(bitcoin_qt_ldflags)
351351
bitcoin_gui_LIBTOOLFLAGS = $(bitcoin_qt_libtoolflags)
352352

‎src/Makefile.qttest.include‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ qt_test_test_bitcoin_qt_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BITCOIN_
2828
$(QT_INCLUDES) $(QT_TEST_INCLUDES)
2929

3030
qt_test_test_bitcoin_qt_SOURCES = \
31-
init/bitcoind.cpp \
31+
init/bitcoin-qt.cpp \
3232
qt/test/apptests.cpp \
3333
qt/test/rpcnestedtests.cpp \
3434
qt/test/test_main.cpp \

‎src/bitcoin-wallet.cpp‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
#include <chainparams.h>
1010
#include <chainparamsbase.h>
11+
#include <interfaces/init.h>
1112
#include <logging.h>
1213
#include <util/system.h>
1314
#include <util/translation.h>
@@ -83,6 +84,13 @@ int main(int argc, char* argv[])
8384
util::WinCmdLineArgs winArgs;
8485
std::tie(argc, argv) = winArgs.get();
8586
#endif
87+
88+
int exit_status;
89+
std::unique_ptr<interfaces::Init> init = interfaces::MakeWalletInit(argc, argv, exit_status);
90+
if (!init) {
91+
return exit_status;
92+
}
93+
8694
SetupEnvironment();
8795
RandomInit();
8896
try {

‎src/init/bitcoin-gui.cpp‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
// Copyright (c) 2021 The Bitcoin Core developers
2+
// Distributed under the MIT software license, see the accompanying
3+
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
4+
5+
#include <interfaces/chain.h>
6+
#include <interfaces/echo.h>
7+
#include <interfaces/init.h>
8+
#include <interfaces/ipc.h>
9+
#include <interfaces/node.h>
10+
#include <interfaces/wallet.h>
11+
#include <node/context.h>
12+
#include <util/system.h>
13+
14+
#include <memory>
15+
16+
namespace init {
17+
namespace {
18+
const char* EXE_NAME = "bitcoin-gui";
19+
20+
class BitcoinGuiInit : public interfaces::Init
21+
{
22+
public:
23+
BitcoinGuiInit(const char* arg0) : m_ipc(interfaces::MakeIpc(EXE_NAME, arg0, *this))
24+
{
25+
m_node.args = &gArgs;
26+
m_node.init = this;
27+
}
28+
std::unique_ptr<interfaces::Node> makeNode() override { return interfaces::MakeNode(m_node); }
29+
std::unique_ptr<interfaces::Chain> makeChain() override { return interfaces::MakeChain(m_node); }
30+
std::unique_ptr<interfaces::WalletClient> makeWalletClient(interfaces::Chain& chain) override
31+
{
32+
return MakeWalletClient(chain, *Assert(m_node.args));
33+
}
34+
std::unique_ptr<interfaces::Echo> makeEcho() override { return interfaces::MakeEcho(); }
35+
interfaces::Ipc* ipc() override { return m_ipc.get(); }
36+
NodeContext m_node;
37+
std::unique_ptr<interfaces::Ipc> m_ipc;
38+
};
39+
} // namespace
40+
} // namespace init
41+
42+
namespace interfaces {
43+
std::unique_ptr<Init> MakeGuiInit(int argc, char* argv[])
44+
{
45+
return std::make_unique<init::BitcoinGuiInit>(argc > 0 ? argv[0] : "");
46+
}
47+
} // namespace interfaces

‎src/init/bitcoin-qt.cpp‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
// Copyright (c) 2021 The Bitcoin Core developers
2+
// Distributed under the MIT software license, see the accompanying
3+
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
4+
5+
#include <interfaces/chain.h>
6+
#include <interfaces/echo.h>
7+
#include <interfaces/init.h>
8+
#include <interfaces/node.h>
9+
#include <interfaces/wallet.h>
10+
#include <node/context.h>
11+
#include <util/system.h>
12+
13+
#include <memory>
14+
15+
namespace init {
16+
namespace {
17+
class BitcoinQtInit : public interfaces::Init
18+
{
19+
public:
20+
BitcoinQtInit()
21+
{
22+
m_node.args = &gArgs;
23+
m_node.init = this;
24+
}
25+
std::unique_ptr<interfaces::Node> makeNode() override { return interfaces::MakeNode(m_node); }
26+
std::unique_ptr<interfaces::Chain> makeChain() override { return interfaces::MakeChain(m_node); }
27+
std::unique_ptr<interfaces::WalletClient> makeWalletClient(interfaces::Chain& chain) override
28+
{
29+
return MakeWalletClient(chain, *Assert(m_node.args));
30+
}
31+
std::unique_ptr<interfaces::Echo> makeEcho() override { return interfaces::MakeEcho(); }
32+
NodeContext m_node;
33+
};
34+
} // namespace
35+
} // namespace init
36+
37+
namespace interfaces {
38+
std::unique_ptr<Init> MakeGuiInit(int argc, char* argv[])
39+
{
40+
return std::make_unique<init::BitcoinQtInit>();
41+
}
42+
} // namespace interfaces

‎src/init/bitcoin-wallet.cpp‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
// Copyright (c) 2021 The Bitcoin Core developers
2+
// Distributed under the MIT software license, see the accompanying
3+
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
4+
5+
#include <interfaces/init.h>
6+
7+
namespace interfaces {
8+
std::unique_ptr<Init> MakeWalletInit(int argc, char* argv[], int& exit_status)
9+
{
10+
return std::make_unique<Init>();
11+
}
12+
} // namespace interfaces

0 commit comments

Comments
 (0)