mirror of
https://github.com/servo/servo.git
synced 2025-08-02 04:00:32 +01:00
Replace mpsc with crossbeam/servo channel, update ipc-channel
Co-authored-by: Gregory Terzian <gterzian@users.noreply.github.com>
This commit is contained in:
parent
b977b4994c
commit
2a996fbc8f
89 changed files with 341 additions and 377 deletions
|
@ -4,10 +4,9 @@
|
|||
|
||||
#[macro_use]
|
||||
extern crate log;
|
||||
extern crate servo_channel;
|
||||
extern crate ws;
|
||||
|
||||
use std::sync::mpsc;
|
||||
use std::sync::mpsc::channel;
|
||||
use std::thread;
|
||||
use ws::{Builder, CloseCode, Handler, Handshake};
|
||||
|
||||
|
@ -15,7 +14,7 @@ enum Message {
|
|||
ShutdownServer,
|
||||
}
|
||||
|
||||
pub struct Sender(mpsc::Sender<Message>);
|
||||
pub struct Sender(servo_channel::Sender<Message>);
|
||||
|
||||
struct Connection {
|
||||
sender: ws::Sender,
|
||||
|
@ -38,7 +37,7 @@ impl Handler for Connection {
|
|||
|
||||
pub fn start_server(port: u16) -> Sender {
|
||||
debug!("Starting server.");
|
||||
let (sender, receiver) = channel();
|
||||
let (sender, receiver) = servo_channel::channel();
|
||||
thread::Builder::new()
|
||||
.name("debugger".to_owned())
|
||||
.spawn(move || {
|
||||
|
@ -51,7 +50,7 @@ pub fn start_server(port: u16) -> Sender {
|
|||
.spawn(move || {
|
||||
socket.listen(("127.0.0.1", port)).unwrap();
|
||||
}).expect("Thread spawning failed");
|
||||
while let Ok(message) = receiver.recv() {
|
||||
while let Some(message) = receiver.recv() {
|
||||
match message {
|
||||
Message::ShutdownServer => {
|
||||
break;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue