mirrors/mongodb
mirrors/mongodb
0
0
Fork 0
mirror of https://github.com/mongodb/mongo.git synced 2024-11-29 16:47:28 +01:00
Code Issues Releases Activity

SERVER-470 fix some v8 locking issues

Browse Source
This commit is contained in:
Aaron 2009-12-22 17:56:57 -08:00
parent 980006020d
commit 81cf93cf8a
5 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripting/engine.h
View File

@ -133,7 +133,7 @@ namespace mongo {
auto_ptr<Scope> getPooledScope( const string& pool );
void threadDone();
class Unlocker {};
struct Unlocker { virtual ~Unlocker() {} };
virtual auto_ptr<Unlocker> newThreadUnlocker() { return auto_ptr< Unlocker >( new Unlocker ); }
};

6
scripting/engine_v8.h
View File

@ -69,6 +69,8 @@ namespace mongo {
void gc();
Handle< Context > context() const { return _context; }
private:
void _startCall();
@ -76,6 +78,10 @@ namespace mongo {
static Handle< Value > loadCallback( const Arguments &args );
// doesn't matter how many lockers exist globally for the main thread
// we rely on Unlocker objects to release the v8 lock.
v8::Locker _locker;
V8ScriptEngine * _engine;
HandleScope _handleScope;

4
scripting/v8_db.cpp
View File

@ -288,8 +288,10 @@ namespace mongo {
bool multi = args.Length() > 4 && args[4]->IsBoolean() && args[4]->ToBoolean()->Value();
try {
BSONObj q1 = v8ToMongo( q );
BSONObj o1 = v8ToMongo( o );
v8::Unlocker u;
conn->update( ns , v8ToMongo( q ) , v8ToMongo( o ) , upsert, multi );
conn->update( ns , q1 , o1 , upsert, multi );
}
catch ( ... ){
return v8::ThrowException( v8::String::New( "socket error on remove" ) );

32
scripting/v8_utils.cpp
View File

@ -142,15 +142,15 @@ namespace mongo {
cout << try_catch << endl;
}
v8::Handle< v8::Context > baseContext_;
Handle< Context > baseContext_;
class JSThreadConfig {
public:
JSThreadConfig( const Arguments &args ) : started_(), done_() {
jsassert( args.Length() > 0, "need at least one argument" );
jsassert( args[ 0 ]->IsFunction(), "first argument must be a function" );
Local< Function > f = Function::Cast( *args[ 0 ] );
f_ = Persistent< Function >::New( f );
Local< v8::Function > f = v8::Function::Cast( *args[ 0 ] );
f_ = Persistent< v8::Function >::New( f );
for( int i = 1; i < args.Length(); ++i )
args_.push_back( Persistent< Value >::New( args[ i ] ) );
}
@ -199,35 +199,35 @@ namespace mongo {
bool started_;
bool done_;
Persistent< Function > f_;
Persistent< v8::Function > f_;
vector< Persistent< Value > > args_;
auto_ptr< boost::thread > thread_;
Persistent< Value > returnData_;
};
Handle< Value > ThreadInit( const Arguments &args ) {
Handle<Object> it = args.This();
Handle<v8::Object> it = args.This();
// NOTE I believe the passed JSThreadConfig will never be freed. If this
// policy is changed, JSThread may no longer be able to store JSThreadConfig
// by reference.
it->Set( String::New( "_JSThreadConfig" ), External::New( new JSThreadConfig( args ) ) );
return Undefined();
it->Set( v8::String::New( "_JSThreadConfig" ), External::New( new JSThreadConfig( args ) ) );
return v8::Undefined();
}
JSThreadConfig *thisConfig( const Arguments &args ) {
Local< External > c = External::Cast( *(args.This()->Get( String::New( "_JSThreadConfig" ) ) ) );
Local< External > c = External::Cast( *(args.This()->Get( v8::String::New( "_JSThreadConfig" ) ) ) );
JSThreadConfig *config = (JSThreadConfig *)( c->Value() );
return config;
}
Handle< Value > ThreadStart( const Arguments &args ) {
thisConfig( args )->start();
return Undefined();
return v8::Undefined();
}
Handle< Value > ThreadJoin( const Arguments &args ) {
thisConfig( args )->join();
return Undefined();
return v8::Undefined();
}
Handle< Value > ThreadReturnData( const Arguments &args ) {
@ -240,16 +240,16 @@ namespace mongo {
Local<v8::Object> o = args[0]->ToObject();
o->Set( String::New( "init" ) , FunctionTemplate::New( ThreadInit )->GetFunction() );
o->Set( String::New( "start" ) , FunctionTemplate::New( ThreadStart )->GetFunction() );
o->Set( String::New( "join" ) , FunctionTemplate::New( ThreadJoin )->GetFunction() );
o->Set( String::New( "returnData" ) , FunctionTemplate::New( ThreadReturnData )->GetFunction() );
o->Set( v8::String::New( "init" ) , FunctionTemplate::New( ThreadInit )->GetFunction() );
o->Set( v8::String::New( "start" ) , FunctionTemplate::New( ThreadStart )->GetFunction() );
o->Set( v8::String::New( "join" ) , FunctionTemplate::New( ThreadJoin )->GetFunction() );
o->Set( v8::String::New( "returnData" ) , FunctionTemplate::New( ThreadReturnData )->GetFunction() );
return v8::Undefined();
}
void installFork( Handle<v8::Object>& global, Handle<v8::Context> &context ) {
baseContext_ = context; // only expect to use this in shell
void installFork( v8::Handle< v8::Object > &global, v8::Handle< v8::Context > &context ) {
baseContext_ = context;
global->Set( v8::String::New( "_threadInject" ), FunctionTemplate::New( ThreadInject )->GetFunction() );
}

3
scripting/v8_utils.h
View File

@ -40,6 +40,7 @@ namespace mongo {
std::string toSTLString( const v8::Handle<v8::Value> & o );
std::string toSTLString( const v8::TryCatch * try_catch );
void installFork( v8::Handle<v8::Object>& global, v8::Handle<v8::Context> &context );
class V8Scope;
void installFork( v8::Handle< v8::Object > &global, v8::Handle< v8::Context > &context );
}