Rooba
/
drogon
mirror of https://github.com/drogonframework/drogon.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add FastDbClient instances into the main event loop

This commit is contained in:
antao 2019-04-07 13:49:35 +08:00
parent 4ea05bc606
commit 6af398ff5a
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/src/HttpAppFrameworkImpl.cc
View File

@ -289,7 +289,6 @@ void HttpAppFrameworkImpl::run()
{
LOG_TRACE << "thread num=" << _threadNum;
auto loopThreadPtr = std::make_shared<EventLoopThread>("DrogonIoLoop");
//loopThreadPtr->run();
loopThreads.push_back(loopThreadPtr);
ioLoops.push_back(loopThreadPtr->getLoop());
for (auto const &listener : _listeners)
@ -301,7 +300,6 @@ void HttpAppFrameworkImpl::run()
"drogon");
if (std::get<2>(listener))
{
//enable ssl;
#ifdef USE_OPENSSL
auto cert = std::get<3>(listener);
auto key = std::get<4>(listener);
@ -332,7 +330,6 @@ void HttpAppFrameworkImpl::run()
{
LOG_TRACE << "thread num=" << _threadNum;
auto loopThreadPtr = std::make_shared<EventLoopThread>("DrogonListeningLoop");
//loopThreadPtr->run();
loopThreads.push_back(loopThreadPtr);
auto ip = std::get<0>(listener);
bool isIpv6 = ip.find(":") == std::string::npos ? false : true;
@ -341,7 +338,6 @@ void HttpAppFrameworkImpl::run()
"drogon");
if (std::get<2>(listener))
{
//enable ssl;
#ifdef USE_OPENSSL
auto cert = std::get<3>(listener);
auto key = std::get<4>(listener);
@ -365,13 +361,6 @@ void HttpAppFrameworkImpl::run()
serverPtr->setConnectionCallback(std::bind(&HttpAppFrameworkImpl::onConnection, this, _1));
serverPtr->kickoffIdleConnections(_idleConnectionTimeout);
serverPtr->start();
/// Use std::promise to ensure that IO loops have been created
// std::promise<int> pro;
// auto f = pro.get_future();
// serverPtr->getLoop()->runInLoop([&pro]() {
// pro.set_value(1);
// });
// f.get();
auto serverIoLoops = serverPtr->getIoLoops();
for (auto serverIoLoop : serverIoLoops)
{
@ -382,7 +371,10 @@ void HttpAppFrameworkImpl::run()
#endif
#if USE_ORM
// A fast database client instance should be created in the main event loop, so put the main loop into ioLoops.
ioLoops.push_back(getLoop());
createDbClients(ioLoops);
ioLoops.pop_back();
#endif
_httpCtrlsRouter.init(ioLoops);
_httpSimpleCtrlsRouter.init(ioLoops);

2
orm_lib/src/DbClientLockFree.cc
View File

@ -47,7 +47,7 @@ DbClientLockFree::DbClientLockFree(const std::string &connInfo, trantor::EventLo
LOG_TRACE << "type=" << (int)type;
if (type == ClientType::PostgreSQL)
{
_loop->runInLoop([this]() {
_loop->queueInLoop([this]() {
for (size_t i = 0; i < _connectionNum; i++)
_connectionHolders.push_back(newConnection());
});