From db0b161424bb19a6847aeef09bfed1e777285e0e Mon Sep 17 00:00:00 2001
From: xiaohu-zhang <silver9886@126.com>
Date: Fri, 20 Sep 2024 20:13:16 +0800
Subject: [PATCH] fix async Philosopher execise livelock error (#2372)

---
 .../async-exercises/dining-philosophers.rs    | 30 +++++--------------
 1 file changed, 8 insertions(+), 22 deletions(-)

diff --git a/src/concurrency/async-exercises/dining-philosophers.rs b/src/concurrency/async-exercises/dining-philosophers.rs
index 12cb08a9..7c8d6f64 100644
--- a/src/concurrency/async-exercises/dining-philosophers.rs
+++ b/src/concurrency/async-exercises/dining-philosophers.rs
@@ -43,26 +43,9 @@ impl Philosopher {
     async fn eat(&self) {
         // Keep trying until we have both forks
         // ANCHOR_END: Philosopher-eat
-        let (_left_fork, _right_fork) = loop {
-            // Pick up forks...
-            let left_fork = self.left_fork.try_lock();
-            let right_fork = self.right_fork.try_lock();
-            let Ok(left_fork) = left_fork else {
-                // If we didn't get the left fork, drop the right fork if we
-                // have it and let other tasks make progress.
-                drop(right_fork);
-                time::sleep(time::Duration::from_millis(1)).await;
-                continue;
-            };
-            let Ok(right_fork) = right_fork else {
-                // If we didn't get the right fork, drop the left fork and let
-                // other tasks make progress.
-                drop(left_fork);
-                time::sleep(time::Duration::from_millis(1)).await;
-                continue;
-            };
-            break (left_fork, right_fork);
-        };
+        // Pick up forks...
+        let _left_fork = self.left_fork.lock().await;
+        let _right_fork = self.right_fork.lock().await;
 
         // ANCHOR: Philosopher-eat-body
         println!("{} is eating...", &self.name);
@@ -89,8 +72,11 @@ async fn main() {
         let mut philosophers = vec![];
         let (tx, rx) = mpsc::channel(10);
         for (i, name) in PHILOSOPHERS.iter().enumerate() {
-            let left_fork = Arc::clone(&forks[i]);
-            let right_fork = Arc::clone(&forks[(i + 1) % PHILOSOPHERS.len()]);
+            let mut left_fork = Arc::clone(&forks[i]);
+            let mut right_fork = Arc::clone(&forks[(i + 1) % PHILOSOPHERS.len()]);
+            if i == PHILOSOPHERS.len() - 1 {
+                std::mem::swap(&mut left_fork, &mut right_fork);
+            }
             philosophers.push(Philosopher {
                 name: name.to_string(),
                 left_fork,