Skip to content

Commit 7d3b350

Browse files
committed
refactor: Move system from util to common library
Since the kernel library no longer depends on the system file, move it to the common library instead in accordance to the diagram in doc/design/libraries.md.
1 parent 7eee356 commit 7d3b350

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+70
-71
lines changed

src/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ BITCOIN_CORE_H = \
143143
compat/compat.h \
144144
compat/cpuid.h \
145145
compat/endian.h \
146+
common/system.h \
146147
compressor.h \
147148
consensus/consensus.h \
148149
consensus/tx_check.h \
@@ -314,7 +315,6 @@ BITCOIN_CORE_H = \
314315
util/string.h \
315316
util/syscall_sandbox.h \
316317
util/syserror.h \
317-
util/system.h \
318318
util/thread.h \
319319
util/threadinterrupt.h \
320320
util/threadnames.h \
@@ -663,6 +663,7 @@ libbitcoin_common_a_SOURCES = \
663663
common/init.cpp \
664664
common/interfaces.cpp \
665665
common/run_command.cpp \
666+
common/system.cpp \
666667
compressor.cpp \
667668
core_read.cpp \
668669
core_write.cpp \
@@ -728,7 +729,6 @@ libbitcoin_util_a_SOURCES = \
728729
util/hasher.cpp \
729730
util/sock.cpp \
730731
util/syserror.cpp \
731-
util/system.cpp \
732732
util/message.cpp \
733733
util/moneystr.cpp \
734734
util/rbf.cpp \

src/banman.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55

66
#include <banman.h>
77

8+
#include <common/system.h>
89
#include <logging.h>
910
#include <netaddress.h>
1011
#include <node/interface_ui.h>
1112
#include <sync.h>
12-
#include <util/system.h>
1313
#include <util/time.h>
1414
#include <util/translation.h>
1515

src/bench/checkqueue.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44

55
#include <bench/bench.h>
66
#include <checkqueue.h>
7+
#include <common/system.h>
78
#include <key.h>
89
#include <prevector.h>
910
#include <pubkey.h>
1011
#include <random.h>
11-
#include <util/system.h>
1212

1313
#include <vector>
1414

src/bitcoin-cli.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include <chainparamsbase.h>
1111
#include <clientversion.h>
1212
#include <common/args.h>
13+
#include <common/system.h>
1314
#include <common/url.h>
1415
#include <compat/compat.h>
1516
#include <compat/stdin.h>
@@ -23,7 +24,6 @@
2324
#include <util/chaintype.h>
2425
#include <util/exception.h>
2526
#include <util/strencodings.h>
26-
#include <util/system.h>
2727
#include <util/time.h>
2828
#include <util/translation.h>
2929

src/bitcoin-tx.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include <clientversion.h>
1111
#include <coins.h>
1212
#include <common/args.h>
13+
#include <common/system.h>
1314
#include <compat/compat.h>
1415
#include <consensus/amount.h>
1516
#include <consensus/consensus.h>
@@ -27,7 +28,6 @@
2728
#include <util/rbf.h>
2829
#include <util/strencodings.h>
2930
#include <util/string.h>
30-
#include <util/system.h>
3131
#include <util/translation.h>
3232

3333
#include <cstdio>

src/bitcoin-util.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
#include <chainparamsbase.h>
1313
#include <clientversion.h>
1414
#include <common/args.h>
15+
#include <common/system.h>
1516
#include <compat/compat.h>
1617
#include <core_io.h>
1718
#include <streams.h>
1819
#include <util/exception.h>
19-
#include <util/system.h>
2020
#include <util/translation.h>
2121
#include <version.h>
2222

src/bitcoin-wallet.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include <chainparamsbase.h>
1111
#include <clientversion.h>
1212
#include <common/args.h>
13+
#include <common/system.h>
1314
#include <common/url.h>
1415
#include <compat/compat.h>
1516
#include <interfaces/init.h>
@@ -18,7 +19,6 @@
1819
#include <pubkey.h>
1920
#include <tinyformat.h>
2021
#include <util/exception.h>
21-
#include <util/system.h>
2222
#include <util/translation.h>
2323
#include <wallet/wallettool.h>
2424

