mirror/matrix-rust-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-rust-sdk.git synced 2026-05-12 18:21:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

refactor(ui): Move the spawning of the child tasks into the supervisor

Browse Source
This commit is contained in:
Damir Jelić
2025-01-16 14:38:37 +01:00
parent 3085f05d51
commit 7c2b15fe86
1 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
crates/matrix-sdk-ui/src/sync_service.rs
View File

@@ -79,13 +79,11 @@ struct SyncTaskSupervisor {
}
impl SyncTaskSupervisor {
async fn new(
inner: &SyncServiceInner,
room_list_task: JoinHandle<()>,
encryption_sync_task: JoinHandle<()>,
sender: Sender<TerminationReport>,
receiver: Receiver<TerminationReport>,
) -> Self {
async fn new(inner: &SyncServiceInner) -> Self {
let (sender, receiver) = tokio::sync::mpsc::channel(16);
let (room_list_task, encryption_sync_task) =
Self::spawn_child_tasks(inner, sender.clone()).await;
let task = spawn(Self::spawn_supervisor_task(
inner,
room_list_task,
@@ -167,6 +165,27 @@ impl SyncTaskSupervisor {
.instrument(tracing::span!(Level::WARN, "supervisor task"))
}
async fn spawn_child_tasks(
inner: &SyncServiceInner,
sender: Sender<TerminationReport>,
) -> (JoinHandle<()>, JoinHandle<()>) {
// First, take care of the room list.
let room_list_task = spawn(SyncService::room_list_sync_task(
inner.room_list_service.clone(),
sender.clone(),
));
// Then, take care of the encryption sync.
let sync_permit_guard = inner.encryption_sync_permit.clone().lock_owned().await;
let encryption_sync_task = spawn(SyncService::encryption_sync_task(
inner.encryption_sync_service.clone(),
sender.clone(),
sync_permit_guard,
));
(room_list_task, encryption_sync_task)
}
async fn shutdown(self) -> Result<(), Error> {
match self
.abortion_sender
@@ -350,26 +369,7 @@ impl SyncService {
}
trace!("starting sync service");
let (sender, receiver) = tokio::sync::mpsc::channel(16);
// First, take care of the room list.
let room_list_task =
spawn(Self::room_list_sync_task(self.room_list_service.clone(), sender.clone()));
// Then, take care of the encryption sync.
let sync_permit_guard = inner.encryption_sync_permit.clone().lock_owned().await;
let encryption_sync_task = spawn(Self::encryption_sync_task(
inner.encryption_sync_service.clone(),
sender.clone(),
sync_permit_guard,
));
// Spawn the supervisor task.
inner.supervisor = Some(
SyncTaskSupervisor::new(&inner, room_list_task, encryption_sync_task, sender, receiver)
.await,
);
inner.supervisor = Some(SyncTaskSupervisor::new(&inner).await);
self.state.set(State::Running);
}