chore: no need arc-swap then (#213)

Signed-off-by: tison <wander4096@gmail.com>

Author: tisonkun

Cargo.toml

@@ -54,7 +54,6 @@ logforth-layout-text = { version = "0.3.0", path = "layouts/text" }
 
 # Crates.io dependencies
 anyhow = { version = "1.0" }
-arc-swap = { version = "1.7.1" }
 clap = { version = "4.5.49", features = ["derive"] }
 colored = { version = "3.0" }
 fastrace = { version = "0.7" }

appenders/async/Cargo.toml

@@ -32,7 +32,6 @@ all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
 
 [dependencies]
-arc-swap = { workspace = true }
 logforth-core = { workspace = true }
 oneshot = { workspace = true }
 

appenders/async/src/state.rs

@@ -12,19 +12,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use std::sync::Arc;
 use std::sync::mpsc;
 use std::thread::JoinHandle;
 
-use arc_swap::ArcSwapOption;
 use logforth_core::Error;
 
 use crate::Overflow;
 use crate::Task;
 use crate::channel::Sender;
 
 #[derive(Debug)]
-pub(crate) struct AsyncState(ArcSwapOption<State>);
+pub(crate) struct AsyncState(Option<State>);
 
 #[derive(Debug)]
 struct State {
@@ -35,20 +33,22 @@ struct State {
 
 impl AsyncState {
     pub(crate) fn new(overflow: Overflow, sender: Sender<Task>, handle: JoinHandle<()>) -> Self {
-        Self(ArcSwapOption::from(Some(Arc::new(State {
+        Self(Some(State {
             overflow,
             sender,
             handle,
-        }))))
+        }))
     }
 
     pub(crate) fn send_task(&self, task: Task) -> Result<(), Error> {
-        let state = self.0.load();
         // SAFETY: state is always Some before dropped.
-        let state = state.as_ref().unwrap();
-        let sender = &state.sender;
+        let State {
+            overflow,
+            sender,
+            handle: _,
+        } = self.0.as_ref().unwrap();
 
-        match state.overflow {
+        match overflow {
             Overflow::Block => sender.send(task).map_err(|err| {
                 Error::new(match err.0 {
                     Task::Log { .. } => "failed to send log task to async appender",
@@ -65,27 +65,21 @@ impl AsyncState {
             },
         }
     }
-
-    pub(crate) fn destroy(&self) {
-        if let Some(state) = self.0.swap(None) {
-            // SAFETY: state has always one strong count before swapped.
-            let State {
-                overflow: _,
-                sender,
-                handle,
-            } = Arc::into_inner(state).unwrap();
-
-            // drop our sender, threads will break the loop after receiving and processing
-            drop(sender);
-
-            // wait for the thread to finish
-            handle.join().expect("failed to join async appender thread");
-        }
-    }
 }
 
 impl Drop for AsyncState {
     fn drop(&mut self) {
-        self.destroy();
+        // SAFETY: state is always Some before dropped.
+        let State {
+            overflow: _,
+            sender,
+            handle,
+        } = self.0.take().unwrap();
+
+        // drop our sender, threads will break the loop after receiving and processing
+        drop(sender);
+
+        // wait for the thread to finish
+        handle.join().expect("failed to join async appender thread");
     }
 }