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

increased service 1 queue depth
All checks were successful
EIVE/eive-obsw/pipeline/pr-v3.0.0-dev This commit looks good
Details

Browse Source
This commit is contained in:
Robin Müller 2023-06-07 16:21:51 +02:00
parent dcf3b1b1fe
commit deb154770d
No known key found for this signature in database
GPG Key ID: 11D4952C8CCEF814
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bsp_q7s/core/CoreController.cpp
View File

@ -1084,8 +1084,9 @@ ReturnValue_t CoreController::actionListDirectoryDumpDirectly(ActionId_t actionI
dumpContext.segmentIdx++; dumpContext.segmentIdx++;
dumpContext.dumpedBytes += nextDumpLen; dumpContext.dumpedBytes += nextDumpLen;
// Dump takes multiple task cycles, so cache the dump state and continue dump the next cycles. // Dump takes multiple task cycles, so cache the dump state and continue dump the next cycles.
if (dumpContext.segmentIdx == 25) { if (dumpContext.segmentIdx == 10) {
dumpContext.active = true; dumpContext.active = true;
dumpContext.firstDump = true;
dumpContext.commander = commandedBy; dumpContext.commander = commandedBy;
dumpContext.actionId = actionId; dumpContext.actionId = actionId;
return returnvalue::OK; return returnvalue::OK;
@ -2358,6 +2359,10 @@ MessageQueueId_t CoreController::getCommandQueue() const {
} }
void CoreController::dirListingDumpHandler() { void CoreController::dirListingDumpHandler() {
if (dumpContext.firstDump) {
dumpContext.firstDump = false;
return;
}
size_t nextDumpLen = 0; size_t nextDumpLen = 0;
size_t dummy = 0; size_t dummy = 0;
ReturnValue_t result; ReturnValue_t result;
@ -2390,7 +2395,7 @@ void CoreController::dirListingDumpHandler() {
dumpContext.segmentIdx++; dumpContext.segmentIdx++;
dumpContext.dumpedBytes += nextDumpLen; dumpContext.dumpedBytes += nextDumpLen;
// Dump takes multiple task cycles, so cache the dump state and continue dump the next cycles. // Dump takes multiple task cycles, so cache the dump state and continue dump the next cycles.
if (dumpContext.segmentIdx == 25) { if (dumpContext.segmentIdx == 10) {
break; break;
} }
} }

1
bsp_q7s/core/CoreController.h
View File

@ -179,6 +179,7 @@ class CoreController : public ExtendedControllerBase, public ReceivesParameterMe
struct DirListingDumpContext { struct DirListingDumpContext {
bool active; bool active;
bool firstDump;
size_t dumpedBytes; size_t dumpedBytes;
size_t totalFileSize; size_t totalFileSize;
size_t listingDataOffset; size_t listingDataOffset;

1
common/config/eive/definitions.h
View File

@ -59,6 +59,7 @@ static constexpr uint32_t CFDP_STORE_QUEUE_SIZE = 300;
static constexpr uint32_t MAX_PUS_FUNNEL_QUEUE_DEPTH = 100; static constexpr uint32_t MAX_PUS_FUNNEL_QUEUE_DEPTH = 100;
static constexpr uint32_t MAX_CFDP_FUNNEL_QUEUE_DEPTH = 80; static constexpr uint32_t MAX_CFDP_FUNNEL_QUEUE_DEPTH = 80;
static constexpr uint32_t HK_SERVICE_QUEUE_DEPTH = 60; static constexpr uint32_t HK_SERVICE_QUEUE_DEPTH = 60;
static constexpr uint32_t ACTION_SERVICE_QUEUE_DEPTH = 60;
static constexpr uint32_t MAX_STORED_CMDS_UDP = 150; static constexpr uint32_t MAX_STORED_CMDS_UDP = 150;
static constexpr uint32_t MAX_STORED_CMDS_TCP = 180; static constexpr uint32_t MAX_STORED_CMDS_TCP = 180;

4
mission/genericFactory.cpp
View File

@ -234,7 +234,7 @@ void ObjectFactory::produceGenericObjects(HealthTableIF** healthTable_, PusTmFun
// PUS service stack // PUS service stack
new Service1TelecommandVerification(objects::PUS_SERVICE_1_VERIFICATION, config::EIVE_PUS_APID, new Service1TelecommandVerification(objects::PUS_SERVICE_1_VERIFICATION, config::EIVE_PUS_APID,
pus::PUS_SERVICE_1, objects::PUS_TM_FUNNEL, 40); pus::PUS_SERVICE_1, objects::PUS_TM_FUNNEL, 120);
new Service2DeviceAccess(objects::PUS_SERVICE_2_DEVICE_ACCESS, config::EIVE_PUS_APID, new Service2DeviceAccess(objects::PUS_SERVICE_2_DEVICE_ACCESS, config::EIVE_PUS_APID,
pus::PUS_SERVICE_2, 3, 10); pus::PUS_SERVICE_2, 3, 10);
new Service3Housekeeping(objects::PUS_SERVICE_3_HOUSEKEEPING, config::EIVE_PUS_APID, new Service3Housekeeping(objects::PUS_SERVICE_3_HOUSEKEEPING, config::EIVE_PUS_APID,
@ -243,7 +243,7 @@ void ObjectFactory::produceGenericObjects(HealthTableIF** healthTable_, PusTmFun
PsbParams(objects::PUS_SERVICE_5_EVENT_REPORTING, config::EIVE_PUS_APID, pus::PUS_SERVICE_5), PsbParams(objects::PUS_SERVICE_5_EVENT_REPORTING, config::EIVE_PUS_APID, pus::PUS_SERVICE_5),
80, 160); 80, 160);
new Service8FunctionManagement(objects::PUS_SERVICE_8_FUNCTION_MGMT, config::EIVE_PUS_APID, new Service8FunctionManagement(objects::PUS_SERVICE_8_FUNCTION_MGMT, config::EIVE_PUS_APID,
pus::PUS_SERVICE_8, 16, 60, 50); pus::PUS_SERVICE_8, config::ACTION_SERVICE_QUEUE_DEPTH, 16, 60);
new Service9TimeManagement( new Service9TimeManagement(
PsbParams(objects::PUS_SERVICE_9_TIME_MGMT, config::EIVE_PUS_APID, pus::PUS_SERVICE_9)); PsbParams(objects::PUS_SERVICE_9_TIME_MGMT, config::EIVE_PUS_APID, pus::PUS_SERVICE_9));