Skip to content

Fix DiagnosticsService upload filesystem files bigger than chunk size #420

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix DiagnosticsService upload filesystem files bigger than chunk size #420

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions src/MicroOcpp/Model/Diagnostics/DiagnosticsService.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,14 +269,17 @@ void DiagnosticsService::setDiagnosticsReader(std::function<size_t(char *buf, si
}
diagPostambleLen = 0;
diagPostambleTransferred = 0;
diagFilesBackTransferred = 0;

auto& model = context.getModel();

auto cpVendor = makeString(getMemoryTag());
auto cpModel = makeString(getMemoryTag());
auto fwVersion = makeString(getMemoryTag());

if (auto bootService = model.getBootService()) {
if (auto cpCreds = bootService->getChargePointCredentials()) {
cpVendor = (*cpCreds)["chargePointVendor"] | "Vendor";
cpModel = (*cpCreds)["chargePointModel"] | "Charger";
fwVersion = (*cpCreds)["firmwareVersion"] | "";
}
Expand All @@ -288,7 +291,8 @@ void DiagnosticsService::setDiagnosticsReader(std::function<size_t(char *buf, si
int ret;

ret = snprintf(diagPreamble, diagPreambleSize,
"### %s Hardware Diagnostics%s%s\n%s\n",
"### %s %s - Hardware Diagnostics%s%s\n%s\n",
cpVendor.c_str(),
cpModel.c_str(),
fwVersion.empty() ? "" : " - v. ", fwVersion.c_str(),
jsonDate);
Expand Down Expand Up @@ -418,6 +422,8 @@ void DiagnosticsService::setDiagnosticsReader(std::function<size_t(char *buf, si
if (ret < 0 || (size_t)ret >= sizeof(fpath)) {
MO_DBG_ERR("fn error: %i", ret);
diagFileList.pop_back();
// next file starts from offset 0
diagFilesBackTransferred = 0;
continue;
}

Expand All @@ -429,6 +435,7 @@ void DiagnosticsService::setDiagnosticsReader(std::function<size_t(char *buf, si
if (writeLen < 0 || (size_t)writeLen >= sizeof(fileHeading)) {
MO_DBG_ERR("fn error: %i", ret);
diagFileList.pop_back();
diagFilesBackTransferred = 0;
continue;
}
if (writeLen + written > size || //heading doesn't fit anymore, return with a bit unused buffer space and print heading the next time
Expand All @@ -444,14 +451,19 @@ void DiagnosticsService::setDiagnosticsReader(std::function<size_t(char *buf, si

file->seek(diagFilesBackTransferred);
size_t writeLen = file->read((char*)buf + written, size - written);

// advance per-file offset
diagFilesBackTransferred += writeLen;
if (writeLen < size - written) {
// EOF for this file; move to next and reset offset
MO_DBG_DEBUG("upload diag chunk %zu (done)", diagFilesBackTransferred);
diagFileList.pop_back();
diagFilesBackTransferred = 0;
}
written += writeLen;
} else {
MO_DBG_ERR("could not open file: %s", fpath);
diagFileList.pop_back();
diagFilesBackTransferred = 0;
}
}

Expand All @@ -470,6 +482,7 @@ void DiagnosticsService::setDiagnosticsReader(std::function<size_t(char *buf, si
MO_FREE(diagPreamble);
MO_FREE(diagPostamble);
diagFileList.clear();
diagFilesBackTransferred = 0; //reset offset for future uploads

if (onClose) {
onClose();
Expand Down