Skip to content

Parsing shouldn't end when the stream has no bytes available #46

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

Open
MihaiDamian wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Parsing shouldn't end when the stream has no bytes available #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d4c6ddf
The parser will now wait for the stream until it has available data
Jul 15, 2013
3d661d5
Added DerivedData folder to gitignore
Jul 15, 2013
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
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ build
**/*.mode*
*.xcodeproj/xcworkspace/xcuserdata/**
.DS_Store
xcuserdata
xcuserdata
DerivedData
30 changes: 22 additions & 8 deletions CHCSVParser/CHCSVParser.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,14 +202,28 @@ - (void)_loadMoreIfNecessary {
NSUInteger reloadPortion = stringLength / 3;
if (reloadPortion < 10) { reloadPortion = 10; }

if ([_stream hasBytesAvailable] && _nextIndex+reloadPortion >= stringLength) {
// read more from the stream
uint8_t buffer[CHUNK_SIZE];
NSInteger readBytes = [_stream read:buffer maxLength:CHUNK_SIZE];
if (readBytes > 0) {
// append it to the buffer
[_stringBuffer appendBytes:buffer length:readBytes];
[self setTotalBytesRead:[self totalBytesRead] + readBytes];
NSStreamStatus streamStatus = _stream.streamStatus;
if (_nextIndex+reloadPortion >= stringLength) {

// wait for the stream to either have available data, end in some way or for parsing to get canceled
while (![_stream hasBytesAvailable] &&
streamStatus != NSStreamStatusAtEnd &&
streamStatus != NSStreamStatusClosed &&
streamStatus != NSStreamStatusError &&
_cancelled == NO) {
[NSThread sleepForTimeInterval:0.1];
}

// need to check again if data is available since the wait loop could have finished if the stream ended
if([_stream hasBytesAvailable] && _cancelled == NO) {
// read more from the stream
uint8_t buffer[CHUNK_SIZE];
NSInteger readBytes = [_stream read:buffer maxLength:CHUNK_SIZE];
if (readBytes > 0) {
// append it to the buffer
[_stringBuffer appendBytes:buffer length:readBytes];
[self setTotalBytesRead:[self totalBytesRead] + readBytes];
}
}
}

Expand Down