thooge
/
esp32-nmea2000-obp60
mirror of https://github.com/thooge/esp32-nmea2000-obp60.git
1
0
Fork 0
Code Releases Activity

streamline buffer handling

This commit is contained in:
andreas 2021-10-27 10:43:53 +02:00
parent e378f6e56b
commit b007586076
4 changed files with 94 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

188
lib/queue/GwBuffer.cpp
View File

@ -6,10 +6,9 @@ void GwBuffer::lp(const char *fkt, int p)
fkt, buffer, offset(writePointer), offset(readPointer), usedSpace(), freeSpace(), p);
}
GwBuffer::GwBuffer(GwLog *logger,size_t bufferSize, bool rotate)
GwBuffer::GwBuffer(GwLog *logger,size_t bufferSize)
{
this->logger = logger;
this->rotate=rotate;
this->bufferSize=bufferSize;
this->buffer=new uint8_t[bufferSize];
writePointer = buffer;
@ -26,67 +25,45 @@ void GwBuffer::reset()
}
size_t GwBuffer::freeSpace()
{
if (! rotate){
return bufferSize-offset(writePointer)-1;
if (readPointer <= writePointer){
return readPointer+bufferSize-writePointer-1;
}
if (readPointer < writePointer)
{
size_t rt = bufferSize - offset(writePointer) - 1 + offset(readPointer);
return rt;
}
if (readPointer == writePointer)
return bufferSize - 1;
return readPointer - writePointer - 1;
}
size_t GwBuffer::usedSpace()
{
if (readPointer == writePointer)
return 0;
if (readPointer < writePointer)
if (readPointer <= writePointer)
return writePointer - readPointer;
return bufferSize - offset(readPointer) + offset(writePointer);
return writePointer+bufferSize-readPointer;
}
size_t GwBuffer::addData(const uint8_t *data, size_t len)
size_t GwBuffer::addData(const uint8_t *data, size_t len, bool addPartial)
{
lp("addDataE", len);
if (len == 0)
return 0;
if (freeSpace() < len && rotate)
//in rotating mode (send buffer)
//we only fill in a message if it fit's completely
if (freeSpace() < len && !addPartial)
return 0;
size_t written = 0;
if (writePointer >= readPointer)
{
written = bufferSize - offset(writePointer) - 1;
bool canRotate=rotate && offset(readPointer) > 0;
if (canRotate) written++; //we can also fill the last byte
if (written > len)
written = len;
if (written)
{
memcpy(writePointer, data, written);
len -= written;
data += written;
writePointer += written;
if (offset(writePointer) > (bufferSize - 1))
writePointer = buffer;
for (int i=0;i<2;i++){
size_t currentFree=freeSpace();
size_t toWrite=len-written;
if (toWrite > currentFree) toWrite=currentFree;
if (toWrite > (bufferSize - offset(writePointer))) {
toWrite=bufferSize - offset(writePointer);
}
lp("addData1", written);
if (len <= 0)
{
if (toWrite != 0){
memcpy(writePointer, data, toWrite);
written+=toWrite;
data += toWrite;
writePointer += toWrite;
if (offset(writePointer) >= bufferSize){
writePointer -= bufferSize;
}
}
lp("addData1", toWrite);
}
lp("addData2", written);
return written;
}
if (! rotate) return written;
}
//now we have the write pointer before the read pointer
int maxLen=readPointer-writePointer-1;
if (maxLen <= 0) return written;
if (len < maxLen) maxLen=len;
memcpy(writePointer, data, maxLen);
writePointer += maxLen;
lp("addData2", maxLen);
return maxLen + written;
}
/**
* write some data to the buffer writer
@ -94,92 +71,66 @@ size_t GwBuffer::addData(const uint8_t *data, size_t len)
*/
GwBuffer::WriteStatus GwBuffer::fetchData(GwBufferWriter *writer, int maxLen,bool errorIf0 )
{
lp("fetchDataE");
lp("fetchDataE",maxLen);
size_t len = usedSpace();
if (maxLen > 0 && len > maxLen) len=maxLen;
if (len == 0)
if (len == 0){
lp("fetchData0",maxLen);
writer->done();
return OK;
}
size_t written = 0;
size_t plen = len;
if (writePointer < readPointer)
{
//we need to write from readPointer till end and then till writePointer-1
plen = bufferSize - offset(readPointer) - 1;
int rt = writer->write(readPointer, plen);
lp("fetchData1", rt);
if (rt < 0)
{
LOG_DEBUG(GwLog::DEBUG + 1, "buffer: write returns error %d", rt);
return ERROR;
for (int i=0;i<2;i++){
size_t currentUsed=usedSpace();
size_t toWrite=len-written;
if (toWrite > currentUsed) toWrite=currentUsed;
if (toWrite > (bufferSize - offset(readPointer))) {
toWrite=bufferSize - offset(readPointer);
}
if (rt > plen)
lp("fetchData1", toWrite);
if (toWrite > 0)
{
LOG_DEBUG(GwLog::DEBUG + 1, "buffer: write too many bytes(1) %d", rt);
return ERROR;
}
if (rt == 0)
{
LOG_DEBUG(GwLog::DEBUG + 1, "buffer: write returns 0 (1)");
return (errorIf0 ? ERROR : AGAIN);
}
readPointer += rt;
if (offset(readPointer) > (bufferSize - 1))
readPointer = buffer;
if (rt < plen)
return AGAIN;
if (plen >= len)
return OK;
len -= rt;
written += rt;
//next part - readPointer should be at buffer now
}
plen = writePointer - readPointer;
if (plen == 0)
return OK;
int rt = writer->write(readPointer, plen);
int rt = writer->write(readPointer, toWrite);
lp("fetchData2", rt);
if (rt < 0)
{
LOG_DEBUG(GwLog::DEBUG + 1, "buffer: write returns error %d", rt);
writer->done();
return ERROR;
}
if (rt == 0)
if (rt > toWrite)
{
LOG_DEBUG(GwLog::DEBUG + 1, "buffer: write returns 0 (1)");
return (errorIf0 ? ERROR : AGAIN);
}
if (rt > plen)
{
LOG_DEBUG(GwLog::DEBUG + 1, "buffer: write too many bytes(2)");
LOG_DEBUG(GwLog::DEBUG + 1, "buffer: write too many bytes(1) %d", rt);
writer->done();
return ERROR;
}
readPointer += rt;
if (offset(readPointer) > (bufferSize - 1))
readPointer = buffer;
lp("fetchData3");
if (offset(readPointer) >= bufferSize)
readPointer -= bufferSize;
written += rt;
if (written < len)
return AGAIN;
return OK;
if (rt == 0) break; //no need to try again
}
}
writer->done();
if (written == 0){
return (errorIf0 ? ERROR : AGAIN);
}
return (written == len)?OK:AGAIN;
}
int GwBuffer::findChar(char x){
lp("findChar",x);
int offset=0;
int of=0;
uint8_t *p;
for (p=readPointer; p != writePointer && p < (buffer+bufferSize);p++){
if (*p == x) return offset;
offset++;
}
if (p >= (buffer+bufferSize)){
//we reached the end of the buffer without "hitting" the write pointer
//so we can start from the beginning if rotating...
if (! rotate) return -1;
for (p=buffer;p < writePointer && p < (buffer+bufferSize);p++){
if (*p == x) return offset;
offset++;
for (p=readPointer; of < usedSpace();p++){
if (offset(p) >= bufferSize) p -=bufferSize;
if (*p == x) {
lp("findChar1",of);
return of;
}
of++;
}
lp("findChar2");
return -1;
}
@ -193,22 +144,5 @@ GwBuffer::WriteStatus GwBuffer::fetchMessage(GwBufferWriter *writer,char delimit
}
return AGAIN;
}
if (! rotate){
//in a non rotating buffer we discard the found message
//and copy the remain to the start
int len=pos+1;
int wr=writer->write(readPointer,len);
//in any case discard the data now
int remain=usedSpace()-len;
if (remain > 0){
memcpy(buffer,readPointer+len,remain);
readPointer=buffer;
writePointer=buffer+remain;
}
else{
reset();
}
return (wr == len)?OK:ERROR;
}
return fetchData(writer,pos+1,true);
}

9
lib/queue/GwBuffer.h
View File

@ -8,6 +8,7 @@ class GwBufferWriter{
public:
int id=0; //can be set be users
virtual int write(const uint8_t *buffer,size_t len)=0;
virtual void done(){}
virtual ~GwBufferWriter(){};
};
@ -18,7 +19,8 @@ class GwBufferWriter{
*/
class GwBuffer{
public:
static const size_t BUFFER_SIZE=1620; // app. 20 NMEA messages
static const size_t TX_BUFFER_SIZE=1620; // app. 20 NMEA messages
static const size_t RX_BUFFER_SIZE=200; // enough for 1 NMEA message...
typedef enum {
OK,
ERROR,
@ -26,7 +28,6 @@ class GwBuffer{
} WriteStatus;
private:
size_t bufferSize;
bool rotate;
uint8_t *buffer;
uint8_t *writePointer;
uint8_t *readPointer;
@ -40,12 +41,12 @@ class GwBuffer{
*/
int findChar(char x);
public:
GwBuffer(GwLog *logger,size_t bufferSize,bool rotate=true);
GwBuffer(GwLog *logger,size_t bufferSize);
~GwBuffer();
void reset();
size_t freeSpace();
size_t usedSpace();
size_t addData(const uint8_t *data,size_t len);
size_t addData(const uint8_t *data,size_t len,bool addPartial=false);
/**
* write some data to the buffer writer
* return an error if the buffer writer returned < 0

6
lib/socketserver/GwSocketServer.cpp
View File

@ -3,8 +3,6 @@
#include <lwip/sockets.h>
#include "GwBuffer.h"
#define WRITE_BUFFER_SIZE 1600
#define READ_BUFFER_SIZE 200
class Writer : public GwBufferWriter{
public:
wiFiClientPtr client;
@ -63,9 +61,9 @@ class GwClient{
this->client=client;
this->logger=logger;
this->allowRead=allowRead;
buffer=new GwBuffer(logger,WRITE_BUFFER_SIZE);
buffer=new GwBuffer(logger,GwBuffer::TX_BUFFER_SIZE);
if (allowRead){
readBuffer=new GwBuffer(logger,READ_BUFFER_SIZE,false);
readBuffer=new GwBuffer(logger,GwBuffer::RX_BUFFER_SIZE);
}
overflows=0;
if (client != NULL){

24
src/main.cpp
View File

@ -408,13 +408,27 @@ void SendNMEA0183Message(const tNMEA0183Msg &NMEA0183Msg) {
}
class NMEAMessageReceiver : public GwBufferWriter{
uint8_t buffer[GwBuffer::RX_BUFFER_SIZE+1];
uint8_t *writePointer=buffer;
public:
virtual int write(const uint8_t *buffer,size_t len){
char nbuf[len+1];
memcpy(nbuf,buffer,len);
nbuf[len]=0;
logger.logDebug(GwLog::DEBUG,"NMEA[%d]: %s",id,nbuf);
return len;
size_t toWrite=GwBuffer::RX_BUFFER_SIZE-(writePointer-buffer);
if (toWrite > len) toWrite=len;
memcpy(writePointer,buffer,toWrite);
writePointer+=toWrite;
*writePointer=0;
return toWrite;
}
virtual void done(){
if (writePointer == buffer) return;
logger.logDebug(GwLog::DEBUG,"NMEA-IN[%d]: %s",id,(const char *)buffer);
uint8_t *p;
for (p=writePointer-1;p>=buffer;p--){
if (*p <= 0x20) *p=0;
}
for (p=buffer; *p != 0 && p < writePointer && *p <= 0x20;p++){}
logger.logDebug(GwLog::DEBUG,"NMEA[%d]: %s",id,(const char *)p);
writePointer=buffer;
}
};
void loop() {