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

updating fc to support more threads

Browse source
This commit is contained in:
Daniel Larimer 2016-07-18 21:20:40 -04:00
parent c109dbecf3
commit e5ffc620ba
2 changed files with 39 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
src/asio.cpp
View file

@ -93,45 +93,51 @@ namespace fc {
struct default_io_service_scope struct default_io_service_scope
{ {
boost::asio::io_service* io; boost::asio::io_service* io;
boost::thread* asio_thread; std::vector<boost::thread*> asio_threads;
boost::asio::io_service::work* the_work; boost::asio::io_service::work* the_work;
default_io_service_scope() default_io_service_scope()
{ {
io = new boost::asio::io_service(); io = new boost::asio::io_service();
the_work = new boost::asio::io_service::work(*io); the_work = new boost::asio::io_service::work(*io);
asio_thread = new boost::thread( [=]() for( int i = 0; i < 8; ++i ) {
{ asio_threads.push_back( new boost::thread( [=]()
fc::thread::current().set_name("asio"); {
while (!io->stopped()) fc::thread::current().set_name("asio");
{ while (!io->stopped())
try {
{ try
io->run(); {
} io->run();
catch (const fc::exception& e) }
{ catch (const fc::exception& e)
elog("Caught unhandled exception in asio service loop: ${e}", ("e", e)); {
} elog("Caught unhandled exception in asio service loop: ${e}", ("e", e));
catch (const std::exception& e) }
{ catch (const std::exception& e)
elog("Caught unhandled exception in asio service loop: ${e}", ("e", e.what())); {
} elog("Caught unhandled exception in asio service loop: ${e}", ("e", e.what()));
catch (...) }
{ catch (...)
elog("Caught unhandled exception in asio service loop"); {
} elog("Caught unhandled exception in asio service loop");
} }
}); }
}) );
}
} }
void cleanup() void cleanup()
{ {
delete the_work; delete the_work;
io->stop(); io->stop();
asio_thread->join(); for( auto asio_thread : asio_threads ) {
asio_thread->join();
}
delete io; delete io;
delete asio_thread; for( auto asio_thread : asio_threads ) {
delete asio_thread;
}
} }
~default_io_service_scope() ~default_io_service_scope()
@ -140,9 +146,9 @@ namespace fc {
/// If cleanup is true, do not use the return value; it is a null reference /// If cleanup is true, do not use the return value; it is a null reference
boost::asio::io_service& default_io_service(bool cleanup) { boost::asio::io_service& default_io_service(bool cleanup) {
static default_io_service_scope fc_asio_service[4]; static default_io_service_scope fc_asio_service[1];
if (cleanup) { if (cleanup) {
for( int i = 0; i < 4; ++i ) for( int i = 0; i < 1; ++i )
fc_asio_service[i].cleanup(); fc_asio_service[i].cleanup();
} }
return *fc_asio_service[0].io; return *fc_asio_service[0].io;

5
src/network/http/websocket.cpp
View file

@ -204,6 +204,11 @@ namespace fc { namespace http {
}).wait(); }).wait();
}); });
_server.set_socket_init_handler( [&](websocketpp::connection_hdl hdl, boost::asio::ip::tcp::socket& s ) {
boost::asio::ip::tcp::no_delay option(true);
s.lowest_layer().set_option(option);
} );
_server.set_http_handler( [&]( connection_hdl hdl ){ _server.set_http_handler( [&]( connection_hdl hdl ){
_server_thread.async( [&](){ _server_thread.async( [&](){
auto current_con = std::make_shared<websocket_connection_impl<websocket_server_type::connection_ptr>>( _server.get_con_from_hdl(hdl) ); auto current_con = std::make_shared<websocket_connection_impl<websocket_server_type::connection_ptr>>( _server.get_con_from_hdl(hdl) );