diff options
| author | Aaron <aaron@10gen.com> | 2010-03-09 23:59:10 -0800 |
|---|---|---|
| committer | Aaron <aaron@10gen.com> | 2010-03-09 23:59:10 -0800 |
| commit | 714ec2fdc8e9c8dc1c2cdf5486afdbc185beef14 (patch) | |
| tree | 15fa091882a0f5aebed372b6f6742f422a67aa36 /scripting | |
| parent | c4b55b2957e0ac13b918212fff72656c448532f9 (diff) | |
| download | mongo-714ec2fdc8e9c8dc1c2cdf5486afdbc185beef14.tar.gz | |
SERVER-695 don't destroy static global mutexes
Diffstat (limited to 'scripting')
| -rw-r--r-- | scripting/engine.cpp | 6 | ||||
| -rw-r--r-- | scripting/engine_spidermonkey.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/scripting/engine.cpp b/scripting/engine.cpp index 0dff413dbde..cc245b66a47 100644 --- a/scripting/engine.cpp +++ b/scripting/engine.cpp @@ -243,7 +243,7 @@ namespace mongo { } void done( const string& pool , Scope * s ){ - boostlock lk( _mutex ); + scoped_lock lk( _mutex ); list<Scope*> & l = _pools[pool]; if ( l.size() > 10 ){ delete s; @@ -255,7 +255,7 @@ namespace mongo { } Scope * get( const string& pool ){ - boostlock lk( _mutex ); + scoped_lock lk( _mutex ); list<Scope*> & l = _pools[pool]; if ( l.size() == 0 ) return 0; @@ -283,7 +283,7 @@ namespace mongo { private: PoolToScopes _pools; - boost::mutex _mutex; + mongo::mutex _mutex; int _magic; }; diff --git a/scripting/engine_spidermonkey.cpp b/scripting/engine_spidermonkey.cpp index 959ed856a0d..19e3e852817 100644 --- a/scripting/engine_spidermonkey.cpp +++ b/scripting/engine_spidermonkey.cpp @@ -46,7 +46,7 @@ namespace mongo { boost::thread_specific_ptr<SMScope> currentScope( dontDeleteScope ); boost::recursive_mutex &smmutex = *( new boost::recursive_mutex ); -#define smlock recursive_boostlock ___lk( smmutex ); +#define smlock recursive_scoped_lock ___lk( smmutex ); #define GETHOLDER(x,o) ((BSONHolder*)JS_GetPrivate( x , o )) |