summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAnatoli Papirovski <apapirovski@mac.com>2018-05-02 15:39:08 +0200
committerAnatoli Papirovski <apapirovski@mac.com>2018-05-06 07:21:32 +0200
commit9a3ae2fe9d6ddff6a0de81acb5e0a8c068c0c79d (patch)
tree650d9265545aa9335bf834eccab70ca243c7eadb /lib
parent6ec43fc28b66587eb176019f488d682d256bd189 (diff)
downloadandroid-node-v8-9a3ae2fe9d6ddff6a0de81acb5e0a8c068c0c79d.tar.gz
android-node-v8-9a3ae2fe9d6ddff6a0de81acb5e0a8c068c0c79d.tar.bz2
android-node-v8-9a3ae2fe9d6ddff6a0de81acb5e0a8c068c0c79d.zip
lib: expose FixedQueue internally and fix nextTick bug
A bug was introduced together with the FixedQueue implementation for process.nextTick which meant that the queue wouldn't necessarily fully clear on each run through. Fix it and abstract the data structure into an internal module that can later be used elsewhere. PR-URL: https://github.com/nodejs/node/pull/20468 Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/internal/fixed_queue.js113
-rw-r--r--lib/internal/process/next_tick.js124
2 files changed, 121 insertions, 116 deletions
diff --git a/lib/internal/fixed_queue.js b/lib/internal/fixed_queue.js
new file mode 100644
index 0000000000..7571a8f67e
--- /dev/null
+++ b/lib/internal/fixed_queue.js
@@ -0,0 +1,113 @@
+'use strict';
+
+// Currently optimal queue size, tested on V8 6.0 - 6.6. Must be power of two.
+const kSize = 2048;
+const kMask = kSize - 1;
+
+// The FixedQueue is implemented as a singly-linked list of fixed-size
+// circular buffers. It looks something like this:
+//
+// head tail
+// | |
+// v v
+// +-----------+ <-----\ +-----------+ <------\ +-----------+
+// | [null] | \----- | next | \------- | next |
+// +-----------+ +-----------+ +-----------+
+// | item | <-- bottom | item | <-- bottom | [empty] |
+// | item | | item | | [empty] |
+// | item | | item | | [empty] |
+// | item | | item | | [empty] |
+// | item | | item | bottom --> | item |
+// | item | | item | | item |
+// | ... | | ... | | ... |
+// | item | | item | | item |
+// | item | | item | | item |
+// | [empty] | <-- top | item | | item |
+// | [empty] | | item | | item |
+// | [empty] | | [empty] | <-- top top --> | [empty] |
+// +-----------+ +-----------+ +-----------+
+//
+// Or, if there is only one circular buffer, it looks something
+// like either of these:
+//
+// head tail head tail
+// | | | |
+// v v v v
+// +-----------+ +-----------+
+// | [null] | | [null] |
+// +-----------+ +-----------+
+// | [empty] | | item |
+// | [empty] | | item |
+// | item | <-- bottom top --> | [empty] |
+// | item | | [empty] |
+// | [empty] | <-- top bottom --> | item |
+// | [empty] | | item |
+// +-----------+ +-----------+
+//
+// Adding a value means moving `top` forward by one, removing means
+// moving `bottom` forward by one. After reaching the end, the queue
+// wraps around.
+//
+// When `top === bottom` the current queue is empty and when
+// `top + 1 === bottom` it's full. This wastes a single space of storage
+// but allows much quicker checks.
+
+const FixedCircularBuffer = class FixedCircularBuffer {
+ constructor() {
+ this.bottom = 0;
+ this.top = 0;
+ this.list = new Array(kSize);
+ this.next = null;
+ }
+
+ isEmpty() {
+ return this.top === this.bottom;
+ }
+
+ isFull() {
+ return ((this.top + 1) & kMask) === this.bottom;
+ }
+
+ push(data) {
+ this.list[this.top] = data;
+ this.top = (this.top + 1) & kMask;
+ }
+
+ shift() {
+ const nextItem = this.list[this.bottom];
+ if (nextItem === undefined)
+ return null;
+ this.list[this.bottom] = undefined;
+ this.bottom = (this.bottom + 1) & kMask;
+ return nextItem;
+ }
+};
+
+module.exports = class FixedQueue {
+ constructor() {
+ this.head = this.tail = new FixedCircularBuffer();
+ }
+
+ isEmpty() {
+ return this.head.isEmpty();
+ }
+
+ push(data) {
+ if (this.head.isFull()) {
+ // Head is full: Creates a new queue, sets the old queue's `.next` to it,
+ // and sets it as the new main queue.
+ this.head = this.head.next = new FixedCircularBuffer();
+ }
+ this.head.push(data);
+ }
+
+ shift() {
+ const { tail } = this;
+ const next = tail.shift();
+ if (tail.isEmpty() && tail.next !== null) {
+ // If there is another queue, it forms the new tail.
+ this.tail = tail.next;
+ }
+ return next;
+ }
+};
diff --git a/lib/internal/process/next_tick.js b/lib/internal/process/next_tick.js
index 7a5d2f88a6..dbe0ce8cdb 100644
--- a/lib/internal/process/next_tick.js
+++ b/lib/internal/process/next_tick.js
@@ -16,6 +16,7 @@ function setupNextTick() {
} = require('internal/async_hooks');
const promises = require('internal/process/promises');
const { ERR_INVALID_CALLBACK } = require('internal/errors').codes;
+ const FixedQueue = require('internal/fixed_queue');
const { emitPromiseRejectionWarnings } = promises;
// tickInfo is used so that the C++ code in src/node.cc can
@@ -31,119 +32,7 @@ function setupNextTick() {
const kHasScheduled = 0;
const kHasPromiseRejections = 1;
- // Queue size for each tick array. Must be a power of two.
- const kQueueSize = 2048;
- const kQueueMask = kQueueSize - 1;
-
- // The next tick queue is implemented as a singly-linked list of fixed-size
- // circular buffers. It looks something like this:
- //
- // head tail
- // | |
- // v v
- // +-----------+ <-----\ +-----------+ <------\ +-----------+
- // | [null] | \----- | next | \------- | next |
- // +-----------+ +-----------+ +-----------+
- // | tick | <-- bottom | tick | <-- bottom | [empty] |
- // | tick | | tick | | [empty] |
- // | tick | | tick | | [empty] |
- // | tick | | tick | | [empty] |
- // | tick | | tick | bottom --> | tick |
- // | tick | | tick | | tick |
- // | ... | | ... | | ... |
- // | tick | | tick | | tick |
- // | tick | | tick | | tick |
- // | [empty] | <-- top | tick | | tick |
- // | [empty] | | tick | | tick |
- // | [empty] | | tick | | tick |
- // +-----------+ +-----------+ <-- top top --> +-----------+
- //
- // Or, if there is only one fixed-size queue, it looks something
- // like either of these:
- //
- // head tail head tail
- // | | | |
- // v v v v
- // +-----------+ +-----------+
- // | [null] | | [null] |
- // +-----------+ +-----------+
- // | [empty] | | tick |
- // | [empty] | | tick |
- // | tick | <-- bottom top --> | [empty] |
- // | tick | | [empty] |
- // | [empty] | <-- top bottom --> | tick |
- // | [empty] | | tick |
- // +-----------+ +-----------+
- //
- // Adding a value means moving `top` forward by one, removing means
- // moving `bottom` forward by one.
- //
- // We let `bottom` and `top` wrap around, so when `top` is conceptually
- // pointing to the end of the list, that means that the actual value is `0`.
- //
- // In particular, when `top === bottom`, this can mean *either* that the
- // current queue is empty or that it is full. We can differentiate by
- // checking whether an entry in the queue is empty (a.k.a. `=== undefined`).
-
- class FixedQueue {
- constructor() {
- this.bottom = 0;
- this.top = 0;
- this.list = new Array(kQueueSize);
- this.next = null;
- }
-
- push(data) {
- this.list[this.top] = data;
- this.top = (this.top + 1) & kQueueMask;
- }
-
- shift() {
- const nextItem = this.list[this.bottom];
- if (nextItem === undefined)
- return null;
- this.list[this.bottom] = undefined;
- this.bottom = (this.bottom + 1) & kQueueMask;
- return nextItem;
- }
- }
-
- var head = new FixedQueue();
- var tail = head;
-
- function push(data) {
- if (head.bottom === head.top) {
- // Either empty or full:
- if (head.list[head.top] !== undefined) {
- // It's full: Creates a new queue, sets the old queue's `.next` to it,
- // and sets it as the new main queue.
- head = head.next = new FixedQueue();
- } else {
- // If the head is empty, that means that it was the only fixed-sized
- // queue in existence.
- DCHECK_EQ(head.next, null);
- // This is the first tick object in existence, so we need to inform
- // the C++ side that we do want to run `_tickCallback()`.
- tickInfo[kHasScheduled] = 1;
- }
- }
- head.push(data);
- }
-
- function shift() {
- const next = tail.shift();
- if (tail.top === tail.bottom) { // -> .shift() emptied the current queue.
- if (tail.next !== null) {
- // If there is another queue, it forms the new tail.
- tail = tail.next;
- } else {
- // We've just run out of items. Let the native side know that it
- // doesn't need to bother calling into JS to run the queue.
- tickInfo[kHasScheduled] = 0;
- }
- }
- return next;
- }
+ const queue = new FixedQueue();
process.nextTick = nextTick;
// Needs to be accessible from beyond this scope.
@@ -152,7 +41,7 @@ function setupNextTick() {
function _tickCallback() {
let tock;
do {
- while (tock = shift()) {
+ while (tock = queue.shift()) {
const asyncId = tock[async_id_symbol];
emitBefore(asyncId, tock[trigger_async_id_symbol]);
// emitDestroy() places the async_id_symbol into an asynchronous queue
@@ -175,8 +64,9 @@ function setupNextTick() {
emitAfter(asyncId);
}
+ tickInfo[kHasScheduled] = 0;
runMicrotasks();
- } while (head.top !== head.bottom || emitPromiseRejectionWarnings());
+ } while (!queue.isEmpty() || emitPromiseRejectionWarnings());
tickInfo[kHasPromiseRejections] = 0;
}
@@ -222,6 +112,8 @@ function setupNextTick() {
args[i - 1] = arguments[i];
}
- push(new TickObject(callback, args, getDefaultTriggerAsyncId()));
+ if (queue.isEmpty())
+ tickInfo[kHasScheduled] = 1;
+ queue.push(new TickObject(callback, args, getDefaultTriggerAsyncId()));
}
}