Merge remote-tracking branch 'upstream/v0.10' into v0.12

Conflicts:
	ChangeLog
	Makefile
	deps/uv/ChangeLog
	deps/uv/build.mk
	deps/uv/src/unix/darwin.c
	deps/uv/src/unix/getaddrinfo.c
	deps/uv/src/version.c
	deps/v8/src/checks.h
	deps/v8/src/isolate.h
	lib/cluster.js
	lib/module.js
	lib/timers.js
	lib/tls.js
	src/node_version.h

5 files changed, 203 insertions, 24 deletions

diff --git a/test/common.js b/test/common.js
index 40f7072832..6301db9eb3 100644
--- a/test/common.js
+++ b/test/common.js
@@ -39,6 +39,13 @@ if (process.platform === 'win32') {
 if (!fs.existsSync(exports.opensslCli))
   exports.opensslCli = false;
 
+if (process.platform === 'win32') {
+  exports.faketimeCli = false;
+} else {
+  exports.faketimeCli = path.join(__dirname, "..", "tools", "faketime", "src",
+    "faketime");
+}
+
 var util = require('util');
 for (var i in util) exports[i] = util[i];
 //for (var i in exports) global[i] = exports[i];
diff --git a/test/simple/test-child-process-fork-dgram.js b/test/simple/test-child-process-fork-dgram.js
index 769d0fd617..1c4e9acc3b 100644
--- a/test/simple/test-child-process-fork-dgram.js
+++ b/test/simple/test-child-process-fork-dgram.js
@@ -19,6 +19,20 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+/*
+ * The purpose of this test is to make sure that when forking a process,
+ * sending a fd representing a UDP socket to the child and sending messages
+ * to this endpoint, these messages are distributed to the parent and the
+ * child process.
+ *
+ * Because it's not really possible to predict how the messages will be
+ * distributed among the parent and the child processes, we keep sending
+ * messages until both the parent and the child received at least one
+ * message. The worst case scenario is when either one never receives
+ * a message. In this case the test runner will timeout after 60 secs
+ * and the test will fail.
+ */
+
 var dgram = require('dgram');
 var fork = require('child_process').fork;
 var assert = require('assert');
@@ -38,12 +52,11 @@ if (process.argv[2] === 'child') {
       server = clusterServer;
 
       server.on('message', function () {
-        childCollected += 1;
+        process.send('gotMessage');
       });
 
     } else if (msg === 'stop') {
       server.close();
-      process.send(childCollected);
       process.removeListener('message', removeMe);
     }
   });