src/bitcoind.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include <clientversion.h>
1212
#include <common/args.h>
1313
#include <common/init.h>
14+
#include <common/system.h>
1415
#include <common/url.h>
1516
#include <compat/compat.h>
1617
#include <init.h>
@@ -25,7 +26,6 @@
2526
#include <util/strencodings.h>
2627
#include <util/syscall_sandbox.h>
2728
#include <util/syserror.h>
28-
#include <util/system.h>
2929
#include <util/threadnames.h>
3030
#include <util/tokenpipe.h>
3131
#include <util/translation.h>

src/blockencodings.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

55
#include <blockencodings.h>
6+
#include <chainparams.h>
7+
#include <common/system.h>
68
#include <consensus/consensus.h>
79
#include <consensus/validation.h>
8-
#include <chainparams.h>
910
#include <crypto/sha256.h>
1011
#include <crypto/siphash.h>
1112
#include <random.h>
1213
#include <streams.h>
1314
#include <txmempool.h>
1415
#include <validation.h>
15-
#include <util/system.h>
1616

1717
#include <unordered_map>
1818

src/util/system.cpp renamed to src/common/system.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// Distributed under the MIT software license, see the accompanying
44
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
55

6-
#include <util/system.h>
6+
#include <common/system.h>
77

88
#include <logging.h>
99
#include <util/string.h>

src/util/system.h renamed to src/common/system.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
// Distributed under the MIT software license, see the accompanying
44
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
55

6-
#ifndef BITCOIN_UTIL_SYSTEM_H
7-
#define BITCOIN_UTIL_SYSTEM_H
6+
#ifndef BITCOIN_COMMON_SYSTEM_H
7+
#define BITCOIN_COMMON_SYSTEM_H
88

99
#if defined(HAVE_CONFIG_H)
1010
#include <config/bitcoin-config.h>
@@ -35,4 +35,4 @@ void runCommand(const std::string& strCommand);
3535
*/
3636
int GetNumCores();
3737

38-
#endif // BITCOIN_UTIL_SYSTEM_H
38+
#endif // BITCOIN_COMMON_SYSTEM_H

src/core_write.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
#include <core_io.h>
66

7+
#include <common/system.h>
78
#include <consensus/amount.h>
89
#include <consensus/consensus.h>
910
#include <consensus/validation.h>
@@ -17,7 +18,6 @@
1718
#include <univalue.h>
1819
#include <util/check.h>
1920
#include <util/strencodings.h>
20-
#include <util/system.h>
2121

2222
#include <map>
2323
#include <string>

src/external_signer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
#ifndef BITCOIN_EXTERNAL_SIGNER_H
66
#define BITCOIN_EXTERNAL_SIGNER_H
77

8+
#include <common/system.h>
89
#include <univalue.h>
9-
#include <util/system.h>
1010

1111
#include <string>
1212
#include <vector>

