Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 06:00:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #25806 - jdm:ipc-up, r=Manishearth

Browse source 
Update ipc-channel and crossbeam-channel

Depends on https://github.com/servo/webxr/pull/130 and https://github.com/servo/media/pull/333.
This commit is contained in:
bors-servo 2020-02-20 18:47:12 -05:00 • committed by GitHub
commit c78f0d7449
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
51 changed files with 294 additions and 255 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/constellation/Cargo.toml
View file

@ -16,7 +16,7 @@ backtrace = "0.3"
bluetooth_traits = { path = "../bluetooth_traits" }
canvas_traits = {path = "../canvas_traits"}
compositing = {path = "../compositing"}
crossbeam-channel = "0.3"
crossbeam-channel = "0.4"
debugger = {path = "../debugger"}
devtools_traits = {path = "../devtools_traits"}
euclid = "0.20"
@ -24,7 +24,7 @@ embedder_traits = { path = "../embedder_traits" }
gfx = {path = "../gfx"}
gfx_traits = {path = "../gfx_traits"}
http = "0.1"
ipc-channel = "0.12"
ipc-channel = "0.14"
layout_traits = {path = "../layout_traits"}
keyboard-types = "0.4.3"
log = "0.4"

8
components/constellation/constellation.rs
View file

@ -2566,7 +2566,7 @@ where
for receiver in receivers {
if let Err(e) = receiver.recv() {
warn!("Failed to receive exit response from WebGPU ({})", e);
warn!("Failed to receive exit response from WebGPU ({:?})", e);
}
}
@ -2589,10 +2589,10 @@ where
// Receive exit signals from threads.
if let Err(e) = core_receiver.recv() {
warn!("Exit resource thread failed ({})", e);
warn!("Exit resource thread failed ({:?})", e);
}
if let Err(e) = storage_receiver.recv() {
warn!("Exit storage thread failed ({})", e);
warn!("Exit storage thread failed ({:?})", e);
}
debug!("Asking compositor to complete shutdown.");
@ -4867,7 +4867,7 @@ where
warn!("Failed to send GetCurrentEpoch ({}).", e);
}
match epoch_receiver.recv() {
Err(e) => warn!("Failed to receive current epoch ({}).", e),
Err(e) => warn!("Failed to receive current epoch ({:?}).", e),
Ok(layout_thread_epoch) => {
if layout_thread_epoch != *compositor_epoch {
return ReadyToSave::EpochMismatch;

2
components/constellation/pipeline.rs
View file

@ -400,7 +400,7 @@ impl Pipeline {
self.compositor_proxy
.send(CompositorMsg::PipelineExited(self.id, sender));
if let Err(e) = receiver.recv() {
warn!("Sending exit message failed ({}).", e);
warn!("Sending exit message failed ({:?}).", e);
}
}