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

SDC manager non-blocking mode
All checks were successful
EIVE/eive-obsw/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Robin Müller
2021-08-05 10:14:17 +02:00
parent 3a88a43505
commit 1cfb9250fa
5 changed files with 180 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

136
bsp_q7s/memory/SdCardManager.cpp
View File

@ -6,13 +6,17 @@
#include "fsfw/ipc/MutexFactory.h"
#include "fsfw/serviceinterface/ServiceInterface.h"
#include <unistd.h>
#include <fstream>
#include <memory>
#include <filesystem>
#include <cstring>
SdCardManager* SdCardManager::factoryInstance = nullptr;
SdCardManager::SdCardManager() {
waiter.events = POLLIN;
}
SdCardManager::~SdCardManager() {
@ -128,6 +132,9 @@ ReturnValue_t SdCardManager::setSdCardState(sd::SdCard sdCard, bool on) {
using namespace std;
string sdstring = "";
string statestring = "";
if(currentOp != Operations::IDLE) {
return OP_ONGOING;
}
if(sdCard == sd::SdCard::SLOT_0) {
sdstring = "0";
}
@ -135,20 +142,16 @@ ReturnValue_t SdCardManager::setSdCardState(sd::SdCard sdCard, bool on) {
sdstring = "1";
}
if(on) {
currentOp = Operations::SWITCHING_ON;
statestring = "on";
}
else {
currentOp = Operations::SWITCHING_OFF;
statestring = "off";
}
ostringstream command;
command << "q7hw sd set " << sdstring << " " << statestring;
int result = system(command.str().c_str());
if(result == 0) {
return HasReturnvaluesIF::RETURN_OK;
}
sif::warning << "SdCardManager::setSdCardState: system call failed with code " <<
result << std::endl;
return SYSTEM_CALL_ERROR;
return handleCommand(command.str(), "SdCardManager::setSdCardState");
}
ReturnValue_t SdCardManager::getSdCardActiveStatus(SdStatusPair& active) {
@ -174,6 +177,9 @@ ReturnValue_t SdCardManager::getSdCardActiveStatus(SdStatusPair& active) {
ReturnValue_t SdCardManager::mountSdCard(sd::SdCard sdCard) {
using namespace std;
if(currentOp != Operations::IDLE) {
return OP_ONGOING;
}
if(sdCard == sd::SdCard::BOTH) {
sif::warning << "SdCardManager::mountSdCard: API does not allow sd::SdStatus::BOTH"
<< std::endl;
@ -196,12 +202,7 @@ ReturnValue_t SdCardManager::mountSdCard(sd::SdCard sdCard) {
}
string sdMountCommand = "mount " + mountDev + " " + mountPoint;
int result = system(sdMountCommand.c_str());
if (result != 0) {
utility::handleSystemError(result, "SdCardManager::mountSdCard");
return SYSTEM_CALL_ERROR;
}
return HasReturnvaluesIF::RETURN_OK;
return handleCommand(sdMountCommand, "SdCardManager::mountSdCard");
}
ReturnValue_t SdCardManager::unmountSdCard(sd::SdCard sdCard) {
@ -229,12 +230,7 @@ ReturnValue_t SdCardManager::unmountSdCard(sd::SdCard sdCard) {
sif::warning << "SdCardManager::unmountSdCard: Mount point is empty!" << std::endl;
}
string sdUnmountCommand = "umount " + mountPoint;
int result = system(sdUnmountCommand.c_str());
if (result != 0) {
utility::handleSystemError(result, "SdCardManager::unmountSdCard");
return SYSTEM_CALL_ERROR;
}
return HasReturnvaluesIF::RETURN_OK;
return handleCommand(sdUnmountCommand, "SdCardManager::unmountSdCard");
}
ReturnValue_t SdCardManager::sanitizeState(SdStatusPair* statusPair, sd::SdCard prefSdCard) {
@ -354,3 +350,105 @@ std::string SdCardManager::getCurrentMountPrefix(sd::SdCard prefSdCard) {
return SD_1_MOUNT_POINT;
}
}
SdCardManager::OpStatus SdCardManager::checkCurrentOp(Operations &currentOp) {
currentOp = this->currentOp;
switch(currentOpStatus) {
case(OpStatus::IDLE):
case(OpStatus::FAIL):
case(OpStatus::TIMEOUT):
case(OpStatus::SUCCESS):{
break;
}
case(OpStatus::ONGOING): {
int result = poll(&waiter, 1, 0);
switch(result) {
case(0): {
// No data available
break;
}
case(1): {
if (waiter.revents & POLLIN) {
ssize_t readBytes = read(opFileNum, readBuf.data(), readBuf.size());
if(readBytes == 0) {
// Should not happen..
sif::warning << "SdCardManager::checkCurrentOp: 0 bytes read" << std::endl;
}
else if(readBytes > 0) {
sif::info << currentCmd << " | " << readBuf.data() << std::endl;
}
else {
sif::error << "SdCardManager::checkCurrentOp: Error code " << errno <<
": " << strerror(errno) << std::endl;
return OpStatus::FAIL;
}
}
else if (waiter.revents & POLLERR) {
sif::warning << "SdCardManager::checkCurrentOp: Poll error.." << std::endl;
}
else if(waiter.revents & POLLHUP) {
int result = pclose(opFile);
if(result != 0) {
sif::error << "SdCardManager::setSdCardState: pclose failed with code " <<
result << ": " << strerror(result) << std::endl;
}
opFile = nullptr;
opFileNum = 0;
currentOp = Operations::IDLE;
return OpStatus::SUCCESS;
}
break;
}
default: {
sif::error << "SdCardManager::checkCurrentOp: Unexpected returnvalue " << result <<
"for poll call" << std::endl;
break;
}
}
}
}
return currentOpStatus;
}
void SdCardManager::resetState() {
currentOp = Operations::IDLE;
currentOpStatus = OpStatus::IDLE;
currentOpSdCard = sd::SdCard::NONE;
}
void SdCardManager::setBlocking(bool blocking) {
this->blocking = blocking;
if(not blocking) {
currentOp = Operations::IDLE;
currentOpStatus = OpStatus::IDLE;
}
}
ReturnValue_t SdCardManager::handleCommand(std::string cmd, std::string funcName) {
currentCmd = cmd;
opFile = popen(currentCmd.c_str(), "r");
if(opFile == nullptr) {
return POPEN_CALL_ERROR;
}
if(blocking) {
return handleBlockingOperation(funcName);
}
else {
opFileNum = fileno(opFile);
waiter.fd = opFileNum;
}
return HasReturnvaluesIF::RETURN_OK;
}
ReturnValue_t SdCardManager::handleBlockingOperation(std::string funcName) {
while(fgets(readBuf.data(), readBuf.size(), opFile) != nullptr) {
sif::info << currentCmd << " | " << readBuf.data() << std::endl;
}
int result = pclose(opFile);
if(result != 0) {
sif::error << "SdCardManager::setSdCardState: pclose failed with code " <<
result << ": " << strerror(result) << std::endl;
return HasReturnvaluesIF::RETURN_FAILED;
}
return HasReturnvaluesIF::RETURN_OK;
}