Replace mpsc with crossbeam/servo channel, update ipc-channel

Co-authored-by: Gregory Terzian <gterzian@users.noreply.github.com>
This commit is contained in:
Simon Sapin 2017-12-17 23:53:32 +01:00 committed by Gregory Terzian
parent b977b4994c
commit 2a996fbc8f
89 changed files with 341 additions and 377 deletions

View file

@ -16,9 +16,10 @@ energy-profiling = ["energymon", "energy-monitor"]
bincode = "1"
energy-monitor = {version = "0.2.0", optional = true}
energymon = {git = "https://github.com/energymon/energymon-rust.git", optional = true}
ipc-channel = "0.10"
ipc-channel = "0.11"
log = "0.4"
serde = "1.0"
servo_channel = {path = "../channel"}
servo_config = {path = "../config"}
signpost = {git = "https://github.com/pcwalton/signpost.git"}
time = "0.1.12"

View file

@ -14,6 +14,7 @@ extern crate ipc_channel;
extern crate log;
#[macro_use]
extern crate serde;
extern crate servo_channel;
extern crate servo_config;
extern crate signpost;

View file

@ -9,8 +9,8 @@
use ipc_channel::ipc::{self, IpcSender};
use ipc_channel::router::ROUTER;
use serde;
use servo_channel::Sender;
use std::marker::Send;
use std::sync::mpsc::Sender;
/// A trait to abstract away the various kinds of message senders we use.
pub trait OpaqueSender<T> {
@ -22,7 +22,7 @@ impl<T> OpaqueSender<T> for Sender<T> {
fn send(&self, message: T) {
if let Err(e) = Sender::send(self, message) {
warn!(
"Error communicating with the target thread from the profiler: {}",
"Error communicating with the target thread from the profiler: {:?}",
e
);
}