From 5b412bf07269c847be6269c2c71c2deb3df5db3d Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Thu, 25 Nov 2021 21:38:13 +0100 Subject: [PATCH 1/4] implemented rename function --- bsp_q7s/boardtest/Q7STestTask.cpp | 45 +++++++++++--- bsp_q7s/boardtest/Q7STestTask.h | 2 + bsp_q7s/memory/FileSystemHandler.cpp | 87 ++++++++++------------------ bsp_q7s/memory/FileSystemHandler.h | 2 + 4 files changed, 73 insertions(+), 63 deletions(-) diff --git a/bsp_q7s/boardtest/Q7STestTask.cpp b/bsp_q7s/boardtest/Q7STestTask.cpp index 7681ef09..965a6d63 100644 --- a/bsp_q7s/boardtest/Q7STestTask.cpp +++ b/bsp_q7s/boardtest/Q7STestTask.cpp @@ -26,8 +26,8 @@ ReturnValue_t Q7STestTask::performOneShotAction() { //testJsonLibDirect(); //testDummyParams(); //testProtHandler(); - //FsOpCodes opCode = FsOpCodes::ATTEMPT_DIR_REMOVAL_NON_EMPTY; - //testFileSystemHandlerDirect(opCode); + FsOpCodes opCode = FsOpCodes::APPEND_TO_FILE; + testFileSystemHandlerDirect(opCode); return TestTask::performOneShotAction(); } @@ -252,7 +252,7 @@ void Q7STestTask::testFileSystemHandlerDirect(FsOpCodes opCode) { cfg.useMountPrefix = false; sif::info << "Creating empty file in /tmp folder" << std::endl; // Do not delete file, user can check existence in shell - fsHandler->createFile("/tmp", "test.txt", nullptr, 0, &cfg); + fsHandler->createFile("/tmp/", "test.txt", nullptr, 0, &cfg); break; } case(FsOpCodes::REMOVE_TMP_FILE): { @@ -262,7 +262,7 @@ void Q7STestTask::testFileSystemHandlerDirect(FsOpCodes opCode) { if(not std::filesystem::exists("/tmp/test.txt")) { // Creating sample file sif::info << "Creating sample file /tmp/test.txt to delete" << std::endl; - fsHandler->createFile("/tmp", "test.txt", nullptr, 0, &cfg); + fsHandler->createFile("/tmp/", "test.txt", nullptr, 0, &cfg); } result = fsHandler->removeFile("/tmp", "test.txt", &cfg); if(result == HasReturnvaluesIF::RETURN_OK) { @@ -278,7 +278,7 @@ void Q7STestTask::testFileSystemHandlerDirect(FsOpCodes opCode) { cfg.useMountPrefix = false; sif::info << "Creating empty file in /tmp folder" << std::endl; // Do not delete file, user can check existence in shell - ReturnValue_t result = fsHandler->createDirectory("/tmp", "test", false, &cfg); + ReturnValue_t result = fsHandler->createDirectory("/tmp/", "test", false, &cfg); if(result == HasReturnvaluesIF::RETURN_OK) { sif::info << "Directory created successfully" << std::endl; } @@ -297,7 +297,7 @@ void Q7STestTask::testFileSystemHandlerDirect(FsOpCodes opCode) { // Delete any leftover files to regular dir removal works std::remove("/tmp/test/*"); } - result = fsHandler->removeDirectory("/tmp", "test", false, &cfg); + result = fsHandler->removeDirectory("/tmp/", "test", false, &cfg); if(result == HasReturnvaluesIF::RETURN_OK) { sif::info << "Directory removed successfully" << std::endl; } @@ -311,7 +311,7 @@ void Q7STestTask::testFileSystemHandlerDirect(FsOpCodes opCode) { if(result != HasReturnvaluesIF::RETURN_OK) { return; } - result = fsHandler->removeDirectory("/tmp", "test", true, &cfg); + result = fsHandler->removeDirectory("/tmp/", "test", true, &cfg); if(result == HasReturnvaluesIF::RETURN_OK) { sif::info << "Directory removed recursively successfully" << std::endl; } @@ -325,13 +325,42 @@ void Q7STestTask::testFileSystemHandlerDirect(FsOpCodes opCode) { if(result != HasReturnvaluesIF::RETURN_OK) { return; } - result = fsHandler->removeDirectory("/tmp", "test", false, &cfg); + result = fsHandler->removeDirectory("/tmp/", "test", false, &cfg); if(result != HasReturnvaluesIF::RETURN_OK) { sif::info << "Directory removal attempt failed as expected" << std::endl; } else { sif::warning << "Directory removal worked when it should not have!" << std::endl; } + break; + } + case(FsOpCodes::RENAME_FILE): { + // No mount prefix, cause file is created in tmp + cfg.useMountPrefix = false; + if(std::filesystem::exists("/tmp/test.txt")) { + fsHandler->removeDirectory("/tmp/", "test", false, &cfg); + } + sif::info << "Creating empty file /tmp/test.txt and rename to /tmp/test2.txt" << std::endl; + // Do not delete file, user can check existence in shell + fsHandler->createFile("/tmp/", "test.txt", nullptr, 0, &cfg); + fsHandler->renameFile("/tmp/", "test.txt", "test2.txt", &cfg); + break; + } + case(FsOpCodes::APPEND_TO_FILE): { + // No mount prefix, cause file is created in tmp + cfg.useMountPrefix = false; + if(std::filesystem::exists("/tmp/test.txt")) { + fsHandler->removeDirectory("/tmp/", "test", false, &cfg); + } + if(std::filesystem::exists("/tmp/test.txt")) { + fsHandler->removeDirectory("/tmp/", "test", false, &cfg); + } + sif::info << "Creating empty file /tmp/test.txt and adding content" << std::endl; + std::string content = "Hello World\n"; + // Do not delete file, user can check existence in shell + fsHandler->createFile("/tmp/", "test.txt", nullptr, 0, &cfg); + fsHandler->appendToFile("/tmp/", "test.txt", reinterpret_cast( + content.data()), content.size(), 0, &cfg); } } } diff --git a/bsp_q7s/boardtest/Q7STestTask.h b/bsp_q7s/boardtest/Q7STestTask.h index b0153ce9..5e11b374 100644 --- a/bsp_q7s/boardtest/Q7STestTask.h +++ b/bsp_q7s/boardtest/Q7STestTask.h @@ -27,6 +27,8 @@ private: REMOVE_EMPTY_DIR_IN_TMP, ATTEMPT_DIR_REMOVAL_NON_EMPTY, REMOVE_FILLED_DIR_IN_TMP, + RENAME_FILE, + APPEND_TO_FILE, }; void testFileSystemHandlerDirect(FsOpCodes opCode); }; diff --git a/bsp_q7s/memory/FileSystemHandler.cpp b/bsp_q7s/memory/FileSystemHandler.cpp index 2943875a..caad94a6 100644 --- a/bsp_q7s/memory/FileSystemHandler.cpp +++ b/bsp_q7s/memory/FileSystemHandler.cpp @@ -136,13 +136,11 @@ ReturnValue_t FileSystemHandler::initialize() { ReturnValue_t FileSystemHandler::appendToFile(const char* repositoryPath, const char* filename, const uint8_t* data, size_t size, uint16_t packetNumber, FileSystemArgsIF* args) { - // A double slash between repo and filename should not be an issue, so add it in any case - std::string fullPath = currentMountPrefix + std::string(repositoryPath) + "/" + - std::string(filename); - if(not std::filesystem::exists(fullPath)) { + auto path = getInitPath(args) / repositoryPath / filename; + if(not std::filesystem::exists(path)) { return FILE_DOES_NOT_EXIST; } - std::ofstream file(fullPath, std::ios_base::app|std::ios_base::out); + std::ofstream file(path, std::ios_base::app|std::ios_base::out); file.write(reinterpret_cast(data), size); if(not file.good()) { return GENERIC_FILE_ERROR; @@ -152,19 +150,11 @@ ReturnValue_t FileSystemHandler::appendToFile(const char* repositoryPath, ReturnValue_t FileSystemHandler::createFile(const char* repositoryPath, const char* filename, const uint8_t* data, size_t size, FileSystemArgsIF* args) { - std::string fullPath; - bool useMountPrefix = true; - parseCfg(reinterpret_cast(args), useMountPrefix); - if(useMountPrefix) { - fullPath += currentMountPrefix; - } - - // A double slash between repo and filename should not be an issue, so add it in any case - fullPath += std::string(repositoryPath) + "/" + std::string(filename); - if(std::filesystem::exists(fullPath)) { + auto path = getInitPath(args) / filename; + if(std::filesystem::exists(path)) { return FILE_ALREADY_EXISTS; } - std::ofstream file(fullPath); + std::ofstream file(path); file.write(reinterpret_cast(data), size); if(not file.good()) { return GENERIC_FILE_ERROR; @@ -174,19 +164,11 @@ ReturnValue_t FileSystemHandler::createFile(const char* repositoryPath, ReturnValue_t FileSystemHandler::removeFile(const char* repositoryPath, const char* filename, FileSystemArgsIF* args) { - std::string fullPath; - bool useMountPrefix = true; - parseCfg(reinterpret_cast(args), useMountPrefix); - if(useMountPrefix) { - fullPath += currentMountPrefix; - } - - // A double slash between repo and filename should not be an issue, so add it in any case - fullPath += std::string(repositoryPath) + "/" + std::string(filename); - if(not std::filesystem::exists(fullPath)) { + auto path = getInitPath(args) / repositoryPath / filename; + if(not std::filesystem::exists(path)) { return FILE_DOES_NOT_EXIST; } - int result = std::remove(fullPath.c_str()); + int result = std::remove(path.c_str()); if(result != 0) { sif::warning << "FileSystemHandler::deleteFile: Failed with code " << result << std::endl; return GENERIC_FILE_ERROR; @@ -196,42 +178,26 @@ ReturnValue_t FileSystemHandler::removeFile(const char* repositoryPath, ReturnValue_t FileSystemHandler:: createDirectory(const char* repositoryPath, const char* dirname, bool createParentDirs, FileSystemArgsIF* args) { - std::string fullPath; - bool useMountPrefix = true; - parseCfg(reinterpret_cast(args), useMountPrefix); - if(useMountPrefix) { - fullPath += currentMountPrefix; - } - - fullPath += std::string(repositoryPath); - fullPath += "/" + std::string(dirname); - if(std::filesystem::exists(fullPath)) { + auto path = getInitPath(args) / repositoryPath / dirname; + if(std::filesystem::exists(path)) { return DIRECTORY_ALREADY_EXISTS; } - if(std::filesystem::create_directory(fullPath)) { + if(std::filesystem::create_directory(path)) { return HasReturnvaluesIF::RETURN_OK; } - sif::warning << "Creating directory " << fullPath << " failed" << std::endl; + sif::warning << "Creating directory " << path << " failed" << std::endl; return GENERIC_FILE_ERROR; } ReturnValue_t FileSystemHandler::removeDirectory(const char* repositoryPath, const char* dirname, bool deleteRecurively, FileSystemArgsIF* args) { - std::string fullPath; - bool useMountPrefix = true; - parseCfg(reinterpret_cast(args), useMountPrefix); - if(useMountPrefix) { - fullPath += currentMountPrefix; - } - - fullPath += std::string(repositoryPath); - fullPath += "/" + std::string(dirname); - if(not std::filesystem::exists(fullPath)) { + auto path = getInitPath(args) / repositoryPath / dirname; + if(not std::filesystem::exists(path)) { return DIRECTORY_DOES_NOT_EXIST; } std::error_code err; if(not deleteRecurively) { - if(std::filesystem::remove(fullPath, err)) { + if(std::filesystem::remove(path, err)) { return HasReturnvaluesIF::RETURN_OK; } else { @@ -248,7 +214,7 @@ ReturnValue_t FileSystemHandler::removeDirectory(const char* repositoryPath, con } } else { - if(std::filesystem::remove_all(fullPath, err)) { + if(std::filesystem::remove_all(path, err)) { return HasReturnvaluesIF::RETURN_OK; } else { @@ -267,14 +233,25 @@ ReturnValue_t FileSystemHandler::removeDirectory(const char* repositoryPath, con return HasReturnvaluesIF::RETURN_OK; } +ReturnValue_t FileSystemHandler::renameFile(const char *repositoryPath, const char *oldFilename, + const char *newFilename, FileSystemArgsIF *args) { + auto basepath = getInitPath(args) / repositoryPath; + std::filesystem::rename(basepath / oldFilename, basepath / newFilename); + return HasReturnvaluesIF::RETURN_OK; +} + void FileSystemHandler::parseCfg(FsCommandCfg *cfg, bool& useMountPrefix) { if(cfg != nullptr) { useMountPrefix = cfg->useMountPrefix; } } -ReturnValue_t FileSystemHandler::renameFile(const char *repositoryPath, const char *oldFilename, - const char *newFilename, FileSystemArgsIF *args) { - // TODO: Implement - return HasReturnvaluesIF::RETURN_OK; +std::filesystem::path FileSystemHandler::getInitPath(FileSystemArgsIF* args) { + bool useMountPrefix = true; + parseCfg(reinterpret_cast(args), useMountPrefix); + std::string path; + if(useMountPrefix) { + path = currentMountPrefix; + } + return std::filesystem::path(path); } diff --git a/bsp_q7s/memory/FileSystemHandler.h b/bsp_q7s/memory/FileSystemHandler.h index 8fdebd05..35a0f533 100644 --- a/bsp_q7s/memory/FileSystemHandler.h +++ b/bsp_q7s/memory/FileSystemHandler.h @@ -10,6 +10,7 @@ #include "fsfw/memory/HasFileSystemIF.h" #include +#include class CoreController; @@ -61,6 +62,7 @@ private: void fileSystemHandlerLoop(); void fileSystemCheckup(); + std::filesystem::path getInitPath(FileSystemArgsIF* args); void parseCfg(FsCommandCfg* cfg, bool& useMountPrefix); }; From 667bbc918f5ab62430fb841b77678f8318ac3fa7 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 30 Nov 2021 14:40:35 +0100 Subject: [PATCH 2/4] make some debug output optional --- linux/obc/PdecHandler.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/linux/obc/PdecHandler.cpp b/linux/obc/PdecHandler.cpp index 027cac80..0c2d207a 100644 --- a/linux/obc/PdecHandler.cpp +++ b/linux/obc/PdecHandler.cpp @@ -295,7 +295,9 @@ bool PdecHandler::checkFrameAna(uint32_t pdecFar) { break; } case(FrameAna_t::FRAME_ACCEPTED): { - sif::debug << "PdecHandler::checkFrameAna: Accepted TC frame" << std::endl; +#if OBSW_DEBUG_PDEC_HANDLER == 1 + sif::info << "PdecHandler::checkFrameAna: Accepted TC frame" << std::endl; +#endif frameValid = true; break; } From 8d284b3d2acc1875a1a1c24fce594b878c5c0211 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 30 Nov 2021 14:41:42 +0100 Subject: [PATCH 3/4] using warning insted of debug --- linux/obc/PdecHandler.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/linux/obc/PdecHandler.cpp b/linux/obc/PdecHandler.cpp index 0c2d207a..1ac83d44 100644 --- a/linux/obc/PdecHandler.cpp +++ b/linux/obc/PdecHandler.cpp @@ -257,7 +257,7 @@ bool PdecHandler::checkFrameAna(uint32_t pdecFar) { switch(frameAna) { case(FrameAna_t::ABANDONED_CLTU): { triggerEvent(INVALID_TC_FRAME, ABANDONED_CLTU); - sif::debug << "PdecHandler::checkFrameAna: Abondoned CLTU" << std::endl; + sif::warning << "PdecHandler::checkFrameAna: Abondoned CLTU" << std::endl; break; } case(FrameAna_t::FRAME_DIRTY): { @@ -266,31 +266,31 @@ bool PdecHandler::checkFrameAna(uint32_t pdecFar) { break; } case(FrameAna_t::FRAME_ILLEGAL): { - sif::debug << "PdecHandler::checkFrameAna: Frame illegal for one reason" << std::endl; + sif::warning << "PdecHandler::checkFrameAna: Frame illegal for one reason" << std::endl; handleIReason(pdecFar, FRAME_ILLEGAL_ONE_REASON); break; } case(FrameAna_t::FRAME_ILLEGAL_MULTI_REASON): { - sif::debug << "PdecHandler::checkFrameAna: Frame illegal for multiple reasons" + sif::warning << "PdecHandler::checkFrameAna: Frame illegal for multiple reasons" << std::endl; handleIReason(pdecFar, FRAME_ILLEGAL_MULTIPLE_REASONS); break; } case(FrameAna_t::AD_DISCARDED_LOCKOUT): { triggerEvent(INVALID_TC_FRAME, AD_DISCARDED_LOCKOUT); - sif::debug << "PdecHandler::checkFrameAna: AD frame discarded because of lockout" + sif::warning << "PdecHandler::checkFrameAna: AD frame discarded because of lockout" << std::endl; break; } case(FrameAna_t::AD_DISCARDED_WAIT): { triggerEvent(INVALID_TC_FRAME, AD_DISCARDED_LOCKOUT); - sif::debug << "PdecHandler::checkFrameAna: AD frame discarded because of wait" + sif::warning << "PdecHandler::checkFrameAna: AD frame discarded because of wait" << std::endl; break; } case(FrameAna_t::AD_DISCARDED_NS_VR): { triggerEvent(INVALID_TC_FRAME, AD_DISCARDED_NS_VS); - sif::debug << "PdecHandler::checkFrameAna: AD frame discarded because N(S) or V(R)" + sif::warning << "PdecHandler::checkFrameAna: AD frame discarded because N(S) or V(R)" << std::endl; break; } From d287aa80c11b517fe6c3719266944edc863acf76 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 30 Nov 2021 14:54:10 +0100 Subject: [PATCH 4/4] increase max number of stored packets in tmtcbridge --- fsfw | 2 +- mission/core/GenericFactory.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fsfw b/fsfw index d8580074..ceb87b5a 160000 --- a/fsfw +++ b/fsfw @@ -1 +1 @@ -Subproject commit d8580074c2730d861353ab47e659afeb707afe71 +Subproject commit ceb87b5abb2992a18266328e0ea34d9af15db7af diff --git a/mission/core/GenericFactory.cpp b/mission/core/GenericFactory.cpp index 58485b71..14c8791a 100644 --- a/mission/core/GenericFactory.cpp +++ b/mission/core/GenericFactory.cpp @@ -101,18 +101,18 @@ void ObjectFactory::produceGenericObjects() { #if OBSW_ADD_TCPIP_BRIDGE == 1 #if OBSW_USE_TCP_BRIDGE == 0 auto tmtcBridge = new UdpTmTcBridge(objects::TMTC_BRIDGE, objects::CCSDS_PACKET_DISTRIBUTOR); - tmtcBridge->setMaxNumberOfPacketsStored(50); new UdpTcPollingTask(objects::TMTC_POLLING_TASK, objects::TMTC_BRIDGE); sif::info << "Created UDP server for TMTC commanding with listener port " << udpBridge->getUdpPort() << std::endl; #else auto tmtcBridge = new TcpTmTcBridge(objects::TMTC_BRIDGE, objects::CCSDS_PACKET_DISTRIBUTOR); - tmtcBridge->setMaxNumberOfPacketsStored(50); auto tcpServer = new TcpTmTcServer(objects::TMTC_POLLING_TASK, objects::TMTC_BRIDGE); // TCP is stream based. Use packet ID as start marker when parsing for space packets tcpServer->setSpacePacketParsingOptions({common::PUS_PACKET_ID}); sif::info << "Created TCP server for TMTC commanding with listener port " << tcpServer->getTcpPort() << std::endl; #endif /* OBSW_USE_TMTC_TCP_BRIDGE == 0 */ + tmtcBridge->setMaxNumberOfPacketsStored(70); #endif /* OBSW_ADD_TCPIP_BRIDGE == 1 */ + }