Bug 1533539 - Revert ClientContext::init's error handling behaviour. r=chunmin a=pascalc
authorNarcis Beleuzu <nbeleuzu@mozilla.com>
Sat, 23 Mar 2019 18:36:25 +0200
changeset 525682 c0ddae5c8a2c300fa085546191b35a9d5af0be98
parent 525681 09f49641b213bd3af77a41195853d7fb0a711b74
child 525683 1a3cbe1453e4fc474e530d93565e256a0397ad30
push id2032
push userffxbld-merge
push dateMon, 13 May 2019 09:36:57 +0000
treeherdermozilla-release@455c1065dcbe [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerschunmin, pascalc
bugs1533539
milestone67.0
Bug 1533539 - Revert ClientContext::init's error handling behaviour. r=chunmin a=pascalc Reviewers: chunmin Reviewed By: chunmin Subscribers: jya Bug #: 1533539 Differential Revision: https://phabricator.services.mozilla.com/D24267
media/audioipc/README_MOZILLA
media/audioipc/client/src/context.rs
--- a/media/audioipc/README_MOZILLA
+++ b/media/audioipc/README_MOZILLA
@@ -1,8 +1,8 @@
 The source from this directory was copied from the audioipc-2
 git repository using the update.sh script.  The only changes
 made were those applied by update.sh and the addition of
 Makefile.in build files for the Mozilla build system.
 
 The audioipc-2 git repository is: https://github.com/djg/audioipc-2.git
 
-The git commit ID used was 137eb45d702f628cae622d374975903c23a7a814 (2019-03-07 10:31:45 +1300)
+The git commit ID used was 4b749ca86f26e8980a32d44c0c3161a1843e2586 (2019-03-21 18:40:17 +1300)
--- a/media/audioipc/client/src/context.rs
+++ b/media/audioipc/client/src/context.rs
@@ -131,17 +131,19 @@ impl ContextOps for ClientContext {
 
         let cpupool = futures_cpupool::Builder::new()
             .name_prefix("AudioIPC")
             .after_start(register_thread)
             .pool_size(params.pool_size)
             .stack_size(params.stack_size)
             .create();
 
-        send_recv!(rpc, ClientConnect(std::process::id()) => ClientConnected)?;
+        // Don't let errors bubble from here.  Later calls against this context
+        // will return errors the caller expects to handle.
+        let _ = send_recv!(rpc, ClientConnect(std::process::id()) => ClientConnected);
 
         let ctx = Box::new(ClientContext {
             _ops: &CLIENT_OPS as *const _,
             rpc: rpc,
             core: core,
             cpu_pool: cpupool,
         });
         Ok(unsafe { Context::from_ptr(Box::into_raw(ctx) as *mut _) })