rust/sat-rs
6
1
Fork 0
Code Issues 9 Pull Requests Projects Releases 29 Wiki Activity

CI fix and naming improvement

Browse Source
This commit is contained in:
Robin Mueller
2025-09-06 19:36:56 +02:00
parent 3784f47b66
commit 62d64e692a
12 changed files with 72 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
satrs/src/pus/event_srv.rs
View File

@@ -167,7 +167,7 @@ mod tests {
use crate::{
events::EventU32,
pus::{
DirectPusPacketHandlerResult, EcssTcInSharedPoolConverter, PusPacketHandlingError,
DirectPusPacketHandlerResult, EcssTcInSharedPoolCacher, PusPacketHandlingError,
event_man::EventRequestWithToken,
tests::PusServiceHandlerWithSharedStoreCommon,
verification::{TcStateAccepted, VerificationToken},
@@ -183,7 +183,7 @@ mod tests {
handler: PusEventServiceHandler<
MpscTcReceiver,
PacketSenderWithSharedPool,
EcssTcInSharedPoolConverter,
EcssTcInSharedPoolCacher,
VerificationReporter,
>,
}

42
satrs/src/pus/mod.rs
View File

@@ -973,12 +973,12 @@ pub mod std_mod {
/// Please note that this structure is not able to convert TCs which are stored inside a
/// [SharedStaticMemoryPool].
#[derive(Default, Clone)]
pub struct EcssTcInVecConverter {
pub struct EcssTcVecCacher {
sender_id: Option<ComponentId>,
pub pus_tc_raw: Option<Vec<u8>>,
}
impl CacheAndReadRawEcssTc for EcssTcInVecConverter {
impl CacheAndReadRawEcssTc for EcssTcVecCacher {
fn cache(&mut self, tc_in_memory: &TcInMemory) -> Result<(), PusTcFromMemError> {
self.pus_tc_raw = None;
match tc_in_memory {
@@ -1010,13 +1010,13 @@ pub mod std_mod {
/// packets should be avoided. Please note that this structure is not able to convert TCs which
/// are stored as a `Vec<u8>`.
#[derive(Clone)]
pub struct EcssTcInSharedPoolConverter {
pub struct EcssTcInSharedPoolCacher {
sender_id: Option<ComponentId>,
shared_tc_pool: SharedStaticMemoryPool,
pus_buf: Vec<u8>,
}
impl EcssTcInSharedPoolConverter {
impl EcssTcInSharedPoolCacher {
pub fn new(shared_tc_store: SharedStaticMemoryPool, max_expected_tc_size: usize) -> Self {
Self {
sender_id: None,
@@ -1047,7 +1047,7 @@ pub mod std_mod {
}
}
impl CacheAndReadRawEcssTc for EcssTcInSharedPoolConverter {
impl CacheAndReadRawEcssTc for EcssTcInSharedPoolCacher {
fn cache(&mut self, tc_in_memory: &TcInMemory) -> Result<(), PusTcFromMemError> {
match tc_in_memory {
super::TcInMemory::Pool(packet_in_pool) => {
@@ -1072,22 +1072,22 @@ pub mod std_mod {
// TODO: alloc feature flag?
#[derive(Clone)]
pub enum EcssTcInMemConverterWrapper {
Static(EcssTcInSharedPoolConverter),
Heap(EcssTcInVecConverter),
pub enum EcssTcCacher {
Static(EcssTcInSharedPoolCacher),
Heap(EcssTcVecCacher),
}
impl EcssTcInMemConverterWrapper {
pub fn new_static(static_store_converter: EcssTcInSharedPoolConverter) -> Self {
impl EcssTcCacher {
pub fn new_static(static_store_converter: EcssTcInSharedPoolCacher) -> Self {
Self::Static(static_store_converter)
}
pub fn new_heap(heap_converter: EcssTcInVecConverter) -> Self {
pub fn new_heap(heap_converter: EcssTcVecCacher) -> Self {
Self::Heap(heap_converter)
}
}
impl CacheAndReadRawEcssTc for EcssTcInMemConverterWrapper {
impl CacheAndReadRawEcssTc for EcssTcCacher {
fn cache(&mut self, tc_in_memory: &TcInMemory) -> Result<(), PusTcFromMemError> {
match self {
Self::Static(converter) => converter.cache(tc_in_memory),
@@ -1385,7 +1385,7 @@ pub mod tests {
pub type PusServiceHelperStatic = PusServiceHelper<
MpscTcReceiver,
PacketSenderWithSharedPool,
EcssTcInSharedPoolConverter,
EcssTcInSharedPoolCacher,
VerificationReporter,
>;
@@ -1412,7 +1412,7 @@ pub mod tests {
VerificationReporter::new(TEST_COMPONENT_ID_0.id(), &verif_cfg);
let test_srv_tm_sender =
PacketSenderWithSharedPool::new(tm_tx, shared_tm_pool_wrapper.clone());
let in_store_converter = EcssTcInSharedPoolConverter::new(shared_tc_pool.clone(), 2048);
let in_store_converter = EcssTcInSharedPoolCacher::new(shared_tc_pool.clone(), 2048);
(
Self {
pus_buf: RefCell::new([0; 2048]),
@@ -1490,12 +1490,8 @@ pub mod tests {
tc_sender: mpsc::Sender<EcssTcAndToken>,
tm_receiver: mpsc::Receiver<PacketAsVec>,
}
pub type PusServiceHelperDynamic = PusServiceHelper<
MpscTcReceiver,
MpscTmAsVecSender,
EcssTcInVecConverter,
VerificationReporter,
>;
pub type PusServiceHelperDynamic =
PusServiceHelper<MpscTcReceiver, MpscTmAsVecSender, EcssTcVecCacher, VerificationReporter>;
impl PusServiceHandlerWithVecCommon {
pub fn new_with_standard_verif_reporter(
@@ -1507,7 +1503,7 @@ pub mod tests {
let verif_cfg = VerificationReporterConfig::new(TEST_APID, 1, 2, 8).unwrap();
let verification_handler =
VerificationReporter::new(TEST_COMPONENT_ID_0.id(), &verif_cfg);
let in_store_converter = EcssTcInVecConverter::default();
let in_store_converter = EcssTcVecCacher::default();
(
Self {
current_tm: None,
@@ -1533,14 +1529,14 @@ pub mod tests {
PusServiceHelper<
MpscTcReceiver,
MpscTmAsVecSender,
EcssTcInVecConverter,
EcssTcVecCacher,
TestVerificationReporter,
>,
) {
let (test_srv_tc_tx, test_srv_tc_rx) = mpsc::channel();
let (tm_tx, tm_rx) = mpsc::channel();
let in_store_converter = EcssTcInVecConverter::default();
let in_store_converter = EcssTcVecCacher::default();
let verification_handler = TestVerificationReporter::new(id);
(
Self {

18
satrs/src/pus/scheduler_srv.rs
View File

@@ -1,9 +1,9 @@
use super::scheduler::PusSchedulerProvider;
use super::verification::{VerificationReporter, VerificationReportingProvider};
use super::{
CacheAndReadRawEcssTc, DirectPusPacketHandlerResult, EcssTcInSharedPoolConverter,
EcssTcInVecConverter, EcssTcReceiver, EcssTmSender, HandlingStatus, MpscTcReceiver,
PartialPusHandlingError, PusServiceHelper,
CacheAndReadRawEcssTc, DirectPusPacketHandlerResult, EcssTcInSharedPoolCacher, EcssTcReceiver,
EcssTcVecCacher, EcssTmSender, HandlingStatus, MpscTcReceiver, PartialPusHandlingError,
PusServiceHelper,
};
use crate::pool::PoolProvider;
use crate::pus::PusPacketHandlingError;
@@ -213,7 +213,7 @@ impl<
pub type PusService11SchedHandlerDynWithMpsc<PusScheduler> = PusSchedServiceHandler<
MpscTcReceiver,
mpsc::Sender<PacketAsVec>,
EcssTcInVecConverter,
EcssTcVecCacher,
VerificationReporter,
PusScheduler,
>;
@@ -222,7 +222,7 @@ pub type PusService11SchedHandlerDynWithMpsc<PusScheduler> = PusSchedServiceHand
pub type PusService11SchedHandlerDynWithBoundedMpsc<PusScheduler> = PusSchedServiceHandler<
MpscTcReceiver,
mpsc::SyncSender<PacketAsVec>,
EcssTcInVecConverter,
EcssTcVecCacher,
VerificationReporter,
PusScheduler,
>;
@@ -231,7 +231,7 @@ pub type PusService11SchedHandlerDynWithBoundedMpsc<PusScheduler> = PusSchedServ
pub type PusService11SchedHandlerStaticWithMpsc<PusScheduler> = PusSchedServiceHandler<
MpscTcReceiver,
PacketSenderWithSharedPool,
EcssTcInSharedPoolConverter,
EcssTcInSharedPoolCacher,
VerificationReporter,
PusScheduler,
>;
@@ -240,7 +240,7 @@ pub type PusService11SchedHandlerStaticWithMpsc<PusScheduler> = PusSchedServiceH
pub type PusService11SchedHandlerStaticWithBoundedMpsc<PusScheduler> = PusSchedServiceHandler<
MpscTcReceiver,
PacketSenderWithSharedPool,
EcssTcInSharedPoolConverter,
EcssTcInSharedPoolCacher,
VerificationReporter,
PusScheduler,
>;
@@ -253,7 +253,7 @@ mod tests {
use crate::pus::{DirectPusPacketHandlerResult, MpscTcReceiver, PusPacketHandlingError};
use crate::pus::{
EcssTcInSharedPoolConverter,
EcssTcInSharedPoolCacher,
scheduler::{self, PusSchedulerProvider, TcInfo},
tests::PusServiceHandlerWithSharedStoreCommon,
verification::{RequestId, TcStateAccepted, VerificationToken},
@@ -278,7 +278,7 @@ mod tests {
handler: PusSchedServiceHandler<
MpscTcReceiver,
PacketSenderWithSharedPool,
EcssTcInSharedPoolConverter,
EcssTcInSharedPoolCacher,
VerificationReporter,
TestScheduler,
>,

16
satrs/src/pus/test.rs
View File

@@ -9,8 +9,8 @@ use std::sync::mpsc;
use super::verification::{VerificationReporter, VerificationReportingProvider};
use super::{
CacheAndReadRawEcssTc, EcssTcInSharedPoolConverter, EcssTcInVecConverter, EcssTcReceiver,
EcssTmSender, GenericConversionError, HandlingStatus, MpscTcReceiver, PusServiceHelper,
CacheAndReadRawEcssTc, EcssTcInSharedPoolCacher, EcssTcReceiver, EcssTcVecCacher, EcssTmSender,
GenericConversionError, HandlingStatus, MpscTcReceiver, PusServiceHelper,
};
/// This is a helper class for [std] environments to handle generic PUS 17 (test service) packets.
@@ -111,7 +111,7 @@ impl<
pub type PusService17TestHandlerDynWithMpsc = PusService17TestHandler<
MpscTcReceiver,
mpsc::Sender<PacketAsVec>,
EcssTcInVecConverter,
EcssTcVecCacher,
VerificationReporter,
>;
/// Helper type definition for a PUS 17 handler with a dynamic TMTC memory backend and bounded MPSC
@@ -119,7 +119,7 @@ pub type PusService17TestHandlerDynWithMpsc = PusService17TestHandler<
pub type PusService17TestHandlerDynWithBoundedMpsc = PusService17TestHandler<
MpscTcReceiver,
mpsc::SyncSender<PacketAsVec>,
EcssTcInVecConverter,
EcssTcVecCacher,
VerificationReporter,
>;
/// Helper type definition for a PUS 17 handler with a shared store TMTC memory backend and bounded
@@ -127,7 +127,7 @@ pub type PusService17TestHandlerDynWithBoundedMpsc = PusService17TestHandler<
pub type PusService17TestHandlerStaticWithBoundedMpsc = PusService17TestHandler<
MpscTcReceiver,
PacketSenderWithSharedPool,
EcssTcInSharedPoolConverter,
EcssTcInSharedPoolCacher,
VerificationReporter,
>;
@@ -143,7 +143,7 @@ mod tests {
};
use crate::pus::verification::{TcStateAccepted, VerificationToken};
use crate::pus::{
DirectPusPacketHandlerResult, EcssTcInSharedPoolConverter, EcssTcInVecConverter,
DirectPusPacketHandlerResult, EcssTcInSharedPoolCacher, EcssTcVecCacher,
GenericConversionError, HandlingStatus, MpscTcReceiver, MpscTmAsVecSender,
PartialPusHandlingError, PusPacketHandlingError,
};
@@ -162,7 +162,7 @@ mod tests {
handler: PusService17TestHandler<
MpscTcReceiver,
PacketSenderWithSharedPool,
EcssTcInSharedPoolConverter,
EcssTcInSharedPoolCacher,
VerificationReporter,
>,
}
@@ -224,7 +224,7 @@ mod tests {
handler: PusService17TestHandler<
MpscTcReceiver,
MpscTmAsVecSender,
EcssTcInVecConverter,
EcssTcVecCacher,
VerificationReporter,
>,
}