Revision: 17374
Author: bmeu...@chromium.org
Date: Thu Oct 24 12:16:00 2013 UTC
Log: 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=hpa...@chromium.org
Review URL: https://codereview.chromium.org/40043002
http://code.google.com/p/v8/source/detail?r=17374
Deleted:
/branches/bleeding_edge/test/mjsunit/d8-performance-now.js
Modified:
/branches/bleeding_edge/src/d8.cc
/branches/bleeding_edge/src/d8.h
/branches/bleeding_edge/test/mjsunit/mjsunit.status
=======================================
--- /branches/bleeding_edge/test/mjsunit/d8-performance-now.js Thu Oct 24
10:48:18 2013 UTC
+++ /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);
-})()
=======================================
--- /branches/bleeding_edge/src/d8.cc Thu Oct 24 11:59:09 2013 UTC
+++ /branches/bleeding_edge/src/d8.cc Thu Oct 24 12:16:00 2013 UTC
@@ -160,7 +160,6 @@
CounterCollection Shell::local_counters_;
CounterCollection* Shell::counters_ = &local_counters_;
i::Mutex Shell::context_mutex_;
-const i::TimeTicks Shell::kInitialTicks =
i::TimeTicks::HighResolutionNow();
Persistent<Context> Shell::utility_context_;
#endif // V8_SHARED
@@ -290,15 +289,6 @@
}
-#ifndef V8_SHARED
-// performance.now() returns a time stamp as double, measured in
milliseconds.
-void Shell::PerformanceNow(const v8::FunctionCallbackInfo<v8::Value>&
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<v8::Value>& args) {
Isolate* isolate = args.GetIsolate();
@@ -882,13 +872,6 @@
RealmSharedGet, RealmSharedSet);
global_template->Set(String::New("Realm"), realm_template);
-#ifndef V8_SHARED
- Handle<ObjectTemplate> 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<ObjectTemplate> os_templ = ObjectTemplate::New();
AddOSMethods(os_templ);
=======================================
--- /branches/bleeding_edge/src/d8.h Thu Oct 24 11:59:09 2013 UTC
+++ /branches/bleeding_edge/src/d8.h Thu Oct 24 12:16:00 2013 UTC
@@ -302,8 +302,6 @@
Handle<String> command);
static void DispatchDebugMessages();
#endif // ENABLE_DEBUGGER_SUPPORT
-
- static void PerformanceNow(const v8::FunctionCallbackInfo<v8::Value>&
args);
#endif // V8_SHARED
static void RealmCurrent(const v8::FunctionCallbackInfo<v8::Value>&
args);
@@ -395,7 +393,6 @@
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);
=======================================
--- /branches/bleeding_edge/test/mjsunit/mjsunit.status Thu Oct 24 10:48:18
2013 UTC
+++ /branches/bleeding_edge/test/mjsunit/mjsunit.status Thu Oct 24 12:16:00
2013 UTC
@@ -58,10 +58,6 @@
# Too slow in debug mode for GC stress mode.
'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.
--
--
v8-dev mailing list
v8-dev@googlegroups.com
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to v8-dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.
