Page MenuHomePhabricator

Merge #13862: utils: drop boost::interprocess::file_lock
ClosedPublic

Authored by jasonbcox on Jan 17 2020, 19:54.

Details

Summary

1661a472b8245eb4588fedbf19c9ed07a41e7602 add unicode compatible file_lock for Windows (Chun Kuan Lee)

Pull request description:

boost::interprocess::file_lock cannot open the files that contain characters which cannot be parsed by the user's code page on Windows.

This PR is seperated from #13426 for easier review.

Tree-SHA512: e240479cda65958bf6e1319840b83928b2b50da81d99f4f002fb3b62621370bcd4bcfacd2b8c0678c443a650d6ba53d9d12618b591e5bfd67ac14388a18fd822

Backport of Core PR13862
https://github.com/bitcoin/bitcoin/pull/13862/files

Test Plan

ninja check

Diff Detail

Repository
rABC Bitcoin ABC
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

jasonbcox created this revision.Jan 17 2020, 19:54
Herald added a reviewer: Restricted Project. · View Herald TranscriptJan 17 2020, 19:54

Snippet of first build failure:

[20:06:15]i:			 [p2p_unrequested_blocks.py] [Test Output]
2020-01-17T20:05:32.067000Z TestFramework (INFO): Initializing test directory /home/teamcity/buildAgent/work/c4a5708f2bae7929/build/test/tmp/bitcoin_test_runner_20200117_120201/p2p_unrequested_blocks_439
2020-01-17T20:05:32.549000Z TestFramework (INFO): First height 2 block accepted by node0; correctly rejected by node1
2020-01-17T20:05:32.655000Z TestFramework (INFO): Second height 2 block accepted, but not reorg'ed to
2020-01-17T20:05:32.709000Z TestFramework (INFO): Unrequested more-work block accepted
2020-01-17T20:05:33.276000Z TestFramework (INFO): Unrequested block that would complete more-work chain was ignored
2020-01-17T20:05:33.327000Z TestFramework (INFO): Inv at tip triggered getdata for unprocessed block
2020-01-17T20:05:33.481000Z TestFramework (INFO): Successfully reorged to longer chain from non-whitelisted peer
2020-01-17T20:05:34.806000Z TestFramework (INFO): Successfully synced nodes 1 and 0
2020-01-17T20:05:34.857000Z TestFramework (INFO): Stopping nodes
2020-01-17T20:05:35.161000Z TestFramework (INFO): Cleaning up /home/teamcity/buildAgent/work/c4a5708f2bae7929/build/test/tmp/bitcoin_test_runner_20200117_120201/p2p_unrequested_blocks_439 on exit
2020-01-17T20:05:35.161000Z TestFramework (INFO): Tests successful
[20:06:15]i:		 [bitcoin_abc_tests] rpc_bind.py
[20:06:15]i:			 [rpc_bind.py] [Test Output]
2020-01-17T20:04:49.310000Z TestFramework (INFO): Initializing test directory /home/teamcity/buildAgent/work/c4a5708f2bae7929/build/test/tmp/bitcoin_test_runner_20200117_120201/rpc_bind_418
2020-01-17T20:04:49.314000Z TestFramework (INFO): Using interface 192.168.1.112 for testing
2020-01-17T20:04:49.314000Z TestFramework (INFO): Bind test for []
2020-01-17T20:04:49.629000Z TestFramework (INFO): Bind test for []
2020-01-17T20:04:50.040000Z TestFramework (INFO): Bind test for ['127.0.0.1']
2020-01-17T20:04:50.653000Z TestFramework (INFO): Bind test for ['127.0.0.1:32171']
2020-01-17T20:04:50.964000Z TestFramework (INFO): Bind test for ['127.0.0.1:32171', '127.0.0.1:32172']
2020-01-17T20:04:51.477000Z TestFramework (INFO): Bind test for ['[::1]']
2020-01-17T20:04:51.988000Z TestFramework (INFO): Bind test for ['127.0.0.1', '[::1]']
2020-01-17T20:04:52.501000Z TestFramework (INFO): Bind test for ['192.168.1.112']
2020-01-17T20:04:52.913000Z TestFramework (INFO): Allow IP test for 192.168.1.112:19344
2020-01-17T20:04:53.322000Z TestFramework (INFO): Allow IP test for 192.168.1.112:19344
2020-01-17T20:04:53.629000Z TestFramework (INFO): Stopping nodes
2020-01-17T20:04:53.831000Z TestFramework (INFO): Cleaning up /home/teamcity/buildAgent/work/c4a5708f2bae7929/build/test/tmp/bitcoin_test_runner_20200117_120201/rpc_bind_418 on exit
2020-01-17T20:04:53.831000Z TestFramework (INFO): Tests successful
[20:06:15]i:		 [bitcoin_abc_tests] rpc_blockchain.py
[20:06:15] :	 [Step 1/1] ninja: build stopped: subcommand failed.
[20:06:15]i:			 [rpc_blockchain.py] [Test Output]
2020-01-17T20:04:53.438000Z TestFramework (INFO): Initializing test directory /home/teamcity/buildAgent/work/c4a5708f2bae7929/build/test/tmp/bitcoin_test_runner_20200117_120201/rpc_blockchain_419
2020-01-17T20:04:54.146000Z TestFramework (INFO): Test getblockchaininfo
2020-01-17T20:04:54.862000Z TestFramework (INFO): Test getchaintxstats
2020-01-17T20:04:54.883000Z TestFramework (INFO): Test that gettxoutsetinfo() works for blockchain with just the genesis block
2020-01-17T20:04:54.920000Z TestFramework (INFO): Test that gettxoutsetinfo() returns the same result after invalidate/reconsider block
2020-01-17T20:04:58.450000Z TestFramework (INFO): Test waitforblockheight
2020-01-17T20:04:58.696000Z TestFramework (INFO): Stopping nodes
2020-01-17T20:04:58.999000Z TestFramework (INFO): Cleaning up /home/teamcity/buildAgent/work/c4a5708f2bae7929/build/test/tmp/bitcoin_test_runner_20200117_120201/rpc_blockchain_419 on exit
2020-01-17T20:04:58.999000Z TestFramework (INFO): Tests successful
[20:06:15] :	 [Step 1/1] *** Output of /tmp/sanitizer_logs/*.log.* ***
[20:06:15]i:		 [bitcoin_abc_tests] rpc_createmultisig.py
[20:06:15]i:			 [rpc_createmultisig.py] [Test Output]
2020-01-17T20:05:11.794000Z TestFramework (INFO): Initializing test directory /home/teamcity/buildAgent/work/c4a5708f2bae7929/build/test/tmp/bitcoin_test_runner_20200117_120201/rpc_createmultisig_428
2020-01-17T20:05:13.570000Z TestFramework (INFO): n/m=2/3 size=337
2020-01-17T20:05:13.721000Z TestFramework (INFO): n/m=3/3 size=411
2020-01-17T20:05:13.898000Z TestFramework (INFO): n/m=2/5 size=407
2020-01-17T20:05:14.088000Z TestFramework (INFO): n/m=3/5 size=479
2020-01-17T20:05:14.282000Z TestFramework (INFO): Stopping nodes
2020-01-17T20:05:14.537000Z TestFramework (INFO): Cleaning up /home/teamcity/buildAgent/work/c4a5708f2bae7929/build/test/tmp/bitcoin_test_runner_20200117_120201/rpc_createmultisig_428 on exit
2020-01-17T20:05:14.537000Z TestFramework (INFO): Tests successful
[20:06:15]W:	 [Step 1/1] Process exited with code 1
[20:06:15]i:		 [bitcoin_abc_tests] rpc_decodescript.py
[20:06:15]i:			 [rpc_decodescript.py] [Test Output]
2020-01-17T20:06:07.346000Z TestFramework (INFO): Initializing test directory /home/teamcity/buildAgent/work/c4a5708f2bae7929/build/test/tmp/bitcoin_test_runner_20200117_120201/rpc_decodescript_480
2020-01-17T20:06:07.670000Z TestFramework (INFO): Stopping nodes
2020-01-17T20:06:07.922000Z TestFramework (INFO): Cleaning up /home/teamcity/buildAgent/work/c4a5708f2bae7929/build/test/tmp/bitcoin_test_runner_20200117_120201/rpc_decodescript_480 on exit
2020-01-17T20:06:07.923000Z TestFramework (INFO): Tests successful
[20:06:15]E:	 [Step 1/1] Process exited with code 1 (Step: Command Line)
deadalnix requested changes to this revision.Jan 17 2020, 21:51
deadalnix added inline comments.
src/init.cpp
53 ↗(On Diff #15620)

csignal is not added from the original patch.

This revision now requires changes to proceed.Jan 17 2020, 21:51
jasonbcox updated this revision to Diff 15626.Jan 17 2020, 22:05

Fix sloppy includes merge

deadalnix accepted this revision.Jan 17 2020, 22:10
This revision is now accepted and ready to land.Jan 17 2020, 22:10