@@ -52,48 +65,49 @@ if (process.argv[2] === 'child') {
   var server = dgram.createSocket('udp4');
   var client = dgram.createSocket('udp4');
   var child = fork(__filename, ['child']);
+
   var msg = new Buffer('Some bytes');
 
-  var parentCollected = 0;
-  var childCollected = 0;
+  var childGotMessage = false;
+  var parentGotMessage = false;
+
   server.on('message', function (msg, rinfo) {
-    parentCollected += 1;
+    parentGotMessage = true;
   });
 
   server.on('listening', function () {
     child.send('server', server);
 
+    child.once('message', function (msg) {
+      if (msg === 'gotMessage') {
+        childGotMessage = true;
+      }
+    });
+
     sendMessages();
   });
 
   var sendMessages = function () {
-    var wait = 0;
-    var send = 0;
-    var total = 100;
-
     var timer = setInterval(function () {
-      send += 1;
-      if (send === total) {
-        clearInterval(timer);
-      }
-
       client.send(msg, 0, msg.length, common.PORT, '127.0.0.1', function(err) {
           if (err) throw err;
-
-          wait += 1;
-          if (wait === total) {
-            shutdown();
-          }
         }
       );
+
+      /*
+       * Both the parent and the child got at least one message,
+       * test passed, clean up everyting.
+       */
+      if (parentGotMessage && childGotMessage) {
+        clearInterval(timer);
+        shutdown();
+      }
+
     }, 1);
   };
 
   var shutdown = function () {
     child.send('stop');
-    child.once('message', function (collected) {
-      childCollected = collected;
-    });
 
     server.close();
     client.close();
@@ -102,7 +116,7 @@ if (process.argv[2] === 'child') {
   server.bind(common.PORT, '127.0.0.1');
 
   process.once('exit', function () {
-    assert(childCollected > 0);
-    assert(parentCollected > 0);
+    assert(parentGotMessage);
+    assert(childGotMessage);
   });
 }
diff --git a/test/simple/test-stream2-readable-wrap.js b/test/simple/test-stream2-readable-wrap.js
index 90eea016c7..293774ca5c 100644
--- a/test/simple/test-stream2-readable-wrap.js
+++ b/test/simple/test-stream2-readable-wrap.js
@@ -99,6 +99,9 @@ runTest(100, false, function(){ return new Buffer(100); });
 runTest(10, false, function(){ return new Buffer('xxxxxxxxxx'); });
 runTest(1, true, function(){ return { foo: 'bar' }; });
 
+var objectChunks = [ 5, 'a', false, 0, '', 'xyz', { x: 4 }, 7, [], 555 ];
+runTest(1, true, function(){ return objectChunks.shift() });
+
 process.on('exit', function() {
   assert.equal(testRuns, completedRuns);
   console.log('ok');
diff --git a/test/timers/test-timers-reliability.js b/test/timers/test-timers-reliability.js
new file mode 100644
index 0000000000..c240a44685
--- /dev/null
+++ b/test/timers/test-timers-reliability.js
@@ -0,0 +1,53 @@
+// FaketimeFlags: --exclude-monotonic -f '2014-07-21 09:00:00'
+
+var common = require('../common');
+
+var Timer  = process.binding('timer_wrap').Timer;
+var assert = require('assert');
+
+var timerFired    = false;
+var intervalFired = false;
+
+/*
+ * This test case aims at making sure that timing utilities such
+ * as setTimeout and setInterval are not vulnerable to time
+ * drifting or inconsistent time changes (such as ntp time sync
+ * in the past, etc.).
+ *
+ * It is run using faketime so that we change how
+ * non-monotonic clocks perceive time movement. We freeze
+ * non-monotonic time, and check if setTimeout and setInterval
+ * work properly in that situation.
+ *
+ * We check this by setting a timer based on a monotonic clock
+ * to fire after setTimeout's callback is supposed to be called.
+ * This monotonic timer, by definition, is not subject to time drifting
+ * and inconsistent time changes, so it can be considered as a solid
+ * reference.
+ *
+ * When the monotonic timer fires, if the setTimeout's callback
+ * hasn't been called yet, it means that setTimeout's underlying timer
+ * is vulnerable to time drift or inconsistent time changes.
+ */
+
+var monoTimer = new Timer();
+monoTimer.ontimeout = function () {
+    /*
+     * Make sure that setTimeout's and setInterval's callbacks have
+     * already fired, otherwise it means that they are vulnerable to
+     * time drifting or inconsistent time changes.
+     */
+    assert(timerFired);
+    assert(intervalFired);
+};
+
+monoTimer.start(300, 0);
+
+var timer = setTimeout(function () {
+    timerFired = true;
+}, 200);
+
+var interval = setInterval(function () {
+    intervalFired = true;
+    clearInterval(interval);
+}, 200);
diff --git a/test/timers/testcfg.py b/test/timers/testcfg.py
new file mode 100644
index 0000000000..98653e4716
--- /dev/null
+++ b/test/timers/testcfg.py
@@ -0,0 +1,102 @@
+# Copyright 2008 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.
+
+import test
+import os
+import shutil
+from shutil import rmtree
+from os import mkdir
+from glob import glob
+from os.path import join, dirname, exists
+import re
+import shlex
+
+FAKETIME_FLAGS_PATTERN = re.compile(r"//\s+FaketimeFlags:(.*)")
+FAKETIME_BIN_PATH = os.path.join("tools", "faketime", "src", "faketime")
+
+class TimersTestCase(test.TestCase):
+
+  def __init__(self, path, file, mode, context, config):
+    super(TimersTestCase, self).__init__(context, path, mode)
+    self.file = file
+    self.config = config
+    self.mode = mode
+
+  def GetLabel(self):
+    return "%s %s" % (self.mode, self.GetName())
+
+  def GetName(self):
+    return self.path[-1]
+
+  def GetCommand(self):
+    result = [FAKETIME_BIN_PATH];
+
+    source = open(self.file).read()
+    faketime_flags_match = FAKETIME_FLAGS_PATTERN.search(source)
+    if faketime_flags_match:
+      result += shlex.split(faketime_flags_match.group(1).strip())
+
+    result += [self.config.context.GetVm(self.mode)]
+    result += [self.file]
+
+    return result
+
+  def GetSource(self):
+    return open(self.file).read()
+
+
+class TimersTestConfiguration(test.TestConfiguration):
+
+  def __init__(self, context, root):
+    super(TimersTestConfiguration, self).__init__(context, root)
+
+  def Ls(self, path):
+    def SelectTest(name):
+      return name.startswith('test-') and name.endswith('.js')
+    return [f[:-3] for f in os.listdir(path) if SelectTest(f)]
+
+  def ListTests(self, current_path, path, mode):
+    all_tests = [current_path + [t] for t in self.Ls(join(self.root))]
+    result = []
+    for test in all_tests:
+      if self.Contains(path, test):
+        file_path = join(self.root, reduce(join, test[1:], "") + ".js")
+        result.append(TimersTestCase(test, file_path, mode, self.context, self))
+    return result
+
+  def GetBuildRequirements(self):
+    return ['sample', 'sample=shell']
+
+  def GetTestStatus(self, sections, defs):
+    status_file = join(self.root, 'simple.status')
+    if exists(status_file):
+      test.ReadConfigurationInto(status_file, sections, defs)
+
+
+
+def GetConfiguration(context, root):
+  return TimersTestConfiguration(context, root)