src/i2p.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ void Session::GenerateAndSavePrivateKey(const Sock& sock)
336336
{
337337
DestGenerate(sock);
338338

339-
// umask is set to 0077 in util/system.cpp, which is ok.
339+
// umask is set to 0077 in common/system.cpp, which is ok.
340340
if (!WriteBinaryFile(m_private_key_file,
341341
std::string(m_private_key.begin(), m_private_key.end()))) {
342342
throw std::runtime_error(

src/init.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include <chainparams.h>
2121
#include <chainparamsbase.h>
2222
#include <common/args.h>
23+
#include <common/system.h>
2324
#include <consensus/amount.h>
2425
#include <deploymentstatus.h>
2526
#include <hash.h>
@@ -80,7 +81,6 @@
8081
#include <util/string.h>
8182
#include <util/syscall_sandbox.h>
8283
#include <util/syserror.h>
83-
#include <util/system.h>
8484
#include <util/thread.h>
8585
#include <util/threadnames.h>
8686
#include <util/translation.h>

src/ipc/interfaces.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5+
#include <common/system.h>
56
#include <interfaces/init.h>
67
#include <interfaces/ipc.h>
78
#include <ipc/capnp/protocol.h>
@@ -10,7 +11,6 @@
1011
#include <logging.h>
1112
#include <tinyformat.h>
1213
#include <util/fs.h>
13-
#include <util/system.h>
1414

1515
#include <cstdio>
1616
#include <cstdlib>

src/mapport.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
#include <mapport.h>
1010

1111
#include <clientversion.h>
12+
#include <common/system.h>
1213
#include <logging.h>
1314
#include <net.h>
1415
#include <netaddress.h>
1516
#include <netbase.h>
1617
#include <util/syscall_sandbox.h>
17-
#include <util/system.h>
1818
#include <util/thread.h>
1919
#include <util/threadinterrupt.h>
2020

src/net_permissions.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
// Distributed under the MIT software license, see the accompanying
33
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
44

5+
#include <common/system.h>
56
#include <net_permissions.h>
67
#include <netbase.h>
78
#include <util/error.h>
8-
#include <util/system.h>
99
#include <util/translation.h>
1010

1111
const std::vector<std::string> NET_PERMISSIONS_DOC{

src/node/blockstorage.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#include <util/batchpriority.h>
2121
#include <util/fs.h>
2222
#include <util/syscall_sandbox.h>
23-
#include <util/system.h>
2423
#include <validation.h>
2524

2625
#include <map>

src/node/kernel_notifications.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
#endif
1010

1111
#include <common/args.h>
12+
#include <common/system.h>
1213
#include <node/interface_ui.h>
1314
#include <util/strencodings.h>
1415
#include <util/string.h>
15-
#include <util/system.h>
1616
#include <util/translation.h>
1717
#include <warnings.h>
1818

src/node/txreconciliation.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
#include <node/txreconciliation.h>
66

7+
#include <common/system.h>
78
#include <logging.h>
89
#include <util/check.h>
9-
#include <util/system.h>
1010

1111
#include <unordered_map>
1212
#include <variant>

src/policy/fees.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include <policy/fees.h>
77

88
#include <clientversion.h>
9+
#include <common/system.h>
910
#include <consensus/amount.h>
1011
#include <kernel/mempool_entry.h>
1112
#include <logging.h>
@@ -19,7 +20,6 @@
1920
#include <uint256.h>
2021
#include <util/fs.h>
2122
#include <util/serfloat.h>
22-
#include <util/system.h>
2323
#include <util/time.h>
2424

2525
#include <algorithm>

src/protocol.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
#include <protocol.h>
77

8-
#include <util/system.h>
8+
#include <common/system.h>
99

1010
#include <atomic>
1111

src/qt/bitcoin.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include <chainparams.h>
1212
#include <common/args.h>
1313
#include <common/init.h>
14+
#include <common/system.h>
1415
#include <init.h>
1516
#include <interfaces/handler.h>
1617
#include <interfaces/init.h>
@@ -32,7 +33,6 @@
3233
#include <uint256.h>
3334
#include <util/exception.h>
3435
#include <util/string.h>
35-
#include <util/system.h>
3636
#include <util/threadnames.h>
3737
#include <util/translation.h>
3838
#include <validation.h>

src/qt/bitcoingui.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,17 @@
3030
#include <qt/macdockiconhandler.h>
3131
#endif
3232

33-
#include <functional>
3433
#include <chain.h>
3534
#include <chainparams.h>
35+
#include <common/system.h>
3636
#include <interfaces/handler.h>
3737
#include <interfaces/node.h>
3838
#include <node/interface_ui.h>
39-
#include <util/system.h>
4039
#include <util/translation.h>
4140
#include <validation.h>
4241

42+
#include <functional>
43+
4344
#include <QAction>
4445
#include <QActionGroup>
4546
#include <QApplication>

src/qt/clientmodel.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212

1313
#include <clientversion.h>
1414
#include <common/args.h>
15+
#include <common/system.h>
1516
#include <interfaces/handler.h>
1617
#include <interfaces/node.h>
1718
#include <net.h>
1819
#include <netbase.h>
19-
#include <util/system.h>
2020
#include <util/threadnames.h>
2121
#include <util/time.h>
2222
#include <validation.h>

src/qt/optionsdialog.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
#include <qt/guiutil.h>
1616
#include <qt/optionsmodel.h>
1717

18+
#include <common/system.h>
1819
#include <interfaces/node.h>
19-
#include <validation.h> // for DEFAULT_SCRIPTCHECK_THREADS and MAX_SCRIPTCHECK_THREADS
2020
#include <netbase.h>
21-
#include <txdb.h> // for -dbcache defaults
22-
#include <util/system.h>
21+
#include <txdb.h>
22+
#include <validation.h>
2323

2424
#include <chrono>
2525

0 commit comments

Comments
 (0)