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

FC Updates from BitShares and myself #21

Closed
nathanielhourt wants to merge 687 commits from dapp-support into latest-fc
pull from: dapp-support
merge into: Peerplays_Blockchain:latest-fc
Conversation 4 Commits 687 Files changed 314 +25 -24
1 changed files with 25 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 7e612bee5d - Show all commits

49
src/rpc/cli.cpp
View file

@ -54,29 +54,6 @@ void cli::send_notice( uint64_t callback_id, variants args /* = variants() */ )
FC_ASSERT(false);
}
void cli::stop()
{
cancel();
_run_complete.wait();
}
void cli::cancel()
{
_run_complete.cancel();
#ifdef HAVE_EDITLINE
if( _getline_thread )
{
_getline_thread->signal(SIGINT);
_getline_thread = nullptr;
}
#endif
}
void cli::wait()
{
_run_complete.wait();
}
void cli::format_result( const string& method, std::function<string(variant,const variants&)> formatter)
{
_result_formatters[method] = formatter;
@ -267,7 +244,7 @@ static int interruptible_getc(void)
if( r == -1 && errno == EINTR )
cli_quitting = true;
return r == 1 ? c : EOF;
return r == 1 && !cli_quitting ? c : EOF;
}
void cli::start()
@ -292,6 +269,30 @@ void cli::start()
_run_complete = fc::async( [this](){ run(); } );
}
void cli::cancel()
{
_run_complete.cancel();
#ifdef HAVE_EDITLINE
cli_quitting = true;
if( _getline_thread )
{
_getline_thread->signal(SIGINT);
_getline_thread = nullptr;
}
#endif
}
void cli::stop()
{
cancel();
_run_complete.wait();
}
void cli::wait()
{
_run_complete.wait();
}
/***
* @brief Read input from the user
* @param prompt the prompt to display