diff options
author | Julien Gilli <julien.gilli@joyent.com> | 2015-01-13 12:39:14 -0800 |
---|---|---|
committer | Julien Gilli <julien.gilli@joyent.com> | 2015-01-13 12:39:14 -0800 |
commit | fbfe562d71ae8d8f8bbf627808c755e513e4e905 (patch) | |
tree | 1a50dcd1c37869cbe19b2b3ba56d4a9fcc4de725 /deps | |
parent | 21c2636c9a7ee3473addcee0a6cd608e8952be79 (diff) | |
parent | 31051e5c7b253b6a0006b536188fc0494bd6e082 (diff) | |
download | node-fbfe562d71ae8d8f8bbf627808c755e513e4e905.tar.gz |
Merge remote-tracking branch 'upstream/v0.10' into v0.12
Conflicts:
deps/v8/src/debug-debugger.js
deps/v8/src/mirror-debugger.js
deps/v8/src/platform-freebsd.cc
deps/v8/src/platform-linux.cc
deps/v8/src/platform-macos.cc
deps/v8/src/platform-openbsd.cc
deps/v8/src/platform-posix.cc
deps/v8/src/platform-solaris.cc
deps/v8/tools/gyp/v8.gyp
Diffstat (limited to 'deps')
-rw-r--r-- | deps/v8/src/base/platform/platform-posix.cc | 5 | ||||
-rw-r--r-- | deps/v8/src/debug-debugger.js | 5 | ||||
-rw-r--r-- | deps/v8/src/mirror-debugger.js | 9 | ||||
-rw-r--r-- | deps/v8/tools/gyp/v8.gyp | 2 |
4 files changed, 9 insertions, 12 deletions
diff --git a/deps/v8/src/base/platform/platform-posix.cc b/deps/v8/src/base/platform/platform-posix.cc index 771634e24..a5128d0db 100644 --- a/deps/v8/src/base/platform/platform-posix.cc +++ b/deps/v8/src/base/platform/platform-posix.cc @@ -608,9 +608,8 @@ void Thread::Join() { void Thread::YieldCPU() { - int result = sched_yield(); - DCHECK_EQ(0, result); - USE(result); + const timespec delay = { 0, 1 }; + nanosleep(&delay, NULL); } diff --git a/deps/v8/src/debug-debugger.js b/deps/v8/src/debug-debugger.js index 480432d5e..f24a14a79 100644 --- a/deps/v8/src/debug-debugger.js +++ b/deps/v8/src/debug-debugger.js @@ -1,7 +1,6 @@ // Copyright 2012 the V8 project authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -"use strict"; // Default number of frames to include in the response to backtrace request. var kDefaultBacktraceLength = 10; @@ -671,7 +670,7 @@ Debug.setBreakPointByScriptIdAndPosition = function(script_id, position, condition, enabled, opt_position_alignment) { - var break_point = MakeBreakPoint(position); + break_point = MakeBreakPoint(position); break_point.setCondition(condition); if (!enabled) { break_point.disable(); @@ -738,7 +737,7 @@ Debug.clearBreakPoint = function(break_point_number) { Debug.clearAllBreakPoints = function() { for (var i = 0; i < break_points.length; i++) { - var break_point = break_points[i]; + break_point = break_points[i]; %ClearBreakPoint(break_point); } break_points = []; diff --git a/deps/v8/src/mirror-debugger.js b/deps/v8/src/mirror-debugger.js index bfc1ac95a..6da847fd5 100644 --- a/deps/v8/src/mirror-debugger.js +++ b/deps/v8/src/mirror-debugger.js @@ -1,7 +1,6 @@ // Copyright 2006-2012 the V8 project authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -"use strict"; // Handle id counters. var next_handle_ = 0; @@ -45,7 +44,7 @@ function MakeMirror(value, opt_transient) { // Look for non transient mirrors in the mirror cache. if (!opt_transient && mirror_cache_enabled_) { - for (var id in mirror_cache_) { + for (id in mirror_cache_) { mirror = mirror_cache_[id]; if (mirror.value() === value) { return mirror; @@ -1247,11 +1246,11 @@ ErrorMirror.prototype.toText = function() { // Use the same text representation as in messages.js. var text; try { - text = %_CallFunction(this.value_, builtins.ErrorToString); + str = %_CallFunction(this.value_, builtins.ErrorToString); } catch (e) { - text = '#<Error>'; + str = '#<Error>'; } - return text; + return str; }; diff --git a/deps/v8/tools/gyp/v8.gyp b/deps/v8/tools/gyp/v8.gyp index d90772523..c7eb87514 100644 --- a/deps/v8/tools/gyp/v8.gyp +++ b/deps/v8/tools/gyp/v8.gyp @@ -1250,7 +1250,7 @@ ['OS=="solaris"', { 'link_settings': { 'libraries': [ - '-lnsl', + '-lnsl -lrt', ]}, 'sources': [ '../../src/base/platform/platform-solaris.cc', |