eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 121 Wiki Activity

some fixes for thread shutdown code
All checks were successful
EIVE/eive-obsw/pipeline/pr-develop This commit looks good
Details

Browse Source
This commit is contained in:
Robin Müller
2022-11-08 14:52:07 +01:00
parent 763bf2d85b
commit f564fb5c1a
3 changed files with 102 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
linux/devices/ploc/PlocSupervisorHandler.cpp
View File

@ -64,7 +64,7 @@ ReturnValue_t PlocSupervisorHandler::initialize() {
if (result != returnvalue::OK) {
return ObjectManagerIF::CHILD_INIT_FAILED;
}
supvHelper->setComCookie(comCookie);
// supvHelper->setComCookie(comCookie);
result = eventSubscription();
if (result != returnvalue::OK) {
@ -97,7 +97,7 @@ ReturnValue_t PlocSupervisorHandler::executeAction(ActionId_t actionId,
switch (actionId) {
case TERMINATE_SUPV_HELPER: {
supvHelper->stopProcess();
supvHelper->stop();
return EXECUTION_FINISHED;
}
default:
@ -148,18 +148,18 @@ ReturnValue_t PlocSupervisorHandler::executeAction(ActionId_t actionId,
plocSupvHelperExecuting = true;
return EXECUTION_FINISHED;
}
case LOGGING_REQUEST_EVENT_BUFFERS: {
if (size > config::MAX_PATH_SIZE) {
return result::FILENAME_TOO_LONG;
}
result = supvHelper->startEventBufferRequest(
std::string(reinterpret_cast<const char*>(data), size));
if (result != returnvalue::OK) {
return result;
}
plocSupvHelperExecuting = true;
return EXECUTION_FINISHED;
}
// case LOGGING_REQUEST_EVENT_BUFFERS: {
// if (size > config::MAX_PATH_SIZE) {
// return result::FILENAME_TOO_LONG;
// }
// result = supvHelper->startEventBufferRequest(
// std::string(reinterpret_cast<const char*>(data), size));
// if (result != returnvalue::OK) {
// return result;
// }
// plocSupvHelperExecuting = true;
// return EXECUTION_FINISHED;
// }
default:
break;
}