From 201d05d4fa069b2b9fb7a9d1243688ae5bd01464 Mon Sep 17 00:00:00 2001
From: Floris Bruynooghe <flub@devork.be>
Date: Thu, 30 Mar 2023 10:52:47 +0200
Subject: [PATCH] Remove Context::free_ongoing function

This is now handled better by the Drop from the OngoingGuard returned
by Context::alloc_ongoing.
---
 src/configure.rs     |  6 ++----
 src/context.rs       |  5 -----
 src/imex.rs          |  5 ++---
 src/imex/transfer.rs | 33 ++++++++++-----------------------
 4 files changed, 14 insertions(+), 35 deletions(-)

diff --git a/src/configure.rs b/src/configure.rs
index d6589975a..504454b4a 100644
--- a/src/configure.rs
+++ b/src/configure.rs
@@ -66,18 +66,16 @@ impl Context {
             self.sql.is_open().await,
             "cannot configure, database not opened."
         );
-        let cancel_channel = self.alloc_ongoing().await?;
+        let ongoing_guard = self.alloc_ongoing().await?;
 
         let res = self
             .inner_configure()
-            .race(cancel_channel.map(|_| {
+            .race(ongoing_guard.map(|_| {
                 progress!(self, 0);
                 Ok(())
             }))
             .await;
 
-        self.free_ongoing().await;
-
         if let Err(err) = res.as_ref() {
             progress!(
                 self,
diff --git a/src/context.rs b/src/context.rs
index 8835aeb51..59879a179 100644
--- a/src/context.rs
+++ b/src/context.rs
@@ -545,11 +545,6 @@ impl Context {
         })
     }
 
-    pub(crate) async fn free_ongoing(&self) {
-        let mut s = self.running_state.write().await;
-        *s = RunningState::Stopped;
-    }
-
     /// Signal an ongoing process to stop.
     pub async fn stop_ongoing(&self) {
         let mut s = self.running_state.write().await;
diff --git a/src/imex.rs b/src/imex.rs
index 0dc519d52..94f79b8f5 100644
--- a/src/imex.rs
+++ b/src/imex.rs
@@ -88,18 +88,17 @@ pub async fn imex(
     path: &Path,
     passphrase: Option<String>,
 ) -> Result<()> {
-    let cancel = context.alloc_ongoing().await?;
+    let ongoing_guard = context.alloc_ongoing().await?;
 
     let res = {
         let _guard = context.scheduler.pause(context.clone()).await;
         imex_inner(context, what, path, passphrase)
             .race(async {
-                cancel.await;
+                ongoing_guard.await;
                 Err(format_err!("canceled"))
             })
             .await
     };
-    context.free_ongoing().await;
 
     if let Err(err) = res.as_ref() {
         // We are using Anyhow's .context() and to show the inner error, too, we need the {:#}:
diff --git a/src/imex/transfer.rs b/src/imex/transfer.rs
index 3ef7a16fe..2a93bf268 100644
--- a/src/imex/transfer.rs
+++ b/src/imex/transfer.rs
@@ -90,7 +90,7 @@ impl BackupProvider {
             .context("Private key not available, aborting backup export")?;
 
         // Acquire global "ongoing" mutex.
-        let mut cancel_token = context.alloc_ongoing().await?;
+        let mut ongoing_guard = context.alloc_ongoing().await?;
         let paused_guard = context.scheduler.pause(context.clone()).await;
         let context_dir = context
             .get_blobdir()
@@ -102,7 +102,7 @@ impl BackupProvider {
             warn!(context, "Previous database export deleted");
         }
         let dbfile = TempPathGuard::new(dbfile);
-        let res = tokio::select! {
+        let (provider, ticket) = tokio::select! {
             biased;
             res = Self::prepare_inner(context, &dbfile) => {
                 match res {
@@ -113,20 +113,12 @@ impl BackupProvider {
                     },
                 }
             },
-            _ = &mut cancel_token => Err(format_err!("cancelled")),
-        };
-        let (provider, ticket) = match res {
-            Ok((provider, ticket)) => (provider, ticket),
-            Err(err) => {
-                context.free_ongoing().await;
-                return Err(err);
-            }
-        };
+            _ = &mut ongoing_guard => Err(format_err!("cancelled")),
+        }?;
         let handle = {
             let context = context.clone();
             tokio::spawn(async move {
-                let res = Self::watch_provider(&context, provider, cancel_token).await;
-                context.free_ongoing().await;
+                let res = Self::watch_provider(&context, provider, ongoing_guard).await;
 
                 // Explicit drop to move the guards into this future
                 drop(paused_guard);
@@ -189,7 +181,6 @@ impl BackupProvider {
         mut provider: Provider,
         mut cancel_token: OngoingGuard,
     ) -> Result<()> {
-        // _dbfile exists so we can clean up the file once it is no longer needed
         let mut events = provider.subscribe();
         let mut total_size = 0;
         let mut current_size = 0;
@@ -373,16 +364,12 @@ pub async fn get_backup(context: &Context, qr: Qr) -> Result<()> {
     let _guard = context.scheduler.pause(context.clone()).await;
 
     // Acquire global "ongoing" mutex.
-    let cancel_token = context.alloc_ongoing().await?;
-    let res = tokio::select! {
+    let mut cancel_token = context.alloc_ongoing().await?;
+    tokio::select! {
         biased;
-        res = get_backup_inner(context, qr) => {
-            context.free_ongoing().await;
-            res
-        }
-        _ = cancel_token => Err(format_err!("cancelled")),
-    };
-    res
+        res = get_backup_inner(context, qr) => res,
+        _ = &mut cancel_token => Err(format_err!("cancelled")),
+    }
 }
 
 async fn get_backup_inner(context: &Context, qr: Qr) -> Result<()> {