dn724/dncurrency
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Removing transaction from processed observer parameters.

Browse source 
Change several usages of processed_batch to processed.
This commit is contained in:
clemahieu 2023-03-03 02:29:39 +00:00 • committed by Colin LeMahieu
commit e773fa8d79
No known key found for this signature in database
GPG key ID: 43708520C8DFB938
4 changed files with 12 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

19
nano/node/block_broadcast.cpp
View file

@ -15,19 +15,16 @@ void nano::block_broadcast::connect (nano::block_processor & block_processor, bo
{
return;
}
block_processor.batch_processed.add ([this] (auto const & items) {
for (auto const & [result, block] : items)
block_processor.processed.add ([this] (auto const & result, auto const & block) {
switch (result.code)
{
switch (result.code)
{
case nano::process_result::progress:
observe (block);
break;
default:
break;
}
erase (block);
case nano::process_result::progress:
observe (block);
break;
default:
break;
}
erase (block);
});
}

7
nano/node/blocking_observer.cpp
View file

@ -3,11 +3,8 @@
void nano::blocking_observer::connect (nano::block_processor & block_processor)
{
block_processor.batch_processed.add ([this] (auto const & items) {
for (auto const & [result, block] : items)
{
observe (result, block);
}
block_processor.processed.add ([this] (auto const & result, auto const & block) {
observe (result, block);
});
}

3
nano/node/blockprocessor.cpp
View file

@ -33,11 +33,10 @@ nano::block_processor::block_processor (nano::node & node_a, nano::write_databas
{
batch_processed.add ([this] (auto const & items) {
// For every batch item: notify the 'processed' observer.
auto tx = node.store.tx_begin_read ();
for (auto const & item : items)
{
auto const & [result, block] = item;
processed.notify (tx, result, *block);
processed.notify (result, block);
}
});
blocking.connect (*this);

2
nano/node/blockprocessor.hpp
View file

@ -56,7 +56,7 @@ public:
public: // Events
using processed_t = std::pair<nano::process_return, std::shared_ptr<nano::block>>;
nano::observer_set<nano::transaction const &, nano::process_return const &, nano::block const &> processed;
nano::observer_set<nano::process_return const &, std::shared_ptr<nano::block>> processed;
// The batch observer feeds the processed obsever
nano::observer_set<std::deque<processed_t> const &> batch_processed;