ahamilton/eris
1
0
Fork 0
Code Releases Activity

Coding style.

Browse source
This commit is contained in:
Andrew Hamilton 2016-10-21 15:04:22 +02:00
parent 9a07571d75
commit 1b0c62341a
1 changed files with 23 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

38
vigil
View file

@ -552,6 +552,7 @@ class Screen:
self._log = log self._log = log
self._appearance_changed_event = appearance_changed_event self._appearance_changed_event = appearance_changed_event
self._main_loop = main_loop self._main_loop = main_loop
self.workers = None
self._is_listing_portrait = True self._is_listing_portrait = True
self._is_log_visible = True self._is_log_visible = True
self._is_help_visible = False self._is_help_visible = False
@ -559,6 +560,26 @@ class Screen:
self._make_widgets() self._make_widgets()
self._key_map = _make_key_map(Screen._KEY_DATA) self._key_map = _make_key_map(Screen._KEY_DATA)
def make_workers(self, worker_count, sandbox, is_being_tested):
workers = []
self._log.log_message("Starting workers (%s) ..." % worker_count)
for index in range(worker_count):
worker_ = worker.Worker(sandbox, self._is_paused, is_being_tested)
workers.append(worker_)
future = worker_.job_runner(
self._summary, self._log, self._summary._jobs_added_event,
self._appearance_changed_event)
worker_.future = asyncio.ensure_future(
future, loop=self._main_loop)
self.workers = workers
def stop_workers(self):
for worker_ in self.workers:
worker_.pause()
worker_.future.cancel()
if worker_.result is not None:
worker_.result.reset()
def _partition(self, widgets, height): def _partition(self, widgets, height):
smaller_height = max(height // 4, 10) smaller_height = max(height // 4, 10)
return [height - smaller_height, smaller_height] return [height - smaller_height, smaller_height]
@ -870,7 +891,6 @@ def main(root_path, loop, worker_count=None, is_sandboxed=True,
appearance_changed_event.set() appearance_changed_event.set()
watch_manager_fd = _add_watch_manager_to_mainloop( watch_manager_fd = _add_watch_manager_to_mainloop(
root_path, loop, on_filesystem_change, _is_path_excluded) root_path, loop, on_filesystem_change, _is_path_excluded)
screen.workers = workers = []
if is_sandboxed: if is_sandboxed:
log.log_message("Making filesystem sandbox...") log.log_message("Making filesystem sandbox...")
sandbox_temp_dir = tempfile.mkdtemp() sandbox_temp_dir = tempfile.mkdtemp()
@ -879,24 +899,12 @@ def main(root_path, loop, worker_count=None, is_sandboxed=True,
else: else:
log.log_message("Running without the filesystem sandbox...") log.log_message("Running without the filesystem sandbox...")
sandbox = None sandbox = None
screen.make_workers(worker_count, sandbox, is_being_tested)
try: try:
log.log_message("Starting workers (%s) ..." % worker_count)
for index in range(worker_count):
worker_ = worker.Worker(sandbox, screen._is_paused,
is_being_tested)
workers.append(worker_)
future = worker_.job_runner(
summary, log, jobs_added_event, appearance_changed_event)
worker_.future = asyncio.ensure_future(future, loop=loop)
def exit_loop(): def exit_loop():
log.log_command("Exiting...") log.log_command("Exiting...")
time.sleep(0.05) time.sleep(0.05)
for worker_ in workers: screen.stop_workers()
worker_.pause()
worker_.future.cancel()
if worker_.result is not None:
worker_.result.reset()
loop.stop() loop.stop()
fill3.main(loop, appearance_changed_event, screen, exit_loop=exit_loop) fill3.main(loop, appearance_changed_event, screen, exit_loop=exit_loop)
log.log_message("Program stopped.") log.log_message("Program stopped.")