arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-04-21 10:26:06 +03:00
Code

Use lightweight tests when we only care if the buffer is empty or full.

Browse Source
This commit is contained in:
Christopher Pascoe 2015-12-28 17:53:10 -05:00
parent e147314f97
commit e83dd4d241
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cores/esp8266/cbuf.h
View File

@ -45,18 +45,22 @@ class cbuf {
return _begin - _end - 1; return _begin - _end - 1;
} }
bool empty() const { inline bool empty() const {
return _begin == _end; return _begin == _end;
} }
inline bool full() const {
return wrap_if_bufend(_end + 1) == _begin;
}
int peek() { int peek() {
if(_end == _begin) return -1; if(empty()) return -1;
return static_cast<int>(*_begin); return static_cast<int>(*_begin);
} }
int read() { int read() {
if(getSize() == 0) return -1; if(empty()) return -1;
char result = *_begin; char result = *_begin;
_begin = wrap_if_bufend(_begin + 1); _begin = wrap_if_bufend(_begin + 1);
@ -80,7 +84,7 @@ class cbuf {
} }
size_t write(char c) { size_t write(char c) {
if(room() == 0) return 0; if(full()) return 0;
*_end = c; *_end = c;
_end = wrap_if_bufend(_end + 1); _end = wrap_if_bufend(_end + 1);
@ -109,7 +113,7 @@ class cbuf {
} }
private: private:
inline char* wrap_if_bufend(char* ptr) { inline char* wrap_if_bufend(char* ptr) const {
return (ptr == _bufend) ? _buf : ptr; return (ptr == _bufend) ? _buf : ptr;
} }