Commit ab309e4

earlephilhowerme-no-dev

authored and

committed

Copy ESP8266 String w/SSO to ESP32 repo (#2715)

I redid the ESP8266 WString library to enable small string optimization (SSO) a while back, and think it would be helpful even on the ESP32 with its higher memory complement. SSO avoids lots of tiny mallocs() on the heap which cause fragmentation by using the memory in the class object itself to store the actual string and only mallocing() for buffers that are larger than what can fit in thie class object. Modern C++ std::string implementations have this optimization as well, but since we're using Arduino strings we had to roll our own.

1 parent 932666a commit ab309e4Copy full SHA for ab309e4

File tree

3 files changed

+656

-729

lines changed

cores/esp32

3 files changed

+656

-729

lines changed

`‎cores/esp32/StreamString.cpp‎`

Lines changed: 10 additions & 15 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`StreamString.cpp`
`3`	`3`
`4`	`4`	`Copyright (c) 2015 Markus Sattler. All rights reserved.`
	`5`	`+ This file is part of the esp8266 core for Arduino environment.`
`5`	`6`
`6`	`7`	`This library is free software; you can redistribute it and/or`
`7`	`8`	`modify it under the terms of the GNU Lesser General Public`
`@@ -22,31 +23,27 @@`
`22`	`23`	`#include <Arduino.h>`
`23`	`24`	`#include "StreamString.h"`
`24`	`25`
`25`		`-size_t StreamString::write(const uint8_t *data, size_t size)`
`26`		`-{`
	`26`	`+size_t StreamString::write(const uint8_t *data, size_t size) {`
`27`	`27`	`if(size && data) {`
`28`	`28`	`if(reserve(length() + size + 1)) {`
`29`		`- memcpy((void ) (buffer + len), (const void ) data, size);`
`30`		`- len += size;`
`31`		`- *(buffer + len) = 0x00; // add null for string end`
	`29`	`+ memcpy((void ) (wbuffer() + len()), (const void ) data, size);`
	`30`	`+ setLen(len() + size);`
	`31`	`+ *(wbuffer() + len()) = 0x00; // add null for string end`
`32`	`32`	`return size;`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`	`return 0;`
`36`	`36`	`}`
`37`	`37`
`38`		`-size_t StreamString::write(uint8_t data)`
`39`		`-{`
	`38`	`+size_t StreamString::write(uint8_t data) {`
`40`	`39`	`return concat((char) data);`
`41`	`40`	`}`
`42`	`41`
`43`		`-int StreamString::available()`
`44`		`-{`
	`42`	`+int StreamString::available() {`
`45`	`43`	`return length();`
`46`	`44`	`}`
`47`	`45`
`48`		`-int StreamString::read()`
`49`		`-{`
	`46`	`+int StreamString::read() {`
`50`	`47`	`if(length()) {`
`51`	`48`	`char c = charAt(0);`
`52`	`49`	`remove(0, 1);`
`@@ -56,16 +53,14 @@ int StreamString::read()`
`56`	`53`	`return -1;`
`57`	`54`	`}`
`58`	`55`
`59`		`-int StreamString::peek()`
`60`		`-{`
	`56`	`+int StreamString::peek() {`
`61`	`57`	`if(length()) {`
`62`	`58`	`char c = charAt(0);`
`63`	`59`	`return c;`
`64`	`60`	`}`
`65`	`61`	`return -1;`
`66`	`62`	`}`
`67`	`63`
`68`		`-void StreamString::flush()`
`69`		`-{`
	`64`	`+void StreamString::flush() {`
`70`	`65`	`}`
`71`	`66`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit ab309e4

File tree

3 files changed

3 files changed

`‎cores/esp32/StreamString.cpp‎`

0 commit comments