fix(core): fix unnecessarily strict Ordering

SARDONYX-sard · Jan 8, 2024 · 1c77b35 · 1c77b35
1 parent 279d955
commit 1c77b35
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/dar2oar_core/src/fs/converter/parallel.rs b/dar2oar_core/src/fs/converter/parallel.rs
@@ -77,10 +77,12 @@ pub async fn convert_dar_to_oar(
         progress_fn(idx);
     }
 
-    if is_converted_once.load(Ordering::Acquire) {
-        handle_conversion_results(hide_dar, &dar_namespace, &dar_1st_namespace).await
-    } else {
-        Err(ConvertError::NeverConverted)
+    // # Ordering validity:
+    // Since all processing threads are loaded after they have finished, ordering relationships are not a concern.
+    // Therefore, there is no problem in using `Relaxed`.
+    match is_converted_once.load(Ordering::Relaxed) {
+        true => handle_conversion_results(hide_dar, &dar_namespace, &dar_1st_namespace).await,
+        false => Err(ConvertError::NeverConverted),
     }
 }
 

diff --git a/dar2oar_core/src/fs/converter/sequential.rs b/dar2oar_core/src/fs/converter/sequential.rs
@@ -56,10 +56,12 @@ pub async fn convert_dar_to_oar(
         idx += 1;
     }
 
-    if is_converted_once.load(Ordering::Acquire) {
-        handle_conversion_results(hide_dar, &dar_namespace, &dar_1st_namespace).await
-    } else {
-        Err(ConvertError::NeverConverted)
+    // # Ordering validity:
+    // The order is irrelevant because `tokio::spawn` is not used in the while loop.
+    // Therefore, there is no problem in using `Relaxed`.
+    match is_converted_once.load(Ordering::Relaxed) {
+        true => handle_conversion_results(hide_dar, &dar_namespace, &dar_1st_namespace).await,
+        false => Err(ConvertError::NeverConverted),
     }
 }