andreika-git
/
rusefi
mirror of https://github.com/andreika-git/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#503

This commit is contained in:
rusefi 2017-12-02 17:02:49 -05:00
parent 25bdef10e4
commit e75dfdc86b
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
firmware/util/datalogging.cpp
View File

@ -49,7 +49,7 @@ static bool intermediateLoggingBufferInited = false;
/** /**
* @returns true if data does not fit into this buffer * @returns true if data does not fit into this buffer
*/ */
static ALWAYS_INLINE bool validateBuffer(Logging *logging, uint32_t extraLen) { static ALWAYS_INLINE bool validateBuffer(Logging *logging, const char *text, uint32_t extraLen) {
if (logging->buffer == NULL) { if (logging->buffer == NULL) {
firmwareError(CUSTOM_ERR_LOGGING_NOT_READY, "Logging not initialized: %s", logging->name); firmwareError(CUSTOM_ERR_LOGGING_NOT_READY, "Logging not initialized: %s", logging->name);
return true; return true;
@ -57,7 +57,8 @@ static ALWAYS_INLINE bool validateBuffer(Logging *logging, uint32_t extraLen) {
if (remainingSize(logging) < extraLen + 1) { if (remainingSize(logging) < extraLen + 1) {
#if EFI_PROD_CODE #if EFI_PROD_CODE
warning(CUSTOM_LOGGING_BUFFER_OVERFLOW, "output overflow %s", logging->name); const char * msg = extraLen > 50 ? "(long)" : text;
warning(CUSTOM_LOGGING_BUFFER_OVERFLOW, "output overflow %s %d [%s]", logging->name, extraLen, msg);
#endif /* EFI_PROD_CODE */ #endif /* EFI_PROD_CODE */
return true; return true;
} }
@ -67,7 +68,7 @@ static ALWAYS_INLINE bool validateBuffer(Logging *logging, uint32_t extraLen) {
void append(Logging *logging, const char *text) { void append(Logging *logging, const char *text) {
efiAssertVoid(text != NULL, "append NULL"); efiAssertVoid(text != NULL, "append NULL");
uint32_t extraLen = efiStrlen(text); uint32_t extraLen = efiStrlen(text);
bool isCapacityProblem = validateBuffer(logging, extraLen); bool isCapacityProblem = validateBuffer(logging, text, extraLen);
if (isCapacityProblem) { if (isCapacityProblem) {
return; return;
} }