diff options
Diffstat (limited to 'chromium/v8/src/extensions/gc-extension.cc')
| -rw-r--r-- | chromium/v8/src/extensions/gc-extension.cc | 56 |
1 files changed, 8 insertions, 48 deletions
diff --git a/chromium/v8/src/extensions/gc-extension.cc b/chromium/v8/src/extensions/gc-extension.cc index b8442c1bf85..e3c2b1d3709 100644 --- a/chromium/v8/src/extensions/gc-extension.cc +++ b/chromium/v8/src/extensions/gc-extension.cc @@ -1,32 +1,9 @@ // Copyright 2010 the V8 project authors. All rights reserved. -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following -// disclaimer in the documentation and/or other materials provided -// with the distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived -// from this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. -#include "gc-extension.h" -#include "platform.h" +#include "src/extensions/gc-extension.h" +#include "src/platform.h" namespace v8 { namespace internal { @@ -35,31 +12,14 @@ namespace internal { v8::Handle<v8::FunctionTemplate> GCExtension::GetNativeFunctionTemplate( v8::Isolate* isolate, v8::Handle<v8::String> str) { - return v8::FunctionTemplate::New(GCExtension::GC); + return v8::FunctionTemplate::New(isolate, GCExtension::GC); } void GCExtension::GC(const v8::FunctionCallbackInfo<v8::Value>& args) { - i::Isolate* isolate = reinterpret_cast<i::Isolate*>(args.GetIsolate()); - if (args[0]->BooleanValue()) { - isolate->heap()->CollectGarbage(NEW_SPACE, "gc extension"); - } else { - isolate->heap()->CollectAllGarbage(Heap::kNoGCFlags, "gc extension"); - } -} - - -void GCExtension::Register() { - static char buffer[50]; - Vector<char> temp_vector(buffer, sizeof(buffer)); - if (FLAG_expose_gc_as != NULL && strlen(FLAG_expose_gc_as) != 0) { - OS::SNPrintF(temp_vector, "native function %s();", FLAG_expose_gc_as); - } else { - OS::SNPrintF(temp_vector, "native function gc();"); - } - - static GCExtension gc_extension(buffer); - static v8::DeclareExtension declaration(&gc_extension); + args.GetIsolate()->RequestGarbageCollectionForTesting( + args[0]->BooleanValue() ? v8::Isolate::kMinorGarbageCollection + : v8::Isolate::kFullGarbageCollection); } } } // namespace v8::internal |