From f0d9a01bccdaeb466c12c92057914bbfef59526c Mon Sep 17 00:00:00 2001 From: Antonin Kral Date: Thu, 15 Dec 2011 09:35:47 +0100 Subject: Imported Upstream version 2.0.2 --- scripting/engine.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'scripting/engine.cpp') diff --git a/scripting/engine.cpp b/scripting/engine.cpp index 1982940..7d13cb7 100644 --- a/scripting/engine.cpp +++ b/scripting/engine.cpp @@ -26,7 +26,7 @@ namespace mongo { int Scope::_numScopes = 0; - Scope::Scope() : _localDBName("") , _loadedVersion(0) { + Scope::Scope() : _localDBName("") , _loadedVersion(0), _numTimeUsed(0) { _numScopes++; } @@ -284,7 +284,8 @@ namespace mongo { void done( const string& pool , Scope * s ) { scoped_lock lk( _mutex ); list & l = _pools[pool]; - if ( l.size() > 10 ) { + // make we dont keep to many contexts, or use them for too long + if ( l.size() > 10 || s->getTimeUsed() > 100 ) { delete s; } else { @@ -302,6 +303,7 @@ namespace mongo { Scope * s = l.back(); l.pop_back(); s->reset(); + s->incTimeUsed(); return s; } -- cgit v1.2.3