diff --git a/timely/examples/logging-send.rs b/timely/examples/logging-send.rs index 23228f4e8..c2cb24948 100644 --- a/timely/examples/logging-send.rs +++ b/timely/examples/logging-send.rs @@ -17,14 +17,14 @@ fn main() { let mut probe = ProbeHandle::new(); // Register timely worker logging. - worker.log_register().insert::("timely", |_time, data| + worker.log_register().unwrap().insert::("timely", |_time, data| data.iter().for_each(|x| println!("LOG1: {:?}", x)) ); // Register timely progress logging. // Less generally useful: intended for debugging advanced custom operators or timely // internals. - worker.log_register().insert::("timely/progress", |_time, data| + worker.log_register().unwrap().insert::("timely/progress", |_time, data| data.iter().for_each(|x| { println!("PROGRESS: {:?}", x); let (_, _, ev) = x; @@ -50,7 +50,7 @@ fn main() { }); // Register timely worker logging. - worker.log_register().insert::("timely", |_time, data| + worker.log_register().unwrap().insert::("timely", |_time, data| data.iter().for_each(|x| println!("LOG2: {:?}", x)) ); @@ -63,13 +63,13 @@ fn main() { }); // Register user-level logging. - worker.log_register().insert::<(),_>("input", |_time, data| + worker.log_register().unwrap().insert::<(),_>("input", |_time, data| for element in data.iter() { println!("Round tick at: {:?}", element.0); } ); - let input_logger = worker.log_register().get::<()>("input").expect("Input logger absent"); + let input_logger = worker.log_register().unwrap().get::<()>("input").expect("Input logger absent"); let timer = std::time::Instant::now(); diff --git a/timely/examples/threadless.rs b/timely/examples/threadless.rs index b5fc0da7b..7ddc8a7b5 100644 --- a/timely/examples/threadless.rs +++ b/timely/examples/threadless.rs @@ -8,7 +8,7 @@ fn main() { // create a naked single-threaded worker. let allocator = timely::communication::allocator::Thread::new(); - let mut worker = timely::worker::Worker::new(WorkerConfig::default(), allocator); + let mut worker = timely::worker::Worker::new(WorkerConfig::default(), allocator, None); // create input and probe handles. let mut input = InputHandle::new(); diff --git a/timely/src/dataflow/scopes/child.rs b/timely/src/dataflow/scopes/child.rs index 07789304c..4e094d8d9 100644 --- a/timely/src/dataflow/scopes/child.rs +++ b/timely/src/dataflow/scopes/child.rs @@ -67,7 +67,7 @@ where fn new_identifier(&mut self) -> usize { self.parent.new_identifier() } - fn log_register(&self) -> ::std::cell::RefMut> { + fn log_register(&self) -> Option<::std::cell::RefMut>> { self.parent.log_register() } } diff --git a/timely/src/execute.rs b/timely/src/execute.rs index 8e173b518..df7d00af5 100644 --- a/timely/src/execute.rs +++ b/timely/src/execute.rs @@ -154,7 +154,7 @@ where F: FnOnce(&mut Worker)->T+Send+Sync+'static { let alloc = crate::communication::allocator::thread::Thread::new(); - let mut worker = crate::worker::Worker::new(WorkerConfig::default(), alloc); + let mut worker = crate::worker::Worker::new(WorkerConfig::default(), alloc, Some(std::time::Instant::now())); let result = func(&mut worker); while worker.has_dataflows() { worker.step_or_park(None); @@ -320,7 +320,7 @@ where T: Send+'static, F: Fn(&mut Worker<::Allocator>)->T+Send+Sync+'static { initialize_from(builders, others, move |allocator| { - let mut worker = Worker::new(worker_config.clone(), allocator); + let mut worker = Worker::new(worker_config.clone(), allocator, Some(std::time::Instant::now())); let result = func(&mut worker); while worker.has_dataflows() { worker.step_or_park(None); diff --git a/timely/src/progress/subgraph.rs b/timely/src/progress/subgraph.rs index f41fee190..7bf87fd58 100644 --- a/timely/src/progress/subgraph.rs +++ b/timely/src/progress/subgraph.rs @@ -177,8 +177,11 @@ where let path = self.path.clone(); let reachability_logging = worker.log_register() - .get::("timely/reachability") - .map(|logger| reachability::logging::TrackerLogger::new(path, logger)); + .as_ref() + .and_then(|l| + l.get::("timely/reachability") + .map(|logger| reachability::logging::TrackerLogger::new(path, logger)) + ); let (tracker, scope_summary) = builder.build(reachability_logging); let progcaster = Progcaster::new(worker, &self.path, self.logging.clone(), self.progress_logging.clone()); diff --git a/timely/src/scheduling/activate.rs b/timely/src/scheduling/activate.rs index e86f44355..9f9d3e54c 100644 --- a/timely/src/scheduling/activate.rs +++ b/timely/src/scheduling/activate.rs @@ -48,14 +48,14 @@ pub struct Activations { rx: Receiver>, // Delayed activations. - timer: Instant, + timer: Option, queue: BinaryHeap)>>, } impl Activations { /// Creates a new activation tracker. - pub fn new(timer: Instant) -> Self { + pub fn new(timer: Option) -> Self { let (tx, rx) = crossbeam_channel::unbounded(); Self { clean: 0, @@ -77,13 +77,18 @@ impl Activations { /// Schedules a future activation for the task addressed by `path`. pub fn activate_after(&mut self, path: &[usize], delay: Duration) { - // TODO: We could have a minimum delay and immediately schedule anything less than that delay. - if delay == Duration::new(0, 0) { - self.activate(path); - } + if let Some(timer) = self.timer { + // TODO: We could have a minimum delay and immediately schedule anything less than that delay. + if delay == Duration::new(0, 0) { + self.activate(path); + } + else { + let moment = timer.elapsed() + delay; + self.queue.push(Reverse((moment, path.to_vec()))); + } + } else { - let moment = self.timer.elapsed() + delay; - self.queue.push(Reverse((moment, path.to_vec()))); + self.activate(path); } } @@ -96,10 +101,12 @@ impl Activations { } // Drain timer-based activations. - let now = self.timer.elapsed(); - while self.queue.peek().map(|Reverse((t,_))| t <= &now) == Some(true) { - let Reverse((_time, path)) = self.queue.pop().unwrap(); - self.activate(&path[..]); + if let Some(timer) = self.timer { + let now = timer.elapsed(); + while self.queue.peek().map(|Reverse((t,_))| t <= &now) == Some(true) { + let Reverse((_time, path)) = self.queue.pop().unwrap(); + self.activate(&path[..]); + } } self.bounds.drain(.. self.clean); @@ -171,12 +178,12 @@ impl Activations { /// indicates the amount of time before the thread should be unparked for the /// next scheduled activation. pub fn empty_for(&self) -> Option { - if !self.bounds.is_empty() { + if !self.bounds.is_empty() || self.timer.is_none() { Some(Duration::new(0,0)) } else { self.queue.peek().map(|Reverse((t,_a))| { - let elapsed = self.timer.elapsed(); + let elapsed = self.timer.unwrap().elapsed(); if t < &elapsed { Duration::new(0,0) } else { *t - elapsed } }) diff --git a/timely/src/worker.rs b/timely/src/worker.rs index 3db8d9733..ee1f5482a 100644 --- a/timely/src/worker.rs +++ b/timely/src/worker.rs @@ -201,23 +201,27 @@ pub trait AsWorker : Scheduler { /// Allocates a new worker-unique identifier. fn new_identifier(&mut self) -> usize; /// Provides access to named logging streams. - fn log_register(&self) -> ::std::cell::RefMut>; + fn log_register(&self) -> Option<::std::cell::RefMut>>; /// Provides access to the timely logging stream. - fn logging(&self) -> Option { self.log_register().get("timely") } + fn logging(&self) -> Option { self.log_register().and_then(|l| l.get("timely")) } } /// A `Worker` is the entry point to a timely dataflow computation. It wraps a `Allocate`, /// and has a list of dataflows that it manages. pub struct Worker { config: Config, - timer: Instant, + /// An optional instant from which the start of the computation should be reckoned. + /// + /// If this is set to none, system time-based functionality will be unavailable or work badly. + /// For example, logging will be unavailable, and activation after a delay will be unavailable. + timer: Option, paths: Rc>>>, allocator: Rc>, identifiers: Rc>, // dataflows: Rc>>, dataflows: Rc>>, dataflow_counter: Rc>, - logging: Rc>>, + logging: Option>>>, activations: Rc>, active_dataflows: Vec, @@ -247,7 +251,7 @@ impl AsWorker for Worker { } fn new_identifier(&mut self) -> usize { self.new_identifier() } - fn log_register(&self) -> RefMut> { + fn log_register(&self) -> Option>> { self.log_register() } } @@ -260,8 +264,7 @@ impl Scheduler for Worker { impl Worker { /// Allocates a new `Worker` bound to a channel allocator. - pub fn new(config: Config, c: A) -> Worker { - let now = Instant::now(); + pub fn new(config: Config, c: A, now: Option) -> Worker { let index = c.index(); Worker { config, @@ -271,7 +274,7 @@ impl Worker { identifiers: Default::default(), dataflows: Default::default(), dataflow_counter: Default::default(), - logging: Rc::new(RefCell::new(crate::logging_core::Registry::new(now, index))), + logging: now.map(|now| Rc::new(RefCell::new(crate::logging_core::Registry::new(now, index)))), activations: Rc::new(RefCell::new(Activations::new(now))), active_dataflows: Default::default(), temp_channel_ids: Default::default(), @@ -407,7 +410,7 @@ impl Worker { } // Clean up, indicate if dataflows remain. - self.logging.borrow_mut().flush(); + self.logging.as_ref().map(|l| l.borrow_mut().flush()); self.allocator.borrow_mut().release(); !self.dataflows.borrow().is_empty() } @@ -478,7 +481,7 @@ impl Worker { /// /// let index = worker.index(); /// let peers = worker.peers(); - /// let timer = worker.timer(); + /// let timer = worker.timer().unwrap(); /// /// println!("{:?}\tWorker {} of {}", timer.elapsed(), index, peers); /// @@ -493,7 +496,7 @@ impl Worker { /// /// let index = worker.index(); /// let peers = worker.peers(); - /// let timer = worker.timer(); + /// let timer = worker.timer().unwrap(); /// /// println!("{:?}\tWorker {} of {}", timer.elapsed(), index, peers); /// @@ -509,13 +512,13 @@ impl Worker { /// /// let index = worker.index(); /// let peers = worker.peers(); - /// let timer = worker.timer(); + /// let timer = worker.timer().unwrap(); /// /// println!("{:?}\tWorker {} of {}", timer.elapsed(), index, peers); /// /// }); /// ``` - pub fn timer(&self) -> Instant { self.timer } + pub fn timer(&self) -> Option { self.timer } /// Allocate a new worker-unique identifier. /// @@ -534,13 +537,14 @@ impl Worker { /// timely::execute_from_args(::std::env::args(), |worker| { /// /// worker.log_register() + /// .unwrap() /// .insert::("timely", |time, data| /// println!("{:?}\t{:?}", time, data) /// ); /// }); /// ``` - pub fn log_register(&self) -> ::std::cell::RefMut> { - self.logging.borrow_mut() + pub fn log_register(&self) -> Option<::std::cell::RefMut>> { + self.logging.as_ref().map(|l| l.borrow_mut()) } /// Construct a new dataflow. @@ -563,7 +567,7 @@ impl Worker { T: Refines<()>, F: FnOnce(&mut Child)->R, { - let logging = self.logging.borrow_mut().get("timely"); + let logging = self.logging.as_ref().map(|l| l.borrow_mut()).and_then(|l| l.get("timely")); self.dataflow_core("Dataflow", logging, Box::new(()), |_, child| func(child)) } @@ -587,7 +591,7 @@ impl Worker { T: Refines<()>, F: FnOnce(&mut Child)->R, { - let logging = self.logging.borrow_mut().get("timely"); + let logging = self.logging.as_ref().map(|l| l.borrow_mut()).and_then(|l| l.get("timely")); self.dataflow_core(name, logging, Box::new(()), |_, child| func(child)) } @@ -626,7 +630,7 @@ impl Worker { let dataflow_index = self.allocate_dataflow_index(); let identifier = self.new_identifier(); - let progress_logging = self.logging.borrow_mut().get("timely/progress"); + let progress_logging = self.logging.as_ref().map(|l| l.borrow_mut()).and_then(|l| l.get("timely/progress")); let subscope = SubgraphBuilder::new_from(dataflow_index, addr, logging.clone(), progress_logging.clone(), name); let subscope = RefCell::new(subscope);