jiangcuo/node
1
0
Fork 0
mirror of https://github.com/nodejs/node.git synced 2025-05-05 22:29:54 +00:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity

streams: fix pipe is destructed by 'end' from destination

Browse Source
This commit is contained in:
koichik 2012-01-12 14:33:56 +09:00 committed by isaacs
parent 109f8e2773
commit 016afe21ae
2 changed files with 37 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/stream.js
View File

@ -106,7 +106,6 @@ Stream.prototype.pipe = function(dest, options) {
source.on('end', cleanup); source.on('end', cleanup);
source.on('close', cleanup); source.on('close', cleanup);
dest.on('end', cleanup);
dest.on('close', cleanup); dest.on('close', cleanup);
dest.emit('pipe', source); dest.emit('pipe', source);

48
test/simple/test-stream-pipe-cleanup.js
View File

@ -47,15 +47,17 @@ function Readable() {
} }
util.inherits(Readable, stream.Stream); util.inherits(Readable, stream.Stream);
function Duplex() {
this.readable = true;
Writable.call(this);
}
util.inherits(Duplex, Writable);
var i = 0; var i = 0;
var limit = 100; var limit = 100;
var w = new Writable(); var w = new Writable();
console.error = function(text) {
throw new Error(text);
};
var r; var r;
for (i = 0; i < limit; i++) { for (i = 0; i < limit; i++) {
@ -80,13 +82,6 @@ w.endCalls = 0;
r = new Readable(); r = new Readable();
for (i = 0; i < limit; i++) {
w = new Writable();
r.pipe(w);
w.emit('end');
}
assert.equal(0, w.listeners('end').length);
for (i = 0; i < limit; i++) { for (i = 0; i < limit; i++) {
w = new Writable(); w = new Writable();
r.pipe(w); r.pipe(w);
@ -94,3 +89,34 @@ for (i = 0; i < limit; i++) {
} }
assert.equal(0, w.listeners('close').length); assert.equal(0, w.listeners('close').length);
r = new Readable();
w = new Writable();
var d = new Duplex();
r.pipe(d); // pipeline A
d.pipe(w); // pipeline B
assert.equal(r.listeners('end').length, 2); // A.onend, A.cleanup
assert.equal(r.listeners('close').length, 2); // A.onclose, A.cleanup
assert.equal(d.listeners('end').length, 2); // B.onend, B.cleanup
assert.equal(d.listeners('close').length, 3); // A.cleanup, B.onclose, B.cleanup
assert.equal(w.listeners('end').length, 0);
assert.equal(w.listeners('close').length, 1); // B.cleanup
r.emit('end');
assert.equal(d.endCalls, 1);
assert.equal(w.endCalls, 0);
assert.equal(r.listeners('end').length, 0);
assert.equal(r.listeners('close').length, 0);
assert.equal(d.listeners('end').length, 2); // B.onend, B.cleanup
assert.equal(d.listeners('close').length, 2); // B.onclose, B.cleanup
assert.equal(w.listeners('end').length, 0);
assert.equal(w.listeners('close').length, 1); // B.cleanup
d.emit('end');
assert.equal(d.endCalls, 1);
assert.equal(w.endCalls, 1);
assert.equal(r.listeners('end').length, 0);
assert.equal(r.listeners('close').length, 0);
assert.equal(d.listeners('end').length, 0);
assert.equal(d.listeners('close').length, 0);
assert.equal(w.listeners('end').length, 0);
assert.equal(w.listeners('close').length, 0);