Skip to content

Commit 776b38f

Browse files
committed
AsyncStreams: Remove the Destroying state
1 parent c6cd828 commit 776b38f

File tree

2 files changed

+2
-17
lines changed

2 files changed

+2
-17
lines changed

Libraries/AsyncStreams/AsyncStreams.cpp

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -191,12 +191,6 @@ void AsyncReadableStream::emitOnData()
191191

192192
void AsyncReadableStream::push(AsyncBufferView::ID bufferID, size_t newSize)
193193
{
194-
if (state == State::Destroying)
195-
{
196-
eventClose.emit();
197-
state = State::Destroyed;
198-
return;
199-
}
200194
if (newSize == 0)
201195
{
202196
emitError(Result::Error("AsyncReadableStream::push zero sized buffer is not allowed"));
@@ -323,15 +317,11 @@ void AsyncReadableStream::destroy()
323317
case State::Paused:
324318
case State::Pausing:
325319
case State::Reading:
326-
state = State::Destroyed;
327-
eventClose.emit();
328-
break;
329320
case State::AsyncPushing:
330321
case State::AsyncReading:
331-
// Must wait for async read to finish
332-
state = State::Destroying;
322+
state = State::Destroyed;
323+
eventClose.emit();
333324
break;
334-
case State::Destroying: emitError(Result::Error("AsyncReadableStream::destroy - already destroying")); break;
335325
case State::Destroyed: emitError(Result::Error("AsyncReadableStream::destroy - already destroyed")); break;
336326
case State::Ended: emitError(Result::Error("AsyncReadableStream::destroy - already ended")); break;
337327
case State::Stopped: emitError(Result::Error("AsyncReadableStream::destroy - already stopped")); break;
@@ -390,10 +380,6 @@ void AsyncReadableStream::pushEnd()
390380
eventEnd.emit();
391381
eventClose.emit();
392382
break;
393-
case State::Destroying:
394-
eventClose.emit();
395-
state = State::Destroyed;
396-
break;
397383
case State::Destroyed: emitError(Result::Error("AsyncReadableStream::pushEnd - stream is destroyed")); break;
398384
case State::Ended: emitError(Result::Error("AsyncReadableStream::pushEnd - stream already ended")); break;
399385
case State::Stopped: emitError(Result::Error("AsyncReadableStream::pushEnd - stream is not even inited")); break;

Libraries/AsyncStreams/AsyncStreams.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,6 @@ struct AsyncReadableStream
239239
Pausing, // Pause requested while read in flight
240240
Paused, // Actually paused with no read in flight
241241
Ended, // Emitted all data, no more data will be emitted
242-
Destroying, // Readable is waiting for async call before
243242
Destroyed, // Readable has been destroyed before emitting all data
244243
Errored, // Error occurred
245244
};

0 commit comments

Comments
 (0)