Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack

This commit is contained in:
jsteemann 2016-01-05 00:25:24 +01:00
parent a6cb463e06 8391084c15
commit 6745a5048e
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arangod/V8Server/ApplicationV8.cpp
View File

@ -658,8 +658,9 @@ void ApplicationV8::collectGarbage () {
! _dirtyContexts.empty()) {
context = _dirtyContexts.back();
_dirtyContexts.pop_back();
if (context->_numExecutions < 10 && ! context->_hasActiveExternals) {
// don't collect this one
if (context->_numExecutions < 50 && ! context->_hasActiveExternals) {
// don't collect this one yet. it doesn't have externals, so there
// is urge for garbage collection
_freeContexts.emplace_back(context);
context = nullptr;
}
@ -689,8 +690,8 @@ void ApplicationV8::collectGarbage () {
gc->updateGcStamp(lastGc);
if (context != nullptr) {
// LOG_TRACE("will collect now: %d, numExecutions: %d, hasActive: %d", (int) context->_id, (int) context->_numExecutions, (int) context->_hasActiveExternals);
LOG_TRACE("collecting V8 garbage");
LOG_TRACE("collecting V8 garbage in context #%d, numExecutions: %d, hasActive: %d, wasDirty: %d",
(int) context->_id, (int) context->_numExecutions, (int) context->_hasActiveExternals, (int) wasDirty);
bool hasActiveExternals = false;
auto isolate = context->isolate;
TRI_ASSERT(context->_locker == nullptr);