From bef9819190148538e9375357e50ab6bc2f191b1a Mon Sep 17 00:00:00 2001 From: "bmeurer@chromium.org" Date: Thu, 24 Oct 2013 12:16:00 +0000 Subject: [PATCH] Revert "Fix shared library build after r17368." and "Add performance.now() to the d8 shell.". This reverts commit r17372 and r17368 for breaking the shared library build. TBR=hpayer@chromium.org Review URL: https://codereview.chromium.org/40043002 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@17374 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/d8.cc | 17 ----------- src/d8.h | 3 -- test/mjsunit/d8-performance-now.js | 60 -------------------------------------- test/mjsunit/mjsunit.status | 4 --- 4 files changed, 84 deletions(-) delete mode 100644 test/mjsunit/d8-performance-now.js diff --git a/src/d8.cc b/src/d8.cc index 357c8a4..96407a8 100644 --- a/src/d8.cc +++ b/src/d8.cc @@ -160,7 +160,6 @@ i::OS::MemoryMappedFile* Shell::counters_file_ = NULL; CounterCollection Shell::local_counters_; CounterCollection* Shell::counters_ = &local_counters_; i::Mutex Shell::context_mutex_; -const i::TimeTicks Shell::kInitialTicks = i::TimeTicks::HighResolutionNow(); Persistent Shell::utility_context_; #endif // V8_SHARED @@ -290,15 +289,6 @@ int PerIsolateData::RealmFind(Handle context) { } -#ifndef V8_SHARED -// performance.now() returns a time stamp as double, measured in milliseconds. -void Shell::PerformanceNow(const v8::FunctionCallbackInfo& args) { - i::TimeDelta delta = i::TimeTicks::HighResolutionNow() - kInitialTicks; - args.GetReturnValue().Set(delta.InMillisecondsF()); -} -#endif // V8_SHARED - - // Realm.current() returns the index of the currently active realm. void Shell::RealmCurrent(const v8::FunctionCallbackInfo& args) { Isolate* isolate = args.GetIsolate(); @@ -882,13 +872,6 @@ Handle Shell::CreateGlobalTemplate(Isolate* isolate) { RealmSharedGet, RealmSharedSet); global_template->Set(String::New("Realm"), realm_template); -#ifndef V8_SHARED - Handle performance_template = ObjectTemplate::New(); - performance_template->Set(String::New("now"), - FunctionTemplate::New(PerformanceNow)); - global_template->Set(String::New("performance"), performance_template); -#endif // V8_SHARED - #if !defined(V8_SHARED) && !defined(_WIN32) && !defined(_WIN64) Handle os_templ = ObjectTemplate::New(); AddOSMethods(os_templ); diff --git a/src/d8.h b/src/d8.h index 411dfdd..42013e8 100644 --- a/src/d8.h +++ b/src/d8.h @@ -302,8 +302,6 @@ class Shell : public i::AllStatic { Handle command); static void DispatchDebugMessages(); #endif // ENABLE_DEBUGGER_SUPPORT - - static void PerformanceNow(const v8::FunctionCallbackInfo& args); #endif // V8_SHARED static void RealmCurrent(const v8::FunctionCallbackInfo& args); @@ -395,7 +393,6 @@ class Shell : public i::AllStatic { static CounterCollection* counters_; static i::OS::MemoryMappedFile* counters_file_; static i::Mutex context_mutex_; - static const i::TimeTicks kInitialTicks; static Counter* GetCounter(const char* name, bool is_histogram); static void InstallUtilityScript(Isolate* isolate); diff --git a/test/mjsunit/d8-performance-now.js b/test/mjsunit/d8-performance-now.js deleted file mode 100644 index 83bd1d8..0000000 --- a/test/mjsunit/d8-performance-now.js +++ /dev/null @@ -1,60 +0,0 @@ -// Copyright 2013 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. - -// Flags: --allow-natives-syntax - -// Test the performance.now() function of d8. This test only makes sense with -// d8. - -// Don't run this test in gc stress mode. Time differences may be long -// due to garbage collections. -%SetFlags("--gc-interval=-1"); -%SetFlags("--nostress-compaction"); - -(function run() { - var start_test = performance.now(); - // Let the retry run for maximum 100ms to reduce flakiness. - for (var start = performance.now(); - start - start_test < 100; - start = performance.now()) { - var end = performance.now(); - assertTrue(start >= start_test); - assertTrue(end >= start); - while (end - start == 0) { - var next = performance.now(); - assertTrue(next >= end); - end = next; - } - if (end - start <= 1) { - // Found (sub-)millisecond granularity. - return; - } else { - print("Timer difference too big: " + (end - start) + "ms"); - } - } - assertTrue(false); -})() diff --git a/test/mjsunit/mjsunit.status b/test/mjsunit/mjsunit.status index 5ba166f..a7939d7 100644 --- a/test/mjsunit/mjsunit.status +++ b/test/mjsunit/mjsunit.status @@ -59,10 +59,6 @@ 'regress/regress-crbug-217858': [PASS, ['mode == debug', SKIP]], ############################################################################## - # No need to waste time for this test. - 'd8-performance-now': [PASS, NO_VARIANTS], - - ############################################################################## # These use a built-in that's only present in debug mode. They take # too long to run in debug mode on ARM and MIPS. 'fuzz-natives-part*': [PASS, ['mode == release or arch == arm or arch == android_arm or arch == mipsel', SKIP]], -- 2.7.4