Adding upstream version 115.7.0esr.upstream/115.7.0esr

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 156 insertions, 0 deletions

diff --git a/third_party/rust/tokio-util/src/sync/tests/loom_cancellation_token.rs b/third_party/rust/tokio-util/src/sync/tests/loom_cancellation_token.rs
new file mode 100644
index 0000000000..e9c9f3dd98
--- /dev/null
+++ b/third_party/rust/tokio-util/src/sync/tests/loom_cancellation_token.rs
@@ -0,0 +1,155 @@
+use crate::sync::CancellationToken;
+
+use loom::{future::block_on, thread};
+use tokio_test::assert_ok;
+
+#[test]
+fn cancel_token() {
+    loom::model(|| {
+        let token = CancellationToken::new();
+        let token1 = token.clone();
+
+        let th1 = thread::spawn(move || {
+            block_on(async {
+                token1.cancelled().await;
+            });
+        });
+
+        let th2 = thread::spawn(move || {
+            token.cancel();
+        });
+
+        assert_ok!(th1.join());
+        assert_ok!(th2.join());
+    });
+}
+
+#[test]
+fn cancel_with_child() {
+    loom::model(|| {
+        let token = CancellationToken::new();
+        let token1 = token.clone();
+        let token2 = token.clone();
+        let child_token = token.child_token();
+
+        let th1 = thread::spawn(move || {
+            block_on(async {
+                token1.cancelled().await;
+            });
+        });
+
+        let th2 = thread::spawn(move || {
+            token2.cancel();
+        });
+
+        let th3 = thread::spawn(move || {
+            block_on(async {
+                child_token.cancelled().await;
+            });
+        });
+
+        assert_ok!(th1.join());
+        assert_ok!(th2.join());
+        assert_ok!(th3.join());
+    });
+}
+
+#[test]
+fn drop_token_no_child() {
+    loom::model(|| {
+        let token = CancellationToken::new();
+        let token1 = token.clone();
+        let token2 = token.clone();
+
+        let th1 = thread::spawn(move || {
+            drop(token1);
+        });
+
+        let th2 = thread::spawn(move || {
+            drop(token2);
+        });
+
+        let th3 = thread::spawn(move || {
+            drop(token);
+        });
+
+        assert_ok!(th1.join());
+        assert_ok!(th2.join());
+        assert_ok!(th3.join());
+    });
+}
+
+#[test]
+fn drop_token_with_childs() {
+    loom::model(|| {
+        let token1 = CancellationToken::new();
+        let child_token1 = token1.child_token();
+        let child_token2 = token1.child_token();
+
+        let th1 = thread::spawn(move || {
+            drop(token1);
+        });
+
+        let th2 = thread::spawn(move || {
+            drop(child_token1);
+        });
+
+        let th3 = thread::spawn(move || {
+            drop(child_token2);
+        });
+
+        assert_ok!(th1.join());
+        assert_ok!(th2.join());
+        assert_ok!(th3.join());
+    });
+}
+
+#[test]
+fn drop_and_cancel_token() {
+    loom::model(|| {
+        let token1 = CancellationToken::new();
+        let token2 = token1.clone();
+        let child_token = token1.child_token();
+
+        let th1 = thread::spawn(move || {
+            drop(token1);
+        });
+
+        let th2 = thread::spawn(move || {
+            token2.cancel();
+        });
+
+        let th3 = thread::spawn(move || {
+            drop(child_token);
+        });
+
+        assert_ok!(th1.join());
+        assert_ok!(th2.join());
+        assert_ok!(th3.join());
+    });
+}
+
+#[test]
+fn cancel_parent_and_child() {
+    loom::model(|| {
+        let token1 = CancellationToken::new();
+        let token2 = token1.clone();
+        let child_token = token1.child_token();
+
+        let th1 = thread::spawn(move || {
+            drop(token1);
+        });
+
+        let th2 = thread::spawn(move || {
+            token2.cancel();
+        });
+
+        let th3 = thread::spawn(move || {
+            child_token.cancel();
+        });
+
+        assert_ok!(th1.join());
+        assert_ok!(th2.join());
+        assert_ok!(th3.join());
+    });
+}
diff --git a/third_party/rust/tokio-util/src/sync/tests/mod.rs b/third_party/rust/tokio-util/src/sync/tests/mod.rs
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/third_party/rust/tokio-util/src/sync/tests/mod.rs
@@ -0,0 +1 @@
+