Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Byte stream update, including reference implementation #361

Closed
wants to merge 91 commits into from
Closed

Byte stream update, including reference implementation #361

Changes from 1 commit
Commits
Show all changes
91 commits
Select commit Hold shift + click to select a range
e31cf83
Add ReadableByteStreamByobReader
tyoshino May 7, 2015
33b4db3
One more BYOB change
tyoshino May 8, 2015
49e2b91
More BYOB change
tyoshino May 8, 2015
60fdeca
Replaced RangeError with TypeError, fixed call to RequestReadableByte…
tyoshino Jun 1, 2015
4b03976
More work
tyoshino Jun 1, 2015
60ec5f3
Reference impl of ReadableByteStream
tyoshino Jun 1, 2015
2dda7e9
Some renaming, reordered PullFromReadableByteStream.* functions
tyoshino Jun 3, 2015
06309a0
Don't use IterResultObject for rejection. Replace one if with assert
tyoshino Jun 3, 2015
50eafbe
Remove unnecessary substitution
tyoshino Jun 3, 2015
1d7c673
Add state check. Fix return position.
tyoshino Jun 3, 2015
a0b9daf
Typo fix. Removed unnecessary try-catch
tyoshino Jun 3, 2015
189c31d
Remove unnecessary alias
tyoshino Jun 3, 2015
a6f3a95
Update reference impl. Spec is not synced yet
tyoshino Jun 4, 2015
721d9f7
Half done
tyoshino Jun 4, 2015
1696a79
Fixed bugs
tyoshino Jun 5, 2015
6b45951
Reorg
tyoshino Jun 5, 2015
afceae3
More tests
tyoshino Jun 5, 2015
6897df9
More
tyoshino Jun 5, 2015
5e40178
More fix, redesign...
tyoshino Jun 5, 2015
db3ab8a
Tweak
tyoshino Jun 5, 2015
10bd5d3
More fix
tyoshino Jun 5, 2015
187172e
Refactor
tyoshino Jun 5, 2015
3f7fd74
Tidy
tyoshino Jun 5, 2015
09d9847
WIP Broken
tyoshino Jun 5, 2015
18235da
Working
tyoshino Jun 9, 2015
87f45a6
More
tyoshino Jun 9, 2015
a63f0a4
More
tyoshino Jun 9, 2015
5a20417
Refine
tyoshino Jun 9, 2015
c49457a
Guard WIP
tyoshino Jun 9, 2015
b6ae151
WIP. Updating frequency of pullInto
tyoshino Jun 9, 2015
16cb5fa
Almost fixed
tyoshino Jun 10, 2015
29a4ed2
Almost again
tyoshino Jun 10, 2015
1c4f531
Working!
tyoshino Jun 10, 2015
b04c8fd
Renaming
tyoshino Jun 10, 2015
c8a8917
Reorder function definitions
tyoshino Jun 10, 2015
a0f36e8
Working. Refactored
tyoshino Jun 11, 2015
3ca35ec
Remove some variables
tyoshino Jun 11, 2015
3d3717e
Replace return undefined with return
tyoshino Jun 11, 2015
7d2f9b8
Remove incorrect CallPullInto
tyoshino Jun 11, 2015
788aae8
More
tyoshino Jun 11, 2015
b626d86
Renaming
tyoshino Jun 11, 2015
13f446e
Working
tyoshino Jun 11, 2015
0a512da
More
tyoshino Jun 11, 2015
6bd7b93
Don't check IsCallable on the pull and pullInto method until the time…
tyoshino Jun 16, 2015
afeede5
Use BYTES_PER_ELEMENT
tyoshino Jun 16, 2015
422795d
Validate view argument of read(view) using ArrayBuffer.isView()
tyoshino Jun 16, 2015
4c87a4d
Revert change on run-tests.js
tyoshino Jun 16, 2015
ffaea95
Refine test case descriptions
tyoshino Jun 16, 2015
2bf0357
Remove unnecessary line and fix typo
tyoshino Jun 30, 2015
a174501
Revert removal of _controller initialization, and add a comment to ex…
tyoshino Jun 30, 2015
f2a9f07
Fix _closeRequested check in enqueue() and close() of ReadableByteStr…
tyoshino Jun 30, 2015
186a262
Initialize _closeRequested in ReadableByteStreamController
tyoshino Jun 30, 2015
18c5554
Fix typo in CallPull and add tests to verify the fix
tyoshino Jun 30, 2015
14e3bbc
Use if-elses than early returns in ReadableByteStreamController.enque…
tyoshino Jun 30, 2015
28cbdc8
Make the code to handle remainder bytes work
tyoshino Jul 1, 2015
7b559f5
Move EnqueueInReadableByteStreamController call in respond() to simpl…
tyoshino Jul 1, 2015
f3be413
Remove unreached code from releaseLock() of readers
tyoshino Jul 1, 2015
f174dd5
Add auto release feature tests
tyoshino Jul 1, 2015
67af7d5
Prefix CallPull.* functions with ReadableByteStreamController
tyoshino Jul 1, 2015
a8e4945
Add tests for non-callable pull/pullInto on underlying byte source
tyoshino Jul 1, 2015
95cb1d5
Use call than apply
tyoshino Jul 1, 2015
e187dbf
Use Uint8Array for pullInto argument
tyoshino Jul 1, 2015
24d5faf
Use process.nextTick to enqueue a microtask
tyoshino Jul 1, 2015
6c55dbf
Fix _callPullOrPullIntoLaterIfNeeded to be set even when not inside u…
tyoshino Jul 1, 2015
7db54d1
Add a suffix "Generic" to abstract operations that are shared by all …
tyoshino Jul 1, 2015
719ba77
Revert change on run-tests.js again
tyoshino Jul 1, 2015
48a23cd
Give shorter names to variables for controlling pull
tyoshino Jul 1, 2015
a4f9a28
Move asserts after FillPullIntoDescriptorFromQueue() call into the fu…
tyoshino Jul 1, 2015
76bf9ec
Allow underlying byte sources without pull/pullInto implementation
tyoshino Jul 2, 2015
f697ea8
Add DetachArrayBuffer calls
tyoshino Jul 2, 2015
e5b1c9d
Rename DetachArrayBuffer to TransferArrayBuffer
tyoshino Jul 2, 2015
8d263f4
Fit 120 col
tyoshino Jul 2, 2015
f39fa42
Reduce code duplication in PullFromReadableByteStreamInto()
tyoshino Jul 2, 2015
735b773
Reorganize code in PullFromReadableByteStream to be similar to PullFr…
tyoshino Jul 2, 2015
15b5d4c
Remove unnecessary CloseReadableByteStream() call in ReadableByteStre…
tyoshino Jul 2, 2015
b9ac65e
Reorganize InitializeReadableByteStreamReaderGeneric() and add missin…
tyoshino Jul 2, 2015
9d83b77
Factor out operation on controller from CancelReadableByteStream() in…
tyoshino Jul 2, 2015
0142e33
Make CancelReadableByteStreamController() clear bytes filled in _pend…
tyoshino Jul 2, 2015
ac98124
Factor out two functions from ReadableByteStreamController() for read…
tyoshino Jul 2, 2015
ed7e2b2
Just obtain reader instead of IsReadableByteStreamLocked where someth…
tyoshino Jul 6, 2015
7711f9c
Add asserts to DetachReadableByteStreamReaderGeneric
tyoshino Jul 6, 2015
cd57295
Remove ErrorReadableByteStreamReaderGeneric
tyoshino Jul 6, 2015
87ab09f
Process pending requests first when making a stream closed/errored
tyoshino Jul 6, 2015
946dd41
Make the position of DetachReadableByteStreamReaderGeneric consistent…
tyoshino Jul 6, 2015
6ddcdc5
Move reader type dependent code to CloseReadableByteStream
tyoshino Jul 7, 2015
9ba49b1
Rename DetachReadableByteStreamReaderGeneric to ReleaseReadableByteSt…
tyoshino Jul 7, 2015
f6b3edd
Add accidentally removed ReleaseReadableByteStreamReaderGeneric call
tyoshino Jul 7, 2015
b343560
Simplify CloseReadableByteStream. Align ReleaseReadableByteStreamRead…
tyoshino Jul 7, 2015
cddeae7
Factor out RespondToReadRequest()
tyoshino Jul 7, 2015
21728cc
Make the diff of the spec texts minimal
tyoshino Aug 4, 2015
bfcfa31
Remove the anchor to IsReadableByteStreamLocked as the section which …
tyoshino Aug 4, 2015
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
Prev Previous commit
Next Next commit
Tidy
  • Loading branch information
@tyoshino
tyoshino committed Jun 5, 2015
commit 3f7fd74816be1fc529acf45bc567931265978965
21 changes: 11 additions & 10 deletions reference-implementation/lib/readable-byte-stream.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ class ReadableByteStreamController {
EnqueueInReadableByteStreamController(this, chunk);

if (this._pendingPulls.length > 0) {
ProcessPullRequest(stream, this._pendingPulls.shift());
ProcessPullRequest(stream);
}

return undefined;
Expand Down Expand Up @@ -253,7 +253,7 @@ class ReadableByteStreamController {
EnqueueInReadableByteStreamController(this, buffer.slice(result.bytesUsed, descriptor.bytesFilled));

if (this._pendingPulls.length > 0) {
while (ProcessPullRequest(stream, this._pendingPulls.shift())) {}
while (ProcessPullRequest(stream)) {}
}
}
} else {
Expand Down Expand Up @@ -557,13 +557,8 @@ function DetachReadableByteStreamReader(reader) {
}

function EnqueueInReadableByteStreamController(controller, chunk) {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe just reuse the queue-with-sizes machinery already in the spec? Then you wouldn't need _totalQueuedBytes. Obviously it is less efficient, and in a real implementation we would use something like _totalQueuedBytes. But it is perhaps simpler and less work.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I also wondered why I didn't use it, but just remembered. The BYOB reader may consume only a part of a chunk in a queue. Since the existing queue-with-sizes machinery is designed to work chunk-wise, we need to shift, update (partially consume), and then unshift.

See FillPullIntoDescriptorFromQueue().

try {
controller._queue.push({buffer: chunk.buffer, byteOffset: chunk.byteOffset, byteLength: chunk.byteLength});
controller._totalQueuedBytes += chunk.byteLength;
} catch (e) {
ErrorReadableByteStream(controller._controlledReadableByteStream, e);
throw e;
}
controller._queue.push({buffer: chunk.buffer, byteOffset: chunk.byteOffset, byteLength: chunk.byteLength});
controller._totalQueuedBytes += chunk.byteLength;

return undefined;
}
Expand Down Expand Up @@ -700,6 +695,12 @@ function IsReadableByteStreamReader(x) {
}

function ProcessPullRequest(stream, descriptor) {
let detachRequired = true;
if (descriptor === undefined) {
descriptor = this._pendingPulls.shift();
detachRequired = false;
}

const controller = stream._controller;

const queue = controller._queue;
Expand Down Expand Up @@ -761,7 +762,7 @@ function ProcessPullRequest(stream, descriptor) {
return false;
}

// TODO: Detach destBuffer here.
// TODO: Detach descriptor.buffer if detachRequired is true.
controller._pendingPulls.push(descriptor);
try {
controller._underlyingByteSource.pullInto(
Expand Down