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

Removed util.

Browse source
This commit is contained in:
Alan Jeffrey 2016-12-14 10:37:58 -06:00
parent 01b6ad55bd
commit 9be4fd56ce
133 changed files with 396 additions and 352 deletions
Download patch file Download diff file Expand all files Collapse all files

1
components/devtools/Cargo.toml
View file

@ -22,4 +22,3 @@ serde = "0.8"
serde_json = "0.8"
serde_derive = "0.8"
time = "0.1"
util = {path = "../util"}

5
components/devtools/actors/timeline.rs
View file

@ -19,7 +19,6 @@ use std::net::TcpStream;
use std::sync::{Arc, Mutex};
use std::thread;
use std::time::Duration;
use util::thread::spawn_named;
pub struct TimelineActor {
name: String,
@ -150,7 +149,7 @@ impl TimelineActor {
return;
}
spawn_named("PullTimelineMarkers".to_owned(), move || {
thread::Builder::new().name("PullTimelineMarkers".to_owned()).spawn(move || {
loop {
if !*is_recording.lock().unwrap() {
break;
@ -164,7 +163,7 @@ impl TimelineActor {
thread::sleep(Duration::from_millis(DEFAULT_TIMELINE_DATA_PULL_TIMEOUT));
}
});
}).expect("Thread spawning failed");
}
}

15
components/devtools/lib.rs
View file

@ -30,7 +30,6 @@ extern crate serde;
extern crate serde_derive;
extern crate serde_json;
extern crate time;
extern crate util;
use actor::{Actor, ActorRegistry};
use actors::console::ConsoleActor;
@ -57,8 +56,8 @@ use std::collections::hash_map::Entry::{Occupied, Vacant};
use std::net::{Shutdown, TcpListener, TcpStream};
use std::sync::{Arc, Mutex};
use std::sync::mpsc::{Receiver, Sender, channel};
use std::thread;
use time::precise_time_ns;
use util::thread::spawn_named;
mod actor;
/// Corresponds to http://mxr.mozilla.org/mozilla-central/source/toolkit/devtools/server/actors/
@ -137,9 +136,9 @@ pub fn start_server(port: u16) -> Sender<DevtoolsControlMsg> {
let (sender, receiver) = channel();
{
let sender = sender.clone();
spawn_named("Devtools".to_owned(), move || {
thread::Builder::new().name("Devtools".to_owned()).spawn(move || {
run_server(sender, receiver, port)
});
}).expect("Thread spawning failed");
}
sender
}
@ -485,23 +484,23 @@ fn run_server(sender: Sender<DevtoolsControlMsg>,
}
let sender_clone = sender.clone();
spawn_named("DevtoolsClientAcceptor".to_owned(), move || {
thread::Builder::new().name("DevtoolsClientAcceptor".to_owned()).spawn(move || {
// accept connections and process them, spawning a new thread for each one
for stream in listener.incoming() {
// connection succeeded
sender_clone.send(DevtoolsControlMsg::FromChrome(
ChromeToDevtoolsControlMsg::AddClient(stream.unwrap()))).unwrap();
}
});
}).expect("Thread spawning failed");
while let Ok(msg) = receiver.recv() {
match msg {
DevtoolsControlMsg::FromChrome(ChromeToDevtoolsControlMsg::AddClient(stream)) => {
let actors = actors.clone();
accepted_connections.push(stream.try_clone().unwrap());
spawn_named("DevtoolsClientHandler".to_owned(), move || {
thread::Builder::new().name("DevtoolsClientHandler".to_owned()).spawn(move || {
handle_client(actors, stream.try_clone().unwrap())
})
}).expect("Thread spawning failed");
}
DevtoolsControlMsg::FromScript(ScriptToDevtoolsControlMsg::FramerateTick(
actor_name, tick)) =>