Skip to content

Commit 789b09e

Browse files
author
Tad Marshall
committed
Revert "SERVER-7617 Enter and Exit our scope's Isolate in V8"
This reverts commit a2e429d.
1 parent ae33d54 commit 789b09e

File tree

4 files changed

+0
-16
lines changed

4 files changed

+0
-16
lines changed

src/mongo/scripting/engine.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,6 @@ namespace mongo {
287287
scoped_lock lk( _mutex );
288288
list<Scope*> & l = _pools[pool];
289289
bool oom = s->hasOutOfMemoryException();
290-
s->exit();
291290

292291
// do not keep too many contexts, or use them for too long
293292
if ( l.size() > 10 || s->getTimeUsed() > 10 || oom ) {
@@ -315,7 +314,6 @@ namespace mongo {
315314
l.pop_back();
316315
s->reset();
317316
s->incTimeUsed();
318-
s->enter();
319317
return s;
320318
}
321319

@@ -357,7 +355,6 @@ namespace mongo {
357355
// this means that the Scope was killed from a different thread
358356
// for example a cursor got timed out that has a $where clause
359357
LOG(3) << "warning: scopeCache is empty!" << endl;
360-
_real->exit();
361358
delete _real;
362359
_real = 0;
363360
}
@@ -476,7 +473,6 @@ namespace mongo {
476473
Scope * s = scopeCache->get( pool );
477474
if ( ! s ) {
478475
s = newScope();
479-
s->enter();
480476
}
481477

482478
auto_ptr<Scope> p;

src/mongo/scripting/engine.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ namespace mongo {
3434
Scope();
3535
virtual ~Scope();
3636

37-
virtual void enter() {}
38-
virtual void exit() {}
3937
virtual void reset() = 0;
4038
virtual void init( const BSONObj * data ) = 0;
4139
void init( const char * data ) {

src/mongo/scripting/engine_v8.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -496,14 +496,6 @@ namespace mongo {
496496
_isolate->Dispose();
497497
}
498498

499-
void V8Scope::enter() {
500-
_isolate->Enter();
501-
}
502-
503-
void V8Scope::exit() {
504-
_isolate->Exit();
505-
}
506-
507499
bool V8Scope::hasOutOfMemoryException() {
508500
if (!_context.IsEmpty())
509501
return _context->HasOutOfMemoryException();

src/mongo/scripting/engine_v8.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,6 @@ namespace mongo {
9797
V8Scope( V8ScriptEngine * engine );
9898
~V8Scope();
9999

100-
virtual void enter();
101-
virtual void exit();
102100
virtual void reset();
103101
virtual void init( const BSONObj * data );
104102

0 commit comments

Comments
 (0)