Peerplays_Blockchain/peerplays-fc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

json_connection: save and cancel a future

Browse source 
Hopefully this will fix a crash on exit.
This commit is contained in:
Nathan Hourt 2015-01-30 10:23:33 -05:00
parent 633c889ce3
commit ac197311ca
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/rpc/json_connection.cpp
View file

@ -21,6 +21,7 @@ namespace fc { namespace rpc {
fc::buffered_ostream_ptr _out; fc::buffered_ostream_ptr _out;
fc::future<void> _done; fc::future<void> _done;
fc::future<void> _handle_message_future;
bool _eof; bool _eof;
uint64_t _next_id; uint64_t _next_id;
@ -204,7 +205,7 @@ namespace fc { namespace rpc {
variant v = json::from_stream(*_in); variant v = json::from_stream(*_in);
///ilog( "input: ${in}", ("in", v ) ); ///ilog( "input: ${in}", ("in", v ) );
//wlog( "recv: ${line}", ("line", line) ); //wlog( "recv: ${line}", ("line", line) );
fc::async([=](){ handle_message(v.get_object()); }, "json_connection handle_message"); _handle_message_future = fc::async([=](){ handle_message(v.get_object()); }, "json_connection handle_message");
} }
} }
catch ( eof_exception& eof ) catch ( eof_exception& eof )
@ -241,6 +242,8 @@ namespace fc { namespace rpc {
{ {
try try
{ {
if( my->_handle_message_future.valid() && !my->_handle_message_future.ready() )
my->_handle_message_future.cancel_and_wait(__FUNCTION__);
if( my->_done.valid() && !my->_done.ready() ) if( my->_done.valid() && !my->_done.ready() )
{ {
my->_done.cancel("json_connection is destructing"); my->_done.cancel("json_connection is destructing");