Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions timely/src/execute.rs
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,9 @@ where
let alloc = crate::communication::allocator::thread::Thread::new();
let mut worker = crate::worker::Worker::new(WorkerConfig::default(), alloc);
let result = func(&mut worker);
while worker.step_or_park(None) { }
while worker.has_dataflows() {
worker.step_or_park(None);
}
result
}

Expand Down Expand Up @@ -283,7 +285,9 @@ where
}

let result = func(&mut worker);
while worker.step_or_park(None) { }
while worker.has_dataflows() {
worker.step_or_park(None);
}
result
})
}
Expand Down Expand Up @@ -382,7 +386,9 @@ where
initialize_from(builders, others, move |allocator| {
let mut worker = Worker::new(worker_config.clone(), allocator);
let result = func(&mut worker);
while worker.step_or_park(None) { }
while worker.has_dataflows() {
worker.step_or_park(None);
}
result
})
}
7 changes: 6 additions & 1 deletion timely/src/worker.rs
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ impl<A: Allocate> Worker<A> {
(x, y) => x.or(y),
};

if !self.dataflows.borrow().is_empty() && delay != Some(Duration::new(0,0)) {
if delay != Some(Duration::new(0,0)) {

// Log parking and flush log.
if let Some(l) = self.logging().as_mut() {
Expand Down Expand Up @@ -698,6 +698,11 @@ impl<A: Allocate> Worker<A> {
self.dataflows.borrow().keys().cloned().collect()
}

/// True if there is at least one dataflow under management.
pub fn has_dataflows(&self) -> bool {
!self.dataflows.borrow().is_empty()
}

// Acquire a new distinct dataflow identifier.
fn allocate_dataflow_index(&mut self) -> usize {
*self.dataflow_counter.borrow_mut() += 1;
Expand Down