Peerplays_Blockchain/peerplays_migrated
1
0
Fork 0
Code Issues 35 Pull requests 4 Projects Releases 20 Packages Wiki Activity Actions

Merge commit '030577f6719a483314c6de7b7e42214399704adb' into betting

Browse source
This commit is contained in:
Eric Frias 2017-06-21 14:15:57 -04:00
commit c64d83910c
3 changed files with 47 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

105
libraries/app/database_api.cpp
View file

@ -189,12 +189,12 @@ class database_api_impl : public std::enable_shared_from_this<database_api_impl>
void broadcast_updates( const vector<variant>& updates );
void broadcast_market_updates( const market_queue_type& queue);
void check_for_market_objects(const vector<object_id_type>& ids);
void handle_object_changed(bool force_notify, const vector<object_id_type>& ids, std::function<const object*(object_id_type id)> find_object);
/** called every time a block is applied to report the objects that were changed */
void on_objects_new(const vector<object_id_type>& ids);
void on_objects_changed(const vector<object_id_type>& ids);
void on_objects_removed(const vector<const object*>& objs);
void on_objects_removed(const vector<object_id_type>& ids, const vector<const object*>& objs);
void on_applied_block();
bool _notify_remove_create = false;
@ -232,8 +232,8 @@ database_api_impl::database_api_impl( graphene::chain::database& db ):_db(db)
_change_connection = _db.changed_objects.connect([this](const vector<object_id_type>& ids) {
on_objects_changed(ids);
});
_removed_connection = _db.removed_objects.connect([this](const vector<const object*>& objs) {
on_objects_removed(objs);
_removed_connection = _db.removed_objects.connect([this](const vector<object_id_type>& ids, const vector<const object*>& objs) {
on_objects_removed(ids, objs);
});
_applied_block_connection = _db.applied_block.connect([this](const signed_block&){ on_applied_block(); });
@ -1914,72 +1914,36 @@ void database_api_impl::broadcast_market_updates( const market_queue_type& queue
}
}
void database_api_impl::on_objects_removed( const vector<const object*>& objs )
void database_api_impl::on_objects_removed( const vector<object_id_type>& ids, const vector<const object*>& objs )
{
/// we need to ensure the database_api is not deleted for the life of the async operation
if( _subscribe_callback )
{
vector<variant> updates;
handle_object_changed(_notify_remove_create, ids, [objs](object_id_type id) -> const object* {
for( auto obj : objs )
{
if ( is_subscribed_to_item(obj->id) )
{
updates.push_back( fc::variant(obj->id) );
}
}
auto it = std::find_if(
objs.begin(), objs.end(),
[id](const object* o) {return o != nullptr && o->id == id;});
broadcast_updates( updates );
}
if (it != objs.end())
return *it;
if( _market_subscriptions.size() )
{
market_queue_type broadcast_queue;
for( const auto& obj : objs )
{
if( obj->id.is<call_order_object>() )
{
enqueue_if_subscribed_to_market<call_order_object>( obj, broadcast_queue, false );
}
else if( obj->id.is<limit_order_object>() )
{
enqueue_if_subscribed_to_market<limit_order_object>( obj, broadcast_queue, false );
}
}
broadcast_market_updates(broadcast_queue);
}
}
void database_api_impl::check_for_market_objects(const vector<object_id_type>& ids)
{
if( _market_subscriptions.size() )
{
market_queue_type broadcast_queue;
for(auto id : ids)
{
if( id.is<call_order_object>() )
{
enqueue_if_subscribed_to_market<call_order_object>( _db.find_object(id), broadcast_queue );
}
else if( id.is<limit_order_object>() )
{
enqueue_if_subscribed_to_market<limit_order_object>( _db.find_object(id), broadcast_queue );
}
}
broadcast_market_updates(broadcast_queue);
}
return nullptr;
});
}
void database_api_impl::on_objects_new(const vector<object_id_type>& ids)
{
check_for_market_objects(ids);
handle_object_changed(_notify_remove_create, ids,
std::bind(&object_database::find_object, &_db, std::placeholders::_1)
);
}
void database_api_impl::on_objects_changed(const vector<object_id_type>& ids)
{
handle_object_changed(false, ids,
std::bind(&object_database::find_object, &_db, std::placeholders::_1)
);
}
void database_api_impl::handle_object_changed(bool force_notify, const vector<object_id_type>& ids, std::function<const object*(object_id_type id)> find_object)
{
if( _subscribe_callback )
{
@ -1988,9 +1952,9 @@ void database_api_impl::on_objects_changed(const vector<object_id_type>& ids)
for(auto id : ids)
{
const object* obj = nullptr;
if( is_subscribed_to_item(id) )
if( force_notify || is_subscribed_to_item(id) )
{
obj = _db.find_object( id );
obj = find_object(id);
if( obj )
{
updates.emplace_back( obj->to_variant() );
@ -2001,7 +1965,24 @@ void database_api_impl::on_objects_changed(const vector<object_id_type>& ids)
broadcast_updates(updates);
}
check_for_market_objects(ids);
if( _market_subscriptions.size() )
{
market_queue_type broadcast_queue;
for(auto id : ids)
{
if( id.is<call_order_object>() )
{
enqueue_if_subscribed_to_market<call_order_object>( find_object(id), broadcast_queue );
}
else if( id.is<limit_order_object>() )
{
enqueue_if_subscribed_to_market<limit_order_object>( find_object(id), broadcast_queue );
}
}
broadcast_market_updates(broadcast_queue);
}
}
/** note: this method cannot yield because it is called in the middle of

12
libraries/plugins/debug_witness/debug_witness.cpp
View file

@ -99,7 +99,7 @@ void debug_witness_plugin::plugin_startup()
_applied_block_conn = db.applied_block.connect([this](const graphene::chain::signed_block& b){ on_applied_block(b); });
_changed_objects_conn = db.changed_objects.connect([this](const std::vector<graphene::db::object_id_type>& ids){ on_changed_objects(ids); });
_removed_objects_conn = db.removed_objects.connect([this](const std::vector<const graphene::db::object*>& objs){ on_removed_objects(objs); });
_removed_objects_conn = db.removed_objects.connect([this](const std::vector<graphene::db::object_id_type>& ids, const std::vector<const graphene::db::object*>& objs){ on_removed_objects(ids, objs); });
return;
}
@ -112,11 +112,7 @@ void debug_witness_plugin::on_changed_objects( const std::vector<graphene::db::o
for( const graphene::db::object_id_type& oid : ids )
{
const graphene::db::object* obj = db.find_object( oid );
if( obj == nullptr )
{
(*_json_object_stream) << "{\"id\":" << fc::json::to_string( oid ) << "}\n";
}
else
if( obj != nullptr )
{
(*_json_object_stream) << fc::json::to_string( obj->to_variant() ) << '\n';
}
@ -124,9 +120,8 @@ void debug_witness_plugin::on_changed_objects( const std::vector<graphene::db::o
}
}
void debug_witness_plugin::on_removed_objects( const std::vector<const graphene::db::object*> objs )
void debug_witness_plugin::on_removed_objects( const std::vector<graphene::db::object_id_type>& ids, const std::vector<const graphene::db::object*> objs )
{
/*
if( _json_object_stream )
{
for( const graphene::db::object* obj : objs )
@ -134,7 +129,6 @@ void debug_witness_plugin::on_removed_objects( const std::vector<const graphene:
(*_json_object_stream) << "{\"id\":" << fc::json::to_string( obj->id ) << "}\n";
}
}
*/
}
void debug_witness_plugin::on_applied_block( const graphene::chain::signed_block& b )

2
libraries/plugins/debug_witness/include/graphene/debug_witness/debug_witness.hpp
View file

@ -51,7 +51,7 @@ public:
private:
void on_changed_objects( const std::vector<graphene::db::object_id_type>& ids );
void on_removed_objects( const std::vector<const graphene::db::object*> objs );
void on_removed_objects( const std::vector<graphene::db::object_id_type>& ids, const std::vector<const graphene::db::object*> objs );
void on_applied_block( const graphene::chain::signed_block& b );
boost::program_options::variables_map _options;