database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-29 08:21:15 +03:00
Code Activity

Merge branch 'develop-1.1' into develop-1.2-merge-up-20190517

Browse Source
This commit is contained in:
Andrew Hutchings
2019-05-17 20:43:49 +01:00
parent 8afc3f85d3 4628346746
commit ea2ff9cd11
4 changed files with 105 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
utils/threadpool/threadpool.cpp
View File

@ -409,6 +409,24 @@ void ThreadPool::beginThread() throw()
--fIssued;
--waitingFunctorsSize;
fWaitingFunctors.erase(todo);
if (fDebug)
{
ostringstream oss;
oss << "Ending thread " << " on " << fName
<< " max " << fMaxThreads
<< " queue " << fQueueSize
<< " threads " << fThreadCount
<< " running " << fIssued
<< " waiting " << (waitingFunctorsSize - fIssued)
<< " total " << waitingFunctorsSize;
logging::Message::Args args;
logging::Message message(0);
args.add(oss.str());
message.format( args );
logging::LoggingID lid(22);
logging::MessageLog ml(lid);
ml.logWarningMessage( message );
}
}
timeout = boost::get_system_time() + boost::posix_time::minutes(10);
@ -536,6 +554,8 @@ void ThreadPoolMonitor::operator()()
<< setw(4) << tv.tv_usec / 100
<< " Name " << fPool->fName
<< " Active " << fPool->waitingFunctorsSize
<< " running " << fPool->fIssued
<< " waiting " << (fPool->waitingFunctorsSize - fPool->fIssued)
<< " ThdCnt " << fPool->fThreadCount
<< " Max " << fPool->fMaxThreads
<< " Q " << fPool->fQueueSize