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

make logging thread safe

This commit is contained in:
andreas 2021-11-06 14:32:14 +01:00
parent 180ca4b785
commit 99beb82014
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/log/GWLog.cpp
View File

@ -12,27 +12,37 @@ GwLog::GwLog(int level, GwLogWriter *writer){
logLevel=level; logLevel=level;
if (writer == NULL) writer=new DefaultLogWriter(); if (writer == NULL) writer=new DefaultLogWriter();
this->writer=writer; this->writer=writer;
locker = xSemaphoreCreateMutex();
}
GwLog::~GwLog(){
vSemaphoreDelete(locker);
} }
void GwLog::logString(const char *fmt,...){ void GwLog::logString(const char *fmt,...){
if (! writer) return;
va_list args; va_list args;
va_start(args,fmt); va_start(args,fmt);
xSemaphoreTake(locker, portMAX_DELAY);
vsnprintf(buffer,99,fmt,args); vsnprintf(buffer,99,fmt,args);
if (! writer) return;
writer->write(prefix.c_str()); writer->write(prefix.c_str());
writer->write(buffer); writer->write(buffer);
writer->write("\n"); writer->write("\n");
xSemaphoreGive(locker);
} }
void GwLog::logDebug(int level,const char *fmt,...){ void GwLog::logDebug(int level,const char *fmt,...){
if (level > logLevel) return; if (level > logLevel) return;
if (! writer) return;
va_list args; va_list args;
va_start(args,fmt); va_start(args,fmt);
xSemaphoreTake(locker, portMAX_DELAY);
vsnprintf(buffer,99,fmt,args); vsnprintf(buffer,99,fmt,args);
if (! writer) return;
writer->write(prefix.c_str()); writer->write(prefix.c_str());
writer->write(buffer); writer->write(buffer);
writer->write("\n"); writer->write("\n");
xSemaphoreGive(locker);
} }
void GwLog::setWriter(GwLogWriter *writer){ void GwLog::setWriter(GwLogWriter *writer){
xSemaphoreTake(locker, portMAX_DELAY);
if (this->writer) delete this->writer; if (this->writer) delete this->writer;
this->writer=writer; this->writer=writer;
xSemaphoreGive(locker);
} }

2
lib/log/GwLog.h
View File

@ -12,6 +12,7 @@ class GwLog{
char buffer[100]; char buffer[100];
int logLevel=1; int logLevel=1;
GwLogWriter *writer; GwLogWriter *writer;
SemaphoreHandle_t locker;
public: public:
static const int LOG=1; static const int LOG=1;
static const int ERROR=0; static const int ERROR=0;
@ -19,6 +20,7 @@ class GwLog{
static const int TRACE=2; static const int TRACE=2;
String prefix="LOG:"; String prefix="LOG:";
GwLog(int level=LOG, GwLogWriter *writer=NULL); GwLog(int level=LOG, GwLogWriter *writer=NULL);
~GwLog();
void setWriter(GwLogWriter *writer); void setWriter(GwLogWriter *writer);
void logString(const char *fmt,...); void logString(const char *fmt,...);
void logDebug(int level, const char *fmt,...); void logDebug(int level, const char *fmt,...);