Skip to content

Commit 16b59cb

Browse files
prusttjfontaine
authored andcommitted
http: use an unref'd timer to fix delay in exit
There was previously up to a second exit delay when exiting node right after an http request/response, due to the utcDate() function doing a setTimeout to update the cached date/time. Fixing this should increase the performance of our http tests.
1 parent dc3c2d1 commit 16b59cb

File tree

2 files changed

+66
-3
lines changed

2 files changed

+66
-3
lines changed

lib/http.js

+6-3
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
var util = require('util');
2323
var net = require('net');
2424
var Stream = require('stream');
25+
var timers = require('timers');
2526
var url = require('url');
2627
var EventEmitter = require('events').EventEmitter;
2728
var FreeList = require('freelist').FreeList;
@@ -274,12 +275,14 @@ function utcDate() {
274275
if (!dateCache) {
275276
var d = new Date();
276277
dateCache = d.toUTCString();
277-
setTimeout(function() {
278-
dateCache = undefined;
279-
}, 1000 - d.getMilliseconds());
278+
timers.enroll(utcDate, 1000 - d.getMilliseconds());
279+
timers._unrefActive(utcDate);
280280
}
281281
return dateCache;
282282
}
283+
utcDate._onTimeout = function() {
284+
dateCache = undefined;
285+
};
283286

284287

285288
/* Abstract base class for ServerRequest and ClientResponse. */

test/simple/test-http-exit-delay.js

+60
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
// Copyright Joyent, Inc. and other Node contributors.
2+
//
3+
// Permission is hereby granted, free of charge, to any person obtaining a
4+
// copy of this software and associated documentation files (the
5+
// "Software"), to deal in the Software without restriction, including
6+
// without limitation the rights to use, copy, modify, merge, publish,
7+
// distribute, sublicense, and/or sell copies of the Software, and to permit
8+
// persons to whom the Software is furnished to do so, subject to the
9+
// following conditions:
10+
//
11+
// The above copyright notice and this permission notice shall be included
12+
// in all copies or substantial portions of the Software.
13+
//
14+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
15+
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
16+
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
17+
// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
18+
// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
19+
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
20+
// USE OR OTHER DEALINGS IN THE SOFTWARE.
21+
22+
var assert = require('assert');
23+
var common = require('../common.js');
24+
var http = require('http');
25+
26+
var start;
27+
var server = http.createServer(function(req, res) {
28+
req.resume();
29+
req.on('end', function() {
30+
res.end('Success');
31+
});
32+
33+
server.close(function() {
34+
start = process.hrtime();
35+
});
36+
});
37+
38+
server.listen(common.PORT, 'localhost', function() {
39+
var interval_id = setInterval(function() {
40+
if (new Date().getMilliseconds() > 100)
41+
return;
42+
43+
var req = http.request({
44+
'host': 'localhost',
45+
'port': common.PORT,
46+
'agent': false,
47+
'method': 'PUT'
48+
});
49+
50+
req.end('Test');
51+
clearInterval(interval_id);
52+
}, 10);
53+
});
54+
55+
process.on('exit', function() {
56+
var d = process.hrtime(start);
57+
assert.equal(d[0], 0);
58+
assert(d[1] / 1e9 < 0.03);
59+
console.log('ok');
60+
});

0 commit comments

Comments
 (0)