Fix busted CI. (#427)

* Fail CI if build fails. Signed-off-by: Josh Matthews <[email protected]> * Fix examples. Signed-off-by: Josh Matthews <[email protected]> * Fix deadlock when shutting down a context. Signed-off-by: Josh Matthews <[email protected]> --------- Signed-off-by: Josh Matthews <[email protected]>
servo · Oct 18, 2024 · ebbba84 · ebbba84
1 parent ed1d4c7
commit ebbba84
Show file tree

Hide file tree

Showing 24 changed files with 87 additions and 57 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -84,12 +84,12 @@ jobs:
   build_result:
     name: Result
     runs-on: ubuntu-latest
+    if: always()
     needs: ["Build"]
     steps:
-      - name: Mark the job as successful
+      - name: Success
         run: exit 0
-        if: success()
-      - name: Mark the job as unsuccessful
+        if: ${{ !contains(needs.*.result, 'failure') && !contains(needs.*.result, 'cancelled') }}
+      - name: Failure
         run: exit 1
-        if: "!success()"
-
+        if: contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled')
diff --git a/backends/gstreamer/lib.rs b/backends/gstreamer/lib.rs
@@ -110,10 +110,11 @@ impl GStreamerBackend {
             .spawn(move || {
                 match recvr.recv().unwrap() {
                     BackendMsg::Shutdown(context_id, instance_id) => {
-                        if let Some(vec) = instances_.lock().unwrap().get_mut(&context_id) {
+                        let mut instances_ = instances_.lock().unwrap();
+                        if let Some(vec) = instances_.get_mut(&context_id) {
                             vec.retain(|m| m.0 != instance_id);
                             if vec.is_empty() {
-                                instances_.lock().unwrap().remove(&context_id);
+                                instances_.remove(&context_id);
                             }
                         }
                     }

diff --git a/examples/audio_decoder.rs b/examples/audio_decoder.rs
@@ -17,10 +17,12 @@ use std::{thread, time};
 fn run_example(servo_media: Arc<ServoMedia>) {
     let options = <RealTimeAudioContextOptions>::default();
     let sample_rate = options.sample_rate;
-    let context = servo_media.create_audio_context(
-        &ClientContextId::build(1, 1),
-        AudioContextOptions::RealTimeAudioContext(options),
-    );
+    let context = servo_media
+        .create_audio_context(
+            &ClientContextId::build(1, 1),
+            AudioContextOptions::RealTimeAudioContext(options),
+        )
+        .unwrap();
     let context = context.lock().unwrap();
     let args: Vec<_> = env::args().collect();
     let default = "./examples/resources/viper_cut.ogg";

diff --git a/examples/biquad.rs b/examples/biquad.rs
@@ -12,8 +12,9 @@ use std::sync::Arc;
 use std::{thread, time};
 
 fn run_example(servo_media: Arc<ServoMedia>) {
-    let context =
-        servo_media.create_audio_context(&ClientContextId::build(1, 1), Default::default());
+    let context = servo_media
+        .create_audio_context(&ClientContextId::build(1, 1), Default::default())
+        .unwrap();
     let context = context.lock().unwrap();
     let dest = context.dest_node();
     let mut options = OscillatorNodeOptions::default();

diff --git a/examples/channels.rs b/examples/channels.rs
@@ -10,8 +10,9 @@ use std::sync::Arc;
 use std::{thread, time};
 
 fn run_example(servo_media: Arc<ServoMedia>) {
-    let context =
-        servo_media.create_audio_context(&ClientContextId::build(1, 1), Default::default());
+    let context = servo_media
+        .create_audio_context(&ClientContextId::build(1, 1), Default::default())
+        .unwrap();
     let context = context.lock().unwrap();
     let mut options = OscillatorNodeOptions::default();
     let osc = context.create_node(

diff --git a/examples/channelsum.rs b/examples/channelsum.rs
@@ -10,8 +10,9 @@ use std::sync::Arc;
 use std::{thread, time};
 
 fn run_example(servo_media: Arc<ServoMedia>) {
-    let context =
-        servo_media.create_audio_context(&ClientContextId::build(1, 1), Default::default());
+    let context = servo_media
+        .create_audio_context(&ClientContextId::build(1, 1), Default::default())
+        .unwrap();
     let context = context.lock().unwrap();
     let mut options = OscillatorNodeOptions::default();
     let osc = context.create_node(

diff --git a/examples/constant_source.rs b/examples/constant_source.rs
@@ -10,8 +10,9 @@ use std::sync::Arc;
 use std::{thread, time};
 
 fn run_example(servo_media: Arc<ServoMedia>) {
-    let context =
-        servo_media.create_audio_context(&ClientContextId::build(1, 1), Default::default());
+    let context = servo_media
+        .create_audio_context(&ClientContextId::build(1, 1), Default::default())
+        .unwrap();
     let context = context.lock().unwrap();
     let dest = context.dest_node();
 

diff --git a/examples/iir_filter.rs b/examples/iir_filter.rs
@@ -11,7 +11,9 @@ use std::{thread, time};
 
 fn run_example(servo_media: Arc<ServoMedia>) {
     let id = ClientContextId::build(1, 1);
-    let context = servo_media.create_audio_context(&id, Default::default());
+    let context = servo_media
+        .create_audio_context(&id, Default::default())
+        .unwrap();
 
     {
         let context = context.lock().unwrap();

diff --git a/examples/media_element_source_node.rs b/examples/media_element_source_node.rs
@@ -35,7 +35,7 @@ impl PlayerGLContext for PlayerContextDummy {
 
 fn run_example(servo_media: Arc<ServoMedia>) {
     let context =
-        servo_media.create_audio_context(&ClientContextId::build(1, 1), Default::default());
+        servo_media.create_audio_context(&ClientContextId::build(1, 1), Default::default()).unwrap();
     let context = context.lock().unwrap();
     let listener = context.listener();
 

diff --git a/examples/muted_audiocontext.rs b/examples/muted_audiocontext.rs
@@ -13,7 +13,8 @@ fn run_example(servo_media: Arc<ServoMedia>) {
     let context_id1 = &ClientContextId::build(1, 1);
     let context1 = servo_media.create_audio_context(&context_id1, Default::default());
     {
-        let context = context1.unwrap().lock().unwrap();
+        let context1 = context1.unwrap();
+        let context = context1.lock().unwrap();
         let dest = context.dest_node();
         let options = OscillatorNodeOptions::default();
         let osc1 = context.create_node(
@@ -33,7 +34,8 @@ fn run_example(servo_media: Arc<ServoMedia>) {
     {
         let mut options = OscillatorNodeOptions::default();
         options.oscillator_type = Sawtooth;
-        let context = context2.unwrap().lock().unwrap();
+        let context2 = context2.unwrap();
+        let context = context2.lock().unwrap();
         let dest = context.dest_node();
         let osc3 = context.create_node(
             AudioNodeInit::OscillatorNode(options.clone()),

diff --git a/examples/offline_context.rs b/examples/offline_context.rs
@@ -18,7 +18,9 @@ fn run_example(servo_media: Arc<ServoMedia>) {
     options.length = 1024 * FRAMES_PER_BLOCK_USIZE;
     let sample_rate = options.sample_rate;
     let options = AudioContextOptions::OfflineAudioContext(options);
-    let context = servo_media.create_audio_context(&ClientContextId::build(1, 1), options);
+    let context = servo_media
+        .create_audio_context(&ClientContextId::build(1, 1), options)
+        .unwrap();
     let context = context.lock().unwrap();
     let processed_audio = Arc::new(Mutex::new(Vec::new()));
     let processed_audio_ = processed_audio.clone();
@@ -47,8 +49,9 @@ fn run_example(servo_media: Arc<ServoMedia>) {
     // Close offline context.
     let _ = context.close();
     // Create audio context to play the processed audio.
-    let context =
-        servo_media.create_audio_context(&ClientContextId::build(1, 2), Default::default());
+    let context = servo_media
+        .create_audio_context(&ClientContextId::build(1, 2), Default::default())
+        .unwrap();
     let context = context.lock().unwrap();
     let buffer_source = context.create_node(
         AudioNodeInit::AudioBufferSourceNode(Default::default()),

diff --git a/examples/oscillator.rs b/examples/oscillator.rs
@@ -12,8 +12,9 @@ use std::sync::Arc;
 use std::{thread, time};
 
 fn run_example(servo_media: Arc<ServoMedia>) {
-    let context =
-        servo_media.create_audio_context(&ClientContextId::build(1, 1), Default::default());
+    let context = servo_media
+        .create_audio_context(&ClientContextId::build(1, 1), Default::default())
+        .unwrap();
     let context = context.lock().unwrap();
     let dest = context.dest_node();
     let mut options = OscillatorNodeOptions::default();
@@ -33,8 +34,9 @@ fn run_example(servo_media: Arc<ServoMedia>) {
     thread::sleep(time::Duration::from_millis(3000));
 
     options.oscillator_type = Square;
-    let context =
-        servo_media.create_audio_context(&ClientContextId::build(1, 2), Default::default());
+    let context = servo_media
+        .create_audio_context(&ClientContextId::build(1, 2), Default::default())
+        .unwrap();
     let context = context.lock().unwrap();
     let dest = context.dest_node();
     let osc2 = context.create_node(
@@ -53,8 +55,9 @@ fn run_example(servo_media: Arc<ServoMedia>) {
     thread::sleep(time::Duration::from_millis(1000));
 
     options.oscillator_type = Sawtooth;
-    let context =
-        servo_media.create_audio_context(&ClientContextId::build(1, 3), Default::default());
+    let context = servo_media
+        .create_audio_context(&ClientContextId::build(1, 3), Default::default())
+        .unwrap();
     let context = context.lock().unwrap();
     let dest = context.dest_node();
     let osc3 = context.create_node(
@@ -74,8 +77,9 @@ fn run_example(servo_media: Arc<ServoMedia>) {
     thread::sleep(time::Duration::from_millis(1000));
 
     options.oscillator_type = Triangle;
-    let context =
-        servo_media.create_audio_context(&ClientContextId::build(1, 4), Default::default());
+    let context = servo_media
+        .create_audio_context(&ClientContextId::build(1, 4), Default::default())
+        .unwrap();
     let context = context.lock().unwrap();
     let dest = context.dest_node();
     let osc4 = context.create_node(
@@ -97,8 +101,9 @@ fn run_example(servo_media: Arc<ServoMedia>) {
 
     options.oscillator_type = Custom;
 
-    let context =
-        servo_media.create_audio_context(&ClientContextId::build(1, 5), Default::default());
+    let context = servo_media
+        .create_audio_context(&ClientContextId::build(1, 5), Default::default())
+        .unwrap();
     let context = context.lock().unwrap();
     let dest = context.dest_node();
     let osc5 = context.create_node(

diff --git a/examples/panner.rs b/examples/panner.rs
@@ -9,8 +9,9 @@ use std::sync::Arc;
 use std::{thread, time};
 
 fn run_example(servo_media: Arc<ServoMedia>) {
-    let context =
-        servo_media.create_audio_context(&ClientContextId::build(1, 1), Default::default());
+    let context = servo_media
+        .create_audio_context(&ClientContextId::build(1, 1), Default::default())
+        .unwrap();
     let context = context.lock().unwrap();
     let dest = context.dest_node();
     let listener = context.listener();

diff --git a/examples/params.rs b/examples/params.rs
@@ -9,8 +9,9 @@ use std::sync::Arc;
 use std::{thread, time};
 
 fn run_example(servo_media: Arc<ServoMedia>) {
-    let context =
-        servo_media.create_audio_context(&ClientContextId::build(1, 1), Default::default());
+    let context = servo_media
+        .create_audio_context(&ClientContextId::build(1, 1), Default::default())
+        .unwrap();
     let context = context.lock().unwrap();
     let dest = context.dest_node();
     let osc = context.create_node(

diff --git a/examples/params_connect.rs b/examples/params_connect.rs
@@ -9,8 +9,9 @@ use std::sync::Arc;
 use std::{thread, time};
 
 fn run_example(servo_media: Arc<ServoMedia>) {
-    let context =
-        servo_media.create_audio_context(&ClientContextId::build(1, 1), Default::default());
+    let context = servo_media
+        .create_audio_context(&ClientContextId::build(1, 1), Default::default())
+        .unwrap();
     let context = context.lock().unwrap();
     let mut options = OscillatorNodeOptions::default();
     options.freq = 2.0;

diff --git a/examples/params_connect2.rs b/examples/params_connect2.rs
@@ -10,9 +10,10 @@ use std::sync::Arc;
 use std::{thread, time};
 
 fn run_example(servo_media: Arc<ServoMedia>) {
-    let context =
-        servo_media.create_audio_context(&ClientContextId::build(1, 1), Default::default());
-    let context = context.unwrap().lock().unwrap();
+    let context = servo_media
+        .create_audio_context(&ClientContextId::build(1, 1), Default::default())
+        .unwrap();
+    let context = context.lock().unwrap();
     let mut options = OscillatorNodeOptions::default();
     options.freq = 2.0;
     let lfo = context.create_node(AudioNodeInit::OscillatorNode(options), Default::default());

diff --git a/examples/params_settarget.rs b/examples/params_settarget.rs
@@ -8,8 +8,9 @@ use std::sync::Arc;
 use std::{thread, time};
 
 fn run_example(servo_media: Arc<ServoMedia>) {
-    let context =
-        servo_media.create_audio_context(&ClientContextId::build(1, 1), Default::default());
+    let context = servo_media
+        .create_audio_context(&ClientContextId::build(1, 1), Default::default())
+        .unwrap();
     let context = context.lock().unwrap();
     let dest = context.dest_node();
     let osc = context.create_node(

diff --git a/examples/play.rs b/examples/play.rs
@@ -11,8 +11,9 @@ use std::sync::Arc;
 use std::{thread, time};
 
 fn run_example(servo_media: Arc<ServoMedia>) {
-    let context =
-        servo_media.create_audio_context(&ClientContextId::build(1, 1), Default::default());
+    let context = servo_media
+        .create_audio_context(&ClientContextId::build(1, 1), Default::default())
+        .unwrap();
     let context = context.lock().unwrap();
     let osc = context.create_node(
         AudioNodeInit::OscillatorNode(Default::default()),

diff --git a/examples/play_noise.rs b/examples/play_noise.rs
@@ -11,7 +11,7 @@ use std::{thread, time};
 
 fn run_example(servo_media: Arc<ServoMedia>) {
     let context =
-        servo_media.create_audio_context(&ClientContextId::build(1, 1), Default::default());
+        servo_media.create_audio_context(&ClientContextId::build(1, 1), Default::default()).unwrap();
     let context = context.lock().unwrap();
     let buffer_source = context.create_node(
         AudioNodeInit::AudioBufferSourceNode(Default::default()),

diff --git a/examples/set_value_curve.rs b/examples/set_value_curve.rs
@@ -10,8 +10,9 @@ use std::sync::Arc;
 use std::{thread, time};
 
 fn run_example(servo_media: Arc<ServoMedia>) {
-    let context =
-        servo_media.create_audio_context(&ClientContextId::build(1, 1), Default::default());
+    let context = servo_media
+        .create_audio_context(&ClientContextId::build(1, 1), Default::default())
+        .unwrap();
     let context = context.lock().unwrap();
     let dest = context.dest_node();
 

diff --git a/examples/stereo_panner.rs b/examples/stereo_panner.rs
@@ -9,8 +9,9 @@ use std::sync::Arc;
 use std::{thread, time};
 
 fn run_example(servo_media: Arc<ServoMedia>) {
-    let context =
-        servo_media.create_audio_context(&ClientContextId::build(1, 1), Default::default());
+    let context = servo_media
+        .create_audio_context(&ClientContextId::build(1, 1), Default::default())
+        .unwrap();
     let context = context.lock().unwrap();
     let dest = context.dest_node();
     let osc = context.create_node(

diff --git a/examples/stream_dest_node.rs b/examples/stream_dest_node.rs
@@ -9,8 +9,9 @@ use std::sync::Arc;
 use std::{thread, time};
 
 fn run_example(servo_media: Arc<ServoMedia>) {
-    let context =
-        servo_media.create_audio_context(&ClientContextId::build(1, 1), Default::default());
+    let context = servo_media
+        .create_audio_context(&ClientContextId::build(1, 1), Default::default())
+        .unwrap();
     let context = context.lock().unwrap();
     let options = OscillatorNodeOptions::default();
     let osc1 = context.create_node(

diff --git a/examples/stream_reader_node.rs b/examples/stream_reader_node.rs
@@ -10,7 +10,8 @@ fn run_example(servo_media: Arc<ServoMedia>) {
     let context =
         servo_media.create_audio_context(&ClientContextId::build(1, 1), Default::default());
     let input = servo_media.create_audiostream();
-    let context = context.unwrap().lock().unwrap();
+    let context = context.unwrap();
+    let context = context.lock().unwrap();
     let dest = context.dest_node();
     let osc1 = context.create_node(
         AudioNodeInit::MediaStreamSourceNode(input),

diff --git a/examples/wave_shaper.rs b/examples/wave_shaper.rs
@@ -15,6 +15,7 @@ fn run_example(servo_media: Arc<ServoMedia>) {
     let context = servo_media.create_audio_context(&id, Default::default());
 
     {
+        let context = context.unwrap();
         let context = context.lock().unwrap();
         let curve = vec![1., 0., 0., 0.75, 0.5];