[c++11] Use std::unique_ptr for block creation. #8223
Conversation
CreateNewBlock returns a pointer for which the caller takes ownership. Use std::unique_ptr to make this explicit and simplify handling of these objects in getblocktemplate.
| @@ -164,7 +165,7 @@ CBlockTemplate* BlockAssembler::CreateNewBlock(const CScript& scriptPubKeyIn) | |||
| throw std::runtime_error(strprintf("%s: TestBlockValidity failed: %s", __func__, FormatStateMessage(state))); | |||
| } | |||
|
|
|||
| return pblocktemplate.release(); | |||
| return std::move(pblocktemplate); | |||
There was a problem hiding this comment.
Return value optimization applies here; I think using std::move is discouraged in that case.
There was a problem hiding this comment.
No, it does not. pblocktemplate is a member variable and not a local one, I think the code does not compile without std::move.
|
Oops, I forgot we just merged the refactor that turned it into a class. You're right. |
|
Concept ACK. But it might make more sense to use a shared_ptr so TestBlockValidity can be split off to a new thread while GBT returns... |
|
utACK 9fce062 |
| @@ -160,7 +160,7 @@ class BlockAssembler | |||
| public: | |||
| BlockAssembler(const CChainParams& chainparams); | |||
| /** Construct a new block template with coinbase to scriptPubKeyIn */ | |||
| CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn); | |||
| std::unique_ptr<CBlockTemplate> CreateNewBlock(const CScript& scriptPubKeyIn); | |||
There was a problem hiding this comment.
Shouldn't the caller decide in what kind of pointer to wrap the object?
What if they want to e.g. have a shared pointer instead?
There was a problem hiding this comment.
Converting from unique_ptr to shared_ptr is relatively cheap (specifically, does not require copying the object).
There was a problem hiding this comment.
But does this mean we want all functions that currently return a bare pointer that will become caller ownership to returning unique_ptr?
This is probably the kind of c++11 refactoring that we want to leave for later.
|
utACK 9fce062 |
9fce062 [c++11] Use std::unique_ptr for block creation. (Daniel Kraft)
9fce062 [c++11] Use std::unique_ptr for block creation. (Daniel Kraft)
9fce062 [c++11] Use std::unique_ptr for block creation. (Daniel Kraft)
CreateNewBlockreturns a pointer for which the caller takes ownership. Usestd::unique_ptrto make this explicit and simplify handling of these objects ingetblocktemplate.