mirror of https://github.com/lukechilds/node.git
Browse Source
child_process.fork() support sending native hander object, this patch add support for sending net.Server and net.Socket object by converting the object to a native handle object and back to a useful object again. Note when sending a Socket there was emitted by a net Server object, the server.connections property becomes null, because it is no longer possible to known when it is destroyed.v0.9.1-release
Andreas Madsen
13 years ago
committed by
isaacs
isaacs
6 changed files with 696 additions and 31 deletions
@ -0,0 +1,198 @@ |
|||
// Copyright Joyent, Inc. and other Node contributors.
|
|||
//
|
|||
// Permission is hereby granted, free of charge, to any person obtaining a
|
|||
// copy of this software and associated documentation files (the
|
|||
// "Software"), to deal in the Software without restriction, including
|
|||
// without limitation the rights to use, copy, modify, merge, publish,
|
|||
// distribute, sublicense, and/or sell copies of the Software, and to permit
|
|||
// persons to whom the Software is furnished to do so, subject to the
|
|||
// following conditions:
|
|||
//
|
|||
// The above copyright notice and this permission notice shall be included
|
|||
// in all copies or substantial portions of the Software.
|
|||
//
|
|||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
|||
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
|
|||
// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
|
|||
// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
|
|||
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
|
|||
// USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|||
|
|||
var assert = require('assert'); |
|||
var common = require('../common'); |
|||
var fork = require('child_process').fork; |
|||
var net = require('net'); |
|||
|
|||
// progress tracker
|
|||
function ProgressTracker(missing, callback) { |
|||
this.missing = missing; |
|||
this.callback = callback; |
|||
} |
|||
ProgressTracker.prototype.done = function() { |
|||
this.missing -= 1; |
|||
this.check(); |
|||
}; |
|||
ProgressTracker.prototype.check = function() { |
|||
if (this.missing === 0) this.callback(); |
|||
}; |
|||
|
|||
if (process.argv[2] === 'child') { |
|||
|
|||
var serverScope; |
|||
|
|||
process.on('message', function onServer(msg, server) { |
|||
if (msg.what !== 'server') return; |
|||
process.removeListener('message', onServer); |
|||
|
|||
serverScope = server; |
|||
|
|||
server.on('connection', function(socket) { |
|||
console.log('CHILD: got connection'); |
|||
process.send({what: 'connection'}); |
|||
socket.destroy(); |
|||
}); |
|||
|
|||
// start making connection from parent
|
|||
console.log('CHILD: server listening'); |
|||
process.send({what: 'listening'}); |
|||
}); |
|||
|
|||
process.on('message', function onClose(msg) { |
|||
if (msg.what !== 'close') return; |
|||
process.removeListener('message', onClose); |
|||
|
|||
serverScope.on('close', function() { |
|||
process.send({what: 'close'}); |
|||
}); |
|||
serverScope.close(); |
|||
}); |
|||
|
|||
process.on('message', function onSocket(msg, socket) { |
|||
if (msg.what !== 'socket') return; |
|||
process.removeListener('message', onSocket); |
|||
socket.end('echo'); |
|||
console.log('CHILD: got socket'); |
|||
}); |
|||
|
|||
process.send({what: 'ready'}); |
|||
} else { |
|||
|
|||
var child = fork(process.argv[1], ['child']); |
|||
|
|||
child.on('exit', function() { |
|||
console.log('CHILD: died'); |
|||
}); |
|||
|
|||
// send net.Server to child and test by connecting
|
|||
var testServer = function(callback) { |
|||
|
|||
// destroy server execute callback when done
|
|||
var progress = new ProgressTracker(2, function() { |
|||
server.on('close', function() { |
|||
console.log('PARENT: server closed'); |
|||
child.send({what: 'close'}); |
|||
}); |
|||
server.close(); |
|||
}); |
|||
|
|||
// we expect 10 connections and close events
|
|||
var connections = new ProgressTracker(10, progress.done.bind(progress)); |
|||
var closed = new ProgressTracker(10, progress.done.bind(progress)); |
|||
|
|||
// create server and send it to child
|
|||
var server = net.createServer(); |
|||
server.on('connection', function(socket) { |
|||
console.log('PARENT: got connection'); |
|||
socket.destroy(); |
|||
connections.done(); |
|||
}); |
|||
server.on('listening', function() { |
|||
console.log('PARENT: server listening'); |
|||
child.send({what: 'server'}, server); |
|||
}); |
|||
server.listen(common.PORT); |
|||
|
|||
// handle client messages
|
|||
var messageHandlers = function(msg) { |
|||
|
|||
if (msg.what === 'listening') { |
|||
// make connections
|
|||
var socket; |
|||
for (var i = 0; i < 10; i++) { |
|||
socket = net.connect(common.PORT, function() { |
|||
console.log('CLIENT: connected'); |
|||
}); |
|||
socket.on('close', function() { |
|||
closed.done(); |
|||
console.log('CLIENT: closed'); |
|||
}); |
|||
} |
|||
|
|||
} else if (msg.what === 'connection') { |
|||
// child got connection
|
|||
connections.done(); |
|||
} else if (msg.what === 'close') { |
|||
child.removeListener('message', messageHandlers); |
|||
callback(); |
|||
} |
|||
}; |
|||
|
|||
child.on('message', messageHandlers); |
|||
}; |
|||
|
|||
// send net.Socket to child
|
|||
var testSocket = function(callback) { |
|||
|
|||
// create a new server and connect to it,
|
|||
// but the socket will be handled by the child
|
|||
var server = net.createServer(); |
|||
server.on('connection', function(socket) { |
|||
socket.on('close', function() { |
|||
console.log('CLIENT: socket closed'); |
|||
}); |
|||
child.send({what: 'socket'}, socket); |
|||
}); |
|||
server.on('close', function() { |
|||
console.log('PARENT: server closed'); |
|||
callback(); |
|||
}); |
|||
server.listen(common.PORT, function() { |
|||
var connect = net.connect(common.PORT); |
|||
var store = ''; |
|||
connect.on('data', function(chunk) { |
|||
store += chunk; |
|||
console.log('CLIENT: got data'); |
|||
}); |
|||
connect.on('close', function() { |
|||
console.log('CLIENT: closed'); |
|||
assert.equal(store, 'echo'); |
|||
server.close(); |
|||
}); |
|||
}); |
|||
}; |
|||
|
|||
// create server and send it to child
|
|||
var serverSucess = false; |
|||
var socketSucess = false; |
|||
child.on('message', function onReady(msg) { |
|||
if (msg.what !== 'ready') return; |
|||
child.removeListener('message', onReady); |
|||
|
|||
testServer(function() { |
|||
serverSucess = true; |
|||
|
|||
testSocket(function() { |
|||
socketSucess = true; |
|||
child.kill(); |
|||
}); |
|||
}); |
|||
|
|||
}); |
|||
|
|||
process.on('exit', function() { |
|||
assert.ok(serverSucess); |
|||
assert.ok(socketSucess); |
|||
}); |
|||
|
|||
} |
|||
@ -0,0 +1,131 @@ |
|||
// Copyright Joyent, Inc. and other Node contributors.
|
|||
//
|
|||
// Permission is hereby granted, free of charge, to any person obtaining a
|
|||
// copy of this software and associated documentation files (the
|
|||
// "Software"), to deal in the Software without restriction, including
|
|||
// without limitation the rights to use, copy, modify, merge, publish,
|
|||
// distribute, sublicense, and/or sell copies of the Software, and to permit
|
|||
// persons to whom the Software is furnished to do so, subject to the
|
|||
// following conditions:
|
|||
//
|
|||
// The above copyright notice and this permission notice shall be included
|
|||
// in all copies or substantial portions of the Software.
|
|||
//
|
|||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
|||
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
|
|||
// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
|
|||
// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
|
|||
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
|
|||
// USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|||
|
|||
var assert = require('assert'); |
|||
var common = require('../common'); |
|||
var fork = require('child_process').fork; |
|||
var net = require('net'); |
|||
|
|||
if (process.argv[2] === 'child') { |
|||
|
|||
var endMe = null; |
|||
|
|||
process.on('message', function(m, socket) { |
|||
if (!socket) return; |
|||
|
|||
// will call .end('end') or .write('write');
|
|||
socket[m](m); |
|||
|
|||
// store the unfinished socket
|
|||
if (m === 'write') { |
|||
endMe = socket; |
|||
} |
|||
}); |
|||
|
|||
process.on('message', function(m) { |
|||
if (m !== 'close') return; |
|||
endMe.end('end'); |
|||
endMe = null; |
|||
}); |
|||
|
|||
process.on('disconnect', function() { |
|||
endMe.end('end'); |
|||
endMe = null; |
|||
}); |
|||
|
|||
} else { |
|||
|
|||
var child1 = fork(process.argv[1], ['child']); |
|||
var child2 = fork(process.argv[1], ['child']); |
|||
var child3 = fork(process.argv[1], ['child']); |
|||
|
|||
var server = net.createServer(); |
|||
|
|||
var connected = 0; |
|||
server.on('connection', function(socket) { |
|||
switch (connected) { |
|||
case 0: |
|||
child1.send('end', socket); break; |
|||
case 1: |
|||
child1.send('write', socket); break; |
|||
case 2: |
|||
child2.send('end', socket); break; |
|||
case 3: |
|||
child2.send('write', socket); break; |
|||
case 4: |
|||
child3.send('end', socket); break; |
|||
case 5: |
|||
child3.send('write', socket); break; |
|||
} |
|||
connected += 1; |
|||
|
|||
if (connected === 6) { |
|||
closeServer(); |
|||
} |
|||
}); |
|||
|
|||
var disconnected = 0; |
|||
server.on('listening', function() { |
|||
|
|||
var j = 6, client; |
|||
while (j--) { |
|||
client = net.connect(common.PORT, '127.0.0.1'); |
|||
client.on('close', function() { |
|||
disconnected += 1; |
|||
}); |
|||
} |
|||
}); |
|||
|
|||
var closeEmitted = false; |
|||
server.on('close', function() { |
|||
closeEmitted = true; |
|||
|
|||
child1.kill(); |
|||
child2.kill(); |
|||
child3.kill(); |
|||
}); |
|||
|
|||
server.listen(common.PORT, '127.0.0.1'); |
|||
|
|||
var timeElasped = 0; |
|||
var closeServer = function() { |
|||
var startTime = Date.now(); |
|||
server.on('close', function() { |
|||
timeElasped = Date.now() - startTime; |
|||
}); |
|||
|
|||
server.close(); |
|||
|
|||
setTimeout(function() { |
|||
child1.send('close'); |
|||
child2.send('close'); |
|||
child3.disconnect(); |
|||
}, 200); |
|||
}; |
|||
|
|||
process.on('exit', function() { |
|||
assert.equal(disconnected, 6); |
|||
assert.equal(connected, 6); |
|||
assert.ok(closeEmitted); |
|||
assert.ok(timeElasped >= 190 && timeElasped <= 1000, |
|||
'timeElasped was not between 190 and 1000 ms'); |
|||
}); |
|||
} |
|||
Loading…
Reference in new issue