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

Remove Emitter::markers.

Browse source 
The vector is filled in and immediately emptied again. It is clearer to
keep the vector in the caller instead.
This commit is contained in:
Ms2ger 2015-08-26 16:19:01 +02:00
parent 5f9097c0b4
commit 18b9532b25
1 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -7,7 +7,6 @@ use msg::constellation_msg::PipelineId;
use rustc_serialize::{json, Encoder, Encodable}; use rustc_serialize::{json, Encoder, Encodable};
use std::cell::RefCell; use std::cell::RefCell;
use std::collections::{HashMap, VecDeque}; use std::collections::{HashMap, VecDeque};
use std::mem;
use std::net::TcpStream; use std::net::TcpStream;
use std::sync::mpsc::channel; use std::sync::mpsc::channel;
use std::sync::{Arc, Mutex}; use std::sync::{Arc, Mutex};
@ -37,7 +36,6 @@ pub struct TimelineActor {
struct Emitter { struct Emitter {
from: String, from: String,
stream: TcpStream, stream: TcpStream,
markers: Vec<TimelineMarkerReply>,
registry: Arc<Mutex<ActorRegistry>>, registry: Arc<Mutex<ActorRegistry>>,
start_stamp: PreciseTime, start_stamp: PreciseTime,
@ -154,7 +152,8 @@ impl TimelineActor {
/// from queue and add marker to emitter /// from queue and add marker to emitter
/// Return true if closed (IntervalStart + IntervalEnd) pair was founded /// Return true if closed (IntervalStart + IntervalEnd) pair was founded
fn group(queue: &mut VecDeque<TimelineMarker>, depth: usize, fn group(queue: &mut VecDeque<TimelineMarker>, depth: usize,
start_payload: Option<TimelineMarker>, emitter: &mut Emitter) -> bool { start_payload: Option<TimelineMarker>, emitter: &Emitter,
markers: &mut Vec<TimelineMarkerReply>) -> bool {
if let Some(start_payload) = start_payload { if let Some(start_payload) = start_payload {
if start_payload.metadata != TracingMetadata::IntervalStart { if start_payload.metadata != TracingMetadata::IntervalStart {
@ -166,13 +165,13 @@ impl TimelineActor {
TracingMetadata::IntervalEnd => { TracingMetadata::IntervalEnd => {
if depth == 0 { if depth == 0 {
// Emit TimelineMarkerReply, pair was found // Emit TimelineMarkerReply, pair was found
emitter.add_marker(start_payload, end_payload); markers.push(emitter.marker(start_payload, end_payload));
} }
return true; return true;
} }
TracingMetadata::IntervalStart => { TracingMetadata::IntervalStart => {
if group(queue, depth + 1, Some(end_payload), emitter) { if group(queue, depth + 1, Some(end_payload), emitter, markers) {
return group(queue, depth, Some(start_payload), emitter); return group(queue, depth, Some(start_payload), emitter, markers);
} else { } else {
queue.push_front(start_payload); queue.push_front(start_payload);
} }
@ -211,11 +210,12 @@ impl TimelineActor {
} }
// Emit all markers // Emit all markers
let mut markers = vec![];
for (_, queue) in &mut queues { for (_, queue) in &mut queues {
let start_payload = queue.pop_front(); let start_payload = queue.pop_front();
group(queue, 0, start_payload, &mut emitter); group(queue, 0, start_payload, &emitter, &mut markers);
} }
emitter.send(); emitter.send(markers);
sleep_ms(DEFAULT_TIMELINE_DATA_PULL_TIMEOUT); sleep_ms(DEFAULT_TIMELINE_DATA_PULL_TIMEOUT);
} }
@ -328,7 +328,6 @@ impl Emitter {
Emitter { Emitter {
from: name, from: name,
stream: stream, stream: stream,
markers: Vec::new(),
registry: registry, registry: registry,
start_stamp: start_stamp, start_stamp: start_stamp,
@ -337,21 +336,22 @@ impl Emitter {
} }
} }
fn add_marker(&mut self, start_payload: TimelineMarker, end_payload: TimelineMarker) -> () { fn marker(&self, start_payload: TimelineMarker, end_payload: TimelineMarker)
self.markers.push(TimelineMarkerReply { -> TimelineMarkerReply {
TimelineMarkerReply {
name: start_payload.name, name: start_payload.name,
start: HighResolutionStamp::new(self.start_stamp, start_payload.time), start: HighResolutionStamp::new(self.start_stamp, start_payload.time),
end: HighResolutionStamp::new(self.start_stamp, end_payload.time), end: HighResolutionStamp::new(self.start_stamp, end_payload.time),
stack: start_payload.stack, stack: start_payload.stack,
endStack: end_payload.stack, endStack: end_payload.stack,
}); }
} }
fn send(&mut self) -> () { fn send(&mut self, markers: Vec<TimelineMarkerReply>) -> () {
let end_time = PreciseTime::now(); let end_time = PreciseTime::now();
let reply = MarkersEmitterReply { let reply = MarkersEmitterReply {
__type__: "markers".to_string(), __type__: "markers".to_string(),
markers: mem::replace(&mut self.markers, Vec::new()), markers: markers,
from: self.from.clone(), from: self.from.clone(),
endTime: HighResolutionStamp::new(self.start_stamp, end_time), endTime: HighResolutionStamp::new(self.start_stamp, end_time),
}; };