Skip to content

Commit 4f0465c

Browse files
committed
[fixup] tweaks
1 parent b958ba3 commit 4f0465c

File tree

5 files changed

+13
-21
lines changed

5 files changed

+13
-21
lines changed

benchmark/events/ee-add-remove.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
const common = require('../common.js');
33
const events = require('events');
44

5-
const bench = common.createBenchmark(main, { n: [25e4] });
5+
const bench = common.createBenchmark(main, { n: [5e6] });
66

77
function main(conf) {
88
const n = conf.n | 0;

benchmark/events/ee-emit.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ const common = require('../common.js');
33
const EventEmitter = require('events').EventEmitter;
44

55
const bench = common.createBenchmark(main, {
6-
n: [2e6],
6+
n: [2e7],
77
argc: [0, 2, 4, 10],
88
listeners: [1, 5, 10],
99
});

benchmark/events/ee-listeners-many.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
const common = require('../common.js');
33
const EventEmitter = require('events').EventEmitter;
44

5-
const bench = common.createBenchmark(main, { n: [5e6] });
5+
const bench = common.createBenchmark(main, { n: [1e7] });
66

77
function main(conf) {
88
const n = conf.n | 0;

benchmark/events/ee-listeners.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
const common = require('../common.js');
33
const EventEmitter = require('events').EventEmitter;
44

5-
const bench = common.createBenchmark(main, { n: [5e6] });
5+
const bench = common.createBenchmark(main, { n: [5e7] });
66

77
function main(conf) {
88
const n = conf.n | 0;

lib/events.js

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -375,13 +375,9 @@ EventEmitter.prototype.removeListener =
375375
return this;
376376

377377
if (list === listener || list.listener === listener) {
378-
if (events.size === 1)
379-
this[kEvents] = undefined;
380-
else {
381-
events.delete(type);
382-
if (events.has('removeListener'))
383-
this.emit('removeListener', type, list.listener || listener);
384-
}
378+
events.delete(type);
379+
if (events.size && events.has('removeListener'))
380+
this.emit('removeListener', type, list.listener || listener);
385381
return this;
386382
}
387383

@@ -434,14 +430,10 @@ EventEmitter.prototype.removeAllListeners =
434430

435431
// not listening for removeListener, no need to emit
436432
if (!events.has('removeListener')) {
437-
if (arguments.length === 0) {
438-
this[kEvents] = undefined;
439-
} else if (events.has(type)) {
440-
if (events.size === 1)
441-
this[kEvents] = undefined;
442-
else
443-
events.delete(type);
444-
}
433+
if (arguments.length === 0)
434+
this[kEvents] = new Map();
435+
else
436+
events.delete(type);
445437
return this;
446438
}
447439

@@ -454,7 +446,7 @@ EventEmitter.prototype.removeAllListeners =
454446
this.removeAllListeners(key);
455447
}
456448
this.removeAllListeners('removeListener');
457-
this[kEvents] = undefined;
449+
this[kEvents] = new Map();
458450
return this;
459451
}
460452

@@ -475,7 +467,7 @@ EventEmitter.prototype.removeAllListeners =
475467
EventEmitter.prototype.listeners = function listeners(type, unwrap = true) {
476468
const events = this[kEvents];
477469

478-
if (events === undefined)
470+
if (events === undefined || !events.size)
479471
return [];
480472

481473
const evlistener = events.get(type);

0 commit comments

Comments
 (0)