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

optionally subscribe to full account

Browse source
This commit is contained in:
Daniel Larimer 2015-07-30 09:20:49 -04:00
parent 1b5a7cb213
commit 15bcd5e2a7
3 changed files with 40 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs

@ -1 +1 @@
Subproject commit 97435c1a622e41e0a5fc1be72aaadea62e1b7adb Subproject commit f7f73f52a5a60a1606c05a3e8a2d6a5df32b579c

58
libraries/app/api.cpp
View file

@ -35,6 +35,7 @@ namespace graphene { namespace app {
database_api::database_api(graphene::chain::database& db):_db(db) database_api::database_api(graphene::chain::database& db):_db(db)
{ {
wlog("creating database api ${x}", ("x",int64_t(this)) );
_change_connection = _db.changed_objects.connect([this](const vector<object_id_type>& ids) { _change_connection = _db.changed_objects.connect([this](const vector<object_id_type>& ids) {
on_objects_changed(ids); on_objects_changed(ids);
}); });
@ -44,6 +45,29 @@ namespace graphene { namespace app {
_applied_block_connection = _db.applied_block.connect([this](const signed_block&){ on_applied_block(); }); _applied_block_connection = _db.applied_block.connect([this](const signed_block&){ on_applied_block(); });
} }
database_api::~database_api()
{
elog("freeing database api ${x}", ("x",int64_t(this)) );
try {
if(_broadcast_changes_complete.valid())
{
_broadcast_changes_complete.cancel();
ilog( "waiting..");
_broadcast_changes_complete.wait();
}
if(_broadcast_removed_complete.valid())
{
_broadcast_removed_complete.cancel();
ilog( "waiting..");
_broadcast_removed_complete.wait();
}
ilog( "done" );
} catch (const fc::exception& e)
{
wlog("${e}", ("e",e.to_detail_string()));
}
}
fc::variants database_api::get_objects(const vector<object_id_type>& ids)const fc::variants database_api::get_objects(const vector<object_id_type>& ids)const
{ {
fc::variants result; fc::variants result;
@ -185,7 +209,7 @@ namespace graphene { namespace app {
} }
std::map<std::string, full_account> database_api::get_full_accounts(std::function<void(const variant&)> callback, std::map<std::string, full_account> database_api::get_full_accounts(std::function<void(const variant&)> callback,
const vector<std::string>& names_or_ids) const vector<std::string>& names_or_ids, bool subscribe)
{ {
FC_ASSERT( _account_subscriptions.size() < 1024 ); FC_ASSERT( _account_subscriptions.size() < 1024 );
std::map<std::string, full_account> results; std::map<std::string, full_account> results;
@ -205,7 +229,16 @@ namespace graphene { namespace app {
if (account == nullptr) if (account == nullptr)
continue; continue;
_account_subscriptions[account->id] = callback; if( subscribe )
{
ilog( "subscribe to ${id}", ("id",account->name) );
_account_subscriptions[account->id] = callback;
}
else
{
wlog( "unsubscribe to ${id}", ("id",account->name) );
_account_subscriptions.erase(account->id);
}
// fc::mutable_variant_object full_account; // fc::mutable_variant_object full_account;
full_account acnt; full_account acnt;
@ -725,6 +758,7 @@ namespace graphene { namespace app {
_broadcast_removed_complete = fc::async([=](){ _broadcast_removed_complete = fc::async([=](){
for( const auto& item : broadcast_queue ) for( const auto& item : broadcast_queue )
{ {
idump((item.first)(item.second) );
auto sub = _account_subscriptions.find(item.first); auto sub = _account_subscriptions.find(item.first);
if( sub != _account_subscriptions.end() ) if( sub != _account_subscriptions.end() )
sub->second( fc::variant(item.second ) ); sub->second( fc::variant(item.second ) );
@ -761,6 +795,7 @@ namespace graphene { namespace app {
void database_api::on_objects_changed(const vector<object_id_type>& ids) void database_api::on_objects_changed(const vector<object_id_type>& ids)
{ {
idump((ids)(_account_subscriptions.size()));
vector<object_id_type> my_objects; vector<object_id_type> my_objects;
map<account_id_type, vector<variant> > broadcast_queue; map<account_id_type, vector<variant> > broadcast_queue;
map< pair<asset_id_type, asset_id_type>, vector<variant> > market_broadcast_queue; map< pair<asset_id_type, asset_id_type>, vector<variant> > market_broadcast_queue;
@ -809,6 +844,7 @@ namespace graphene { namespace app {
_broadcast_changes_complete = fc::async([=](){ _broadcast_changes_complete = fc::async([=](){
for( const auto& item : broadcast_queue ) for( const auto& item : broadcast_queue )
{ {
edump( (item) );
auto sub = _account_subscriptions.find(item.first); auto sub = _account_subscriptions.find(item.first);
if( sub != _account_subscriptions.end() ) if( sub != _account_subscriptions.end() )
sub->second( fc::variant(item.second ) ); sub->second( fc::variant(item.second ) );
@ -881,24 +917,6 @@ namespace graphene { namespace app {
}); });
} }
database_api::~database_api()
{
try {
if(_broadcast_changes_complete.valid())
{
_broadcast_changes_complete.cancel();
_broadcast_changes_complete.wait();
}
if(_broadcast_removed_complete.valid())
{
_broadcast_removed_complete.cancel();
_broadcast_removed_complete.wait();
}
} catch (const fc::exception& e)
{
wlog("${e}", ("e",e.to_detail_string()));
}
}
bool database_api::subscribe_to_objects( const std::function<void(const fc::variant&)>& callback, const vector<object_id_type>& ids) bool database_api::subscribe_to_objects( const std::function<void(const fc::variant&)>& callback, const vector<object_id_type>& ids)
{ {

2
libraries/app/include/graphene/app/api.hpp
View file

@ -152,7 +152,7 @@ namespace graphene { namespace app {
* *
*/ */
std::map<string,full_account> get_full_accounts(std::function<void(const variant&)> callback, std::map<string,full_account> get_full_accounts(std::function<void(const variant&)> callback,
const vector<string>& names_or_ids); const vector<string>& names_or_ids, bool subscribe );
/** /**
* Stop receiving updates generated by get_full_accounts() * Stop receiving updates generated by get_full_accounts()