Skip to content

Commit 7d3b350

Browse files
seditedsedited
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>

0 commit comments

Comments
 (0)