Skip to content

[Refactoring] Lightweight abstraction of boost::filesystem#1630

Merged
random-zebra merged 6 commits intoPIVX-Project:masterfrom
random-zebra:202005_boost_filesystem
Jun 2, 2020
Merged

[Refactoring] Lightweight abstraction of boost::filesystem#1630
random-zebra merged 6 commits intoPIVX-Project:masterfrom
random-zebra:202005_boost_filesystem

Conversation

@random-zebra
Copy link

@random-zebra random-zebra commented May 19, 2020 •
edited
Loading

Based on top of:

Backports bitcoin#9902

Wrap boost::filesystem as the fs namespace, contained in one header.
Also add fsbridge for bridging between stdio.h fopen() and the path type.

This allows:

Replacing it when the time comes with std::filesystem (when standardized, and when we start using the appropriate c++ version) with a single change.

Using custom filesystem implementations that offer the same interface. I need this in cloudabi, a sandboxed environment which has no concept of a global filesystem namespace, where paths need to be accompanied by a file descriptor which grants access to it.

It's less typing, too.

See individual commits for more information.

@random-zebra random-zebra added this to the 5.0.0 milestone May 19, 2020
@random-zebra random-zebra self-assigned this May 19, 2020
@random-zebra random-zebra force-pushed the 202005_boost_filesystem branch 3 times, most recently from f8ab778 to b4df9ae Compare May 23, 2020 12:04
@random-zebra
Add fs.cpp/h
1d84a5a 
backports bitcoin/bitcoin@19e36bb
@random-zebra
Replace includes of boost/filesystem.h with fs.h
4305cce 
This is step one in abstracting the use of boost::filesystem.

backports bitcoin/bitcoin@7d5172d
@random-zebra
Replace uses of boost::filesystem with fs
5010dac 
Step two in abstracting away boost::filesystem.

To repeat this, simply run:
```
git ls-files \*.cpp \*.h | xargs sed -i 's/boost::filesystem/fs/g'
```

backports bitcoin/bitcoin@bac5c9c
@random-zebra
Use fsbridge for fopen and freopen
7de1ba7 
Abstracts away how a path is opened to a `FILE*`.

Reduces the number of places where path is converted to a string
for anything else but printing.

backports bitcoin/bitcoin@2a5f574
@random-zebra
torcontrol: Use fs::path instead of std::string for private key path
f16a6db 
backports bitcoin/bitcoin@75594bd
@random-zebra
Remove namespace fs=fs
286aa99 
Having these inside functions is silly and redundant now.

backports bitcoin/bitcoin@f110272
@random-zebra random-zebra force-pushed the 202005_boost_filesystem branch from b4df9ae to 286aa99 Compare May 27, 2020 09:58
@random-zebra
Copy link
Author

random-zebra commented May 27, 2020

Rebased after #1629 merge. Ready for review/QA.

furszy
furszy reviewed May 27, 2020
View reviewed changes
Copy link

@furszy furszy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code review ACK 286aa99.

furszy
furszy approved these changes May 27, 2020
View reviewed changes
Copy link

@furszy furszy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 286aa99.

Fuzzbawls
Fuzzbawls approved these changes Jun 2, 2020
View reviewed changes
Copy link
Collaborator

@Fuzzbawls Fuzzbawls left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 286aa99

@random-zebra random-zebra merged commit a9ac1cc into PIVX-Project:master Jun 2, 2020
@lyricidal lyricidal mentioned this pull request Aug 31, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Fuzzbawls Fuzzbawls Fuzzbawls approved these changes

+1 more reviewer

@furszy furszy furszy approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@random-zebra random-zebra

Labels

Refactoring Upstream

Projects

None yet

Milestone

4.2.0

Development

Successfully merging this pull request may close these issues.

3 participants

@random-zebra @furszy @Fuzzbawls