Skip to content

Fix StreamString read O(n^2); improve range read performance #4584

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.

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

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ tests/hosts/lcov/
*.gch

boards.local.txt
platform.local.txt

*.gcov
*.gcno
Expand Down
19 changes: 12 additions & 7 deletions cores/esp8266/StreamString.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -39,23 +39,28 @@ size_t StreamString::write(uint8_t data) {
return concat((char) data);
}

size_t StreamString::readBytes(char *buffer, size_t length) {
size_t cpylen = min(length, (size_t)available());
memcpy(buffer, begin()+_offset, cpylen);
_offset += cpylen;
return cpylen;
}

int StreamString::available() {
return length();
return length() - _offset;
}

int StreamString::read() {
if(length()) {
char c = charAt(0);
remove(0, 1);
if(available()) {
char c = charAt(_offset++);
return c;

}
return -1;
}

int StreamString::peek() {
if(length()) {
char c = charAt(0);
if(available()) {
char c = charAt(_offset);
return c;
}
return -1;
Expand Down
6 changes: 6 additions & 0 deletions cores/esp8266/StreamString.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,20 @@


class StreamString: public Stream, public String {
protected:
size_t _offset = 0;
public:
size_t write(const uint8_t *buffer, size_t size) override;
size_t write(uint8_t data) override;

size_t readBytes(char *buffer, size_t length) override;

int available() override;
int read() override;
int peek() override;
void flush() override;

void reset() { _offset = 0; }
};


Expand Down