Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 17 additions & 12 deletions test/sequential/test-gc-http-client-onerror.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ function serverHandler(req, res) {
}

const http = require('http');
const numRequests = 36;
let createClients = true;
let done = 0;
let count = 0;
Expand All @@ -23,22 +24,26 @@ let countGC = 0;
const server = http.createServer(serverHandler);
server.listen(0, common.mustCall(() => {
for (let i = 0; i < cpus; i++)
getAll();
getAll(numRequests);
}));

function getAll() {
if (createClients) {
const req = http.get({
hostname: 'localhost',
pathname: '/',
port: server.address().port
}, cb).on('error', onerror);
function getAll(requestsRemaining) {
if (!createClients)
return;

count++;
onGC(req, { ongc });
if (requestsRemaining <= 0)
return;

setImmediate(getAll);
}
const req = http.get({
hostname: 'localhost',
pathname: '/',
port: server.address().port
}, cb).on('error', onerror);

count++;
onGC(req, { ongc });

setImmediate(getAll, requestsRemaining - 1);
}

function cb(res) {
Expand Down
12 changes: 8 additions & 4 deletions test/sequential/test-gc-http-client-timeout.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,22 @@ function serverHandler(req, res) {
}

const cpus = os.cpus().length;
const numRequests = 36;
let createClients = true;
let done = 0;
let count = 0;
let countGC = 0;

const server = http.createServer(serverHandler);
server.listen(0, common.mustCall(getAll));
server.listen(0, common.mustCall(() => getAll(numRequests)));

function getAll() {
function getAll(requestsRemaining) {
if (!createClients)
return;

if (requestsRemaining <= 0)
return;

const req = http.get({
hostname: 'localhost',
pathname: '/',
Expand All @@ -40,11 +44,11 @@ function getAll() {
count++;
onGC(req, { ongc });

setImmediate(getAll);
setImmediate(getAll, requestsRemaining - 1);
}

for (let i = 0; i < cpus; i++)
getAll();
getAll(numRequests);

function cb(res) {
res.resume();
Expand Down
10 changes: 7 additions & 3 deletions test/sequential/test-gc-http-client.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ function serverHandler(req, res) {
}

const http = require('http');
const numRequests = 36;
let createClients = true;
let done = 0;
let count = 0;
Expand All @@ -21,13 +22,16 @@ let countGC = 0;
const server = http.createServer(serverHandler);
server.listen(0, common.mustCall(() => {
for (let i = 0; i < cpus; i++)
getAll();
getAll(numRequests);
}));

function getAll() {
function getAll(requestsRemaining) {
if (!createClients)
return;

if (requestsRemaining <= 0)
return;

const req = http.get({
hostname: 'localhost',
pathname: '/',
Expand All @@ -37,7 +41,7 @@ function getAll() {
count++;
onGC(req, { ongc });

setImmediate(getAll);
setImmediate(getAll, requestsRemaining - 1);
}

function cb(res) {
Expand Down