|
| 1 | +use futures_channel::oneshot; |
1 | 2 | use std::future::pending; |
2 | | -use std::thread; |
3 | 3 | use std::time::Duration; |
4 | 4 |
|
5 | 5 | use gio::prelude::*; |
6 | 6 |
|
7 | 7 | use futures::prelude::*; |
8 | 8 |
|
| 9 | +const TIMEOUT: Duration = Duration::from_secs(3); |
| 10 | + |
9 | 11 | /// A very long task. This task actually never ends. |
10 | 12 | async fn a_very_long_task() { |
11 | 13 | println!("Very long task started"); |
12 | 14 | pending().await |
13 | 15 | } |
14 | 16 |
|
15 | | -fn main() { |
16 | | - const TIMEOUT: Duration = Duration::from_secs(3); |
| 17 | +#[glib::main] |
| 18 | +async fn main() { |
| 19 | + let (tx, rx) = oneshot::channel(); |
17 | 20 |
|
18 | | - let main_ctx = glib::MainContext::default(); |
19 | | - let main_loop = glib::MainLoop::new(Some(&main_ctx), false); |
20 | 21 | let cancellable = gio::Cancellable::new(); |
21 | 22 |
|
22 | | - { |
23 | | - let main_loop = main_loop.clone(); |
24 | | - |
25 | | - // We wrap `a_very_long_task` inside a `CancellableFuture` controlled by `cancellable`. |
26 | | - // The task is cancelled when `.cancel()` is invoked. |
27 | | - let cancellable_task = gio::CancellableFuture::new(a_very_long_task(), cancellable.clone()) |
28 | | - .map(move |res| { |
29 | | - if let Err(error) = res { |
30 | | - println!("{:?}", error); |
31 | | - } |
32 | | - |
33 | | - main_loop.quit(); |
34 | | - }); |
| 23 | + // We wrap `a_very_long_task` inside a `CancellableFuture` controlled by `cancellable`. |
| 24 | + // The task is cancelled when `.cancel()` is invoked. |
| 25 | + let cancellable_task = gio::CancellableFuture::new(a_very_long_task(), cancellable.clone()) |
| 26 | + .map(|res| { |
| 27 | + if let Err(cancelled) = res { |
| 28 | + println!("{:?}", cancelled); |
| 29 | + } |
| 30 | + tx.send(()).unwrap(); |
| 31 | + }); |
35 | 32 |
|
36 | | - main_ctx.spawn_local(cancellable_task); |
37 | | - } |
| 33 | + // Spawn the cancellable task. |
| 34 | + glib::MainContext::default().spawn(cancellable_task); |
38 | 35 |
|
39 | 36 | // We simulate a timeout here. |
40 | 37 | // After `TIMEOUT` we cancel the pending task. |
41 | | - thread::spawn(move || { |
42 | | - thread::sleep(TIMEOUT); |
43 | | - |
44 | | - println!( |
45 | | - "Timeout ({:?}) elapsed! Cancelling pending task...", |
46 | | - TIMEOUT |
47 | | - ); |
48 | | - |
| 38 | + glib::MainContext::default().spawn(async move { |
| 39 | + glib::timeout_future(TIMEOUT).await; |
| 40 | + println!("Timeout {:?} expired. Cancelling task", TIMEOUT); |
49 | 41 | cancellable.cancel(); |
50 | 42 | }); |
51 | 43 |
|
52 | | - main_loop.run(); |
| 44 | + rx.await.unwrap(); |
53 | 45 | } |
0 commit comments