Commit 2b45e5a7 authored by Matthew Gregan's avatar Matthew Gregan
Browse files

Bug 1826241 - Update AudioIPC to 0b51291d. r=glandium 

Differential Revision: https://phabricator.services.mozilla.com/D174543
parent 48c7cb60

.cargo/config.in

+2 −2
Original line number Diff line number Diff line
@@ -70,9 +70,9 @@ git = "https://github.com/mozilla/application-services" 
rev = "86c84c217036c12283d19368867323a66bf35883"

replace-with = "vendored-sources"



[source."git+https://github.com/mozilla/audioipc?rev=916f65cc92f6f2484183ff4681b0e9a2bfd60fe7"]

[source."git+https://github.com/mozilla/audioipc?rev=0b51291d2483a17dce3e300c7784b369e02bee73"]

git = "https://github.com/mozilla/audioipc"

rev = "916f65cc92f6f2484183ff4681b0e9a2bfd60fe7"

rev = "0b51291d2483a17dce3e300c7784b369e02bee73"

replace-with = "vendored-sources"



[source."git+https://github.com/mozilla/cubeb-coreaudio-rs?rev=93b5c01a131f65c83c11aeb317f4583405c5eb79"]

Cargo.lock

+3 −3
Original line number Diff line number Diff line
@@ -268,7 +268,7 @@ dependencies = [ 
[[package]]

name = "audioipc2"

version = "0.5.0"

source = "git+https://github.com/mozilla/audioipc?rev=916f65cc92f6f2484183ff4681b0e9a2bfd60fe7#916f65cc92f6f2484183ff4681b0e9a2bfd60fe7"

source = "git+https://github.com/mozilla/audioipc?rev=0b51291d2483a17dce3e300c7784b369e02bee73#0b51291d2483a17dce3e300c7784b369e02bee73"

dependencies = [

 "arrayvec",

 "ashmem",
@@ -296,7 +296,7 @@ dependencies = [ 
[[package]]

name = "audioipc2-client"

version = "0.5.0"

source = "git+https://github.com/mozilla/audioipc?rev=916f65cc92f6f2484183ff4681b0e9a2bfd60fe7#916f65cc92f6f2484183ff4681b0e9a2bfd60fe7"

source = "git+https://github.com/mozilla/audioipc?rev=0b51291d2483a17dce3e300c7784b369e02bee73#0b51291d2483a17dce3e300c7784b369e02bee73"

dependencies = [

 "audio_thread_priority",

 "audioipc2",
@@ -307,7 +307,7 @@ dependencies = [ 
[[package]]

name = "audioipc2-server"

version = "0.5.0"

source = "git+https://github.com/mozilla/audioipc?rev=916f65cc92f6f2484183ff4681b0e9a2bfd60fe7#916f65cc92f6f2484183ff4681b0e9a2bfd60fe7"

source = "git+https://github.com/mozilla/audioipc?rev=0b51291d2483a17dce3e300c7784b369e02bee73#0b51291d2483a17dce3e300c7784b369e02bee73"

dependencies = [

 "audio_thread_priority",

 "audioipc2",

third_party/rust/audioipc2/.cargo-checksum.json

+1 −1
Original line number Diff line number Diff line 
{"files":{"Cargo.toml":"6d3b3004351e3313ef74472ab6b3f96d59a785b3d873698ca4caf67eb3d47aab","benches/serialization.rs":"d56855d868dab6aa22c8b03a61084535351b76c94b68d8b1d20764e352fe473f","build.rs":"65df9a97c6cdaa3faf72581f04ac289197b0b1797d69d22c1796e957ff1089e2","src/codec.rs":"38408b512d935cd7889a03b25dd14b36083ec4e6d2fcabd636182cf45e3d50bc","src/errors.rs":"67a4a994d0724397657581cde153bdfc05ce86e7efc467f23fafc8f64df80fa4","src/ipccore.rs":"a8fc9e361884ac641b0c6cb4ec812ba5a8c0e625c6a5521b3250926372f0db50","src/lib.rs":"9b107cb52081eeea3fa742d30361db70f7138baa423dfe21d37dcf5087afc338","src/messages.rs":"452362da2cace9a0f2e3134c190ecb6a9997f8be4036cde06643e17c6c238240","src/rpccore.rs":"025b6614f1c42b96b0a8e74fd7881032d338c66e0d67ec0af70f910a9e30ebe1","src/shm.rs":"1d88f19606899e3e477865d6b84bbe3e272f51618a1c2d57b6dab03a4787cde3","src/sys/mod.rs":"e6fa1d260abf093e1f7b50185195e2d3aee0eb8c9774c6f253953b5896d838f3","src/sys/unix/cmsg.rs":"22349b3df39b51b9c414da363313c92d41b02a623753ffcca6f59613e8f79eb2","src/sys/unix/cmsghdr.c":"d7344b3dc15cdce410c68669b848bb81f7fe36362cd3699668cb613fa05180f8","src/sys/unix/mod.rs":"59835f0d5509940078b1820a54f49fc5514adeb3e45e7d21e3ab917431da2e74","src/sys/unix/msg.rs":"0e297d73bae9414184f85c2209cca0a3fde6d999a3f1d3f42faa3f56b6d57233","src/sys/windows/mod.rs":"3441a3212c6d44443a5975621d9594b0c841e5a7f113aa1b108a080330df2b77"},"package":null}
 
 No newline at end of file
 
{"files":{"Cargo.toml":"6d3b3004351e3313ef74472ab6b3f96d59a785b3d873698ca4caf67eb3d47aab","benches/serialization.rs":"d56855d868dab6aa22c8b03a61084535351b76c94b68d8b1d20764e352fe473f","build.rs":"65df9a97c6cdaa3faf72581f04ac289197b0b1797d69d22c1796e957ff1089e2","src/codec.rs":"38408b512d935cd7889a03b25dd14b36083ec4e6d2fcabd636182cf45e3d50bc","src/errors.rs":"67a4a994d0724397657581cde153bdfc05ce86e7efc467f23fafc8f64df80fa4","src/ipccore.rs":"ba339eebdc2d8a6d0cb9b294344809e63e404e220fda643b63a8a3ff63a755e8","src/lib.rs":"9b107cb52081eeea3fa742d30361db70f7138baa423dfe21d37dcf5087afc338","src/messages.rs":"452362da2cace9a0f2e3134c190ecb6a9997f8be4036cde06643e17c6c238240","src/rpccore.rs":"025b6614f1c42b96b0a8e74fd7881032d338c66e0d67ec0af70f910a9e30ebe1","src/shm.rs":"1d88f19606899e3e477865d6b84bbe3e272f51618a1c2d57b6dab03a4787cde3","src/sys/mod.rs":"e6fa1d260abf093e1f7b50185195e2d3aee0eb8c9774c6f253953b5896d838f3","src/sys/unix/cmsg.rs":"22349b3df39b51b9c414da363313c92d41b02a623753ffcca6f59613e8f79eb2","src/sys/unix/cmsghdr.c":"d7344b3dc15cdce410c68669b848bb81f7fe36362cd3699668cb613fa05180f8","src/sys/unix/mod.rs":"59835f0d5509940078b1820a54f49fc5514adeb3e45e7d21e3ab917431da2e74","src/sys/unix/msg.rs":"0e297d73bae9414184f85c2209cca0a3fde6d999a3f1d3f42faa3f56b6d57233","src/sys/windows/mod.rs":"3441a3212c6d44443a5975621d9594b0c841e5a7f113aa1b108a080330df2b77"},"package":null}
 
 No newline at end of file

third_party/rust/audioipc2/src/ipccore.rs

+12 −8
Original line number Diff line number Diff line
@@ -262,10 +262,7 @@ impl EventLoop { 
                    );

                    let done = if let Some(connection) = self.connections.get_mut(token.0) {

                        match connection.handle_wake(self.poll.registry()) {

                            Ok(done) => {

                                assert!(!done);

                                false

                            }

                            Ok(done) => done,

                            Err(e) => {

                                debug!("{}: {:?}: connection error: {:?}", self.name, token, e);

                                true
@@ -465,8 +462,11 @@ impl Connection { 
            let r = self.io.recv_msg(&mut self.inbound);

            match r {

                Ok(0) => {

                    trace!("{:?}: recv EOF", self.token);

                    assert!(self.inbound.is_empty()); // Ensure no unprocessed messages queued.

                    trace!(

                        "{:?}: recv EOF unprocessed inbound={}",

                        self.token,

                        self.inbound.is_empty()

                    );

                    return Ok(true);

                }

                Ok(n) => {
@@ -480,8 +480,12 @@ impl Connection { 
                            }

                        }

                        Err(e) => {

                            debug!("{:?}: process_inbound error: {:?}", self.token, e);

                            assert!(self.inbound.is_empty()); // Ensure no unprocessed messages queued.

                            debug!(

                                "{:?}: process_inbound error: {:?} unprocessed inbound={}",

                                self.token,

                                e,

                                self.inbound.is_empty()

                            );

                            return Err(e);

                        }

                    }

toolkit/library/rust/shared/Cargo.toml

+2 −2
Original line number Diff line number Diff line
@@ -25,8 +25,8 @@ webrender_bindings = { path = "../../../../gfx/webrender_bindings" } 
cubeb-coreaudio = { git = "https://github.com/mozilla/cubeb-coreaudio-rs", rev = "93b5c01a131f65c83c11aeb317f4583405c5eb79", optional = true }

cubeb-pulse = { git = "https://github.com/mozilla/cubeb-pulse-rs", rev="cf48897be5cbe147d051ebbbe1eaf5fd8fb6bbc9", optional = true, features=["pulse-dlopen"] }

cubeb-sys = { version = "0.10.3", optional = true, features=["gecko-in-tree"] }

audioipc2-client = { git = "https://github.com/mozilla/audioipc", rev = "916f65cc92f6f2484183ff4681b0e9a2bfd60fe7", optional = true }

audioipc2-server = { git = "https://github.com/mozilla/audioipc", rev = "916f65cc92f6f2484183ff4681b0e9a2bfd60fe7", optional = true }

audioipc2-client = { git = "https://github.com/mozilla/audioipc", rev = "0b51291d2483a17dce3e300c7784b369e02bee73", optional = true }

audioipc2-server = { git = "https://github.com/mozilla/audioipc", rev = "0b51291d2483a17dce3e300c7784b369e02bee73", optional = true }

encoding_glue = { path = "../../../../intl/encoding_glue" }

authrs_bridge = { path = "../../../../dom/webauthn/authrs_bridge" }

gkrust_utils = { path = "../../../../xpcom/rust/gkrust_utils" }