piecrust2: piecrust/workerpool.py annotate

annotate piecrust/workerpool.py @ 979:45ad976712ec

tests: Big push to get the tests to pass again. - Lots of fixes everywhere in the code. - Try to handle debug logging in the multiprocessing worker pool when running in pytest. Not perfect, but usable for now. - Replace all `.md` test files with `.html` since now a auto-format extension always sets the format. - Replace `out` with `outfiles` in most places since now blog archives are added to the bake output and I don't want to add expected outputs for blog archives everywhere.

author	Ludovic Chabant <ludovic@chabant.com>
date	Sun, 29 Oct 2017 22:51:57 -0700
parents	5485a11591ec
children	8adc27285d93

rev	line source
691 9ae9390192da bake: Use standard pickle and queue for now to fix some small issues. Ludovic Chabant <ludovic@chabant.com> parents: 687 diff changeset	1 import io
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	2 import os
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	3 import sys
691 9ae9390192da bake: Use standard pickle and queue for now to fix some small issues. Ludovic Chabant <ludovic@chabant.com> parents: 687 diff changeset	4 import time
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	5 import logging
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	6 import threading
852 4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	7 import traceback
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	8 import multiprocessing
852 4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	9 from piecrust.environment import ExecutionStats
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	10
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	11
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	12 logger = logging.getLogger(__name__)
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	13
878 313db67cfc35 bake: Use the basic Python queue again. Ludovic Chabant <ludovic@chabant.com> parents: 854 diff changeset	14 use_fastqueue = False
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	15
852 4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	16 use_fastpickle = False
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	17 use_msgpack = False
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	18 use_marshall = False
697 9e5393fcfab2 bake: Re-enable faster serialization between processes. Ludovic Chabant <ludovic@chabant.com> parents: 693 diff changeset	19
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	20
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	21 class IWorker(object):
852 4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	22 """ Interface for a pool worker.
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	23 """
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	24 def initialize(self):
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	25 raise NotImplementedError()
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	26
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	27 def process(self, job):
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	28 raise NotImplementedError()
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	29
852 4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	30 def getStats(self):
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	31 return None
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	32
702 c62d83e17abf bake: Some more optimizations. Ludovic Chabant <ludovic@chabant.com> parents: 697 diff changeset	33 def shutdown(self):
c62d83e17abf bake: Some more optimizations. Ludovic Chabant <ludovic@chabant.com> parents: 697 diff changeset	34 pass
c62d83e17abf bake: Some more optimizations. Ludovic Chabant <ludovic@chabant.com> parents: 697 diff changeset	35
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	36
852 4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	37 class WorkerExceptionData:
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	38 def __init__(self, wid):
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	39 super().__init__()
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	40 self.wid = wid
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	41 t, v, tb = sys.exc_info()
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	42 self.type = t
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	43 self.value = '\n'.join(_get_errors(v))
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	44 self.traceback = ''.join(traceback.format_exception(t, v, tb))
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	45
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	46 def __str__(self):
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	47 return str(self.value)
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	48
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	49
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	50 def _get_errors(ex):
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	51 errors = []
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	52 while ex is not None:
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	53 msg = str(ex)
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	54 errors.append(msg)
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	55 ex = ex.__cause__
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	56 return errors
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	57
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	58
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	59 TASK_JOB = 0
852 4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	60 TASK_END = 1
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	61 _TASK_ABORT_WORKER = 10
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	62 _CRITICAL_WORKER_ERROR = 11
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	63
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	64
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	65 def worker_func(params):
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	66 if params.is_profiling:
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	67 try:
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	68 import cProfile as profile
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	69 except ImportError:
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	70 import profile
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	71
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	72 params.is_profiling = False
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	73 name = params.worker_class.__name__
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	74 profile.runctx('_real_worker_func(params)',
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	75 globals(), locals(),
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	76 filename='%s-%d.prof' % (name, params.wid))
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	77 else:
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	78 _real_worker_func(params)
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	79
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	80
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	81 def _real_worker_func(params):
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	82 try:
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	83 _real_worker_func_unsafe(params)
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	84 except Exception as ex:
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	85 logger.exception(ex)
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	86 msg = ("CRITICAL ERROR IN WORKER %d\n%s" % (params.wid, str(ex)))
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	87 params.outqueue.put((
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	88 _CRITICAL_WORKER_ERROR, None, False, params.wid, msg))
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	89
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	90
979 45ad976712ec tests: Big push to get the tests to pass again. Ludovic Chabant <ludovic@chabant.com> parents: 971 diff changeset	91 def _pre_parse_pytest_args():
45ad976712ec tests: Big push to get the tests to pass again. Ludovic Chabant <ludovic@chabant.com> parents: 971 diff changeset	92 # If we are unit-testing, we need to translate our test logging
45ad976712ec tests: Big push to get the tests to pass again. Ludovic Chabant <ludovic@chabant.com> parents: 971 diff changeset	93 # arguments into something Chef can understand.
45ad976712ec tests: Big push to get the tests to pass again. Ludovic Chabant <ludovic@chabant.com> parents: 971 diff changeset	94 import argparse
45ad976712ec tests: Big push to get the tests to pass again. Ludovic Chabant <ludovic@chabant.com> parents: 971 diff changeset	95 parser = argparse.ArgumentParser()
45ad976712ec tests: Big push to get the tests to pass again. Ludovic Chabant <ludovic@chabant.com> parents: 971 diff changeset	96 # This is adapted from our `conftest.py`.
45ad976712ec tests: Big push to get the tests to pass again. Ludovic Chabant <ludovic@chabant.com> parents: 971 diff changeset	97 parser.add_argument('--log-debug', action='store_true')
45ad976712ec tests: Big push to get the tests to pass again. Ludovic Chabant <ludovic@chabant.com> parents: 971 diff changeset	98 parser.add_argument('--log-file')
45ad976712ec tests: Big push to get the tests to pass again. Ludovic Chabant <ludovic@chabant.com> parents: 971 diff changeset	99 res, _ = parser.parse_known_args(sys.argv[1:])
45ad976712ec tests: Big push to get the tests to pass again. Ludovic Chabant <ludovic@chabant.com> parents: 971 diff changeset	100
45ad976712ec tests: Big push to get the tests to pass again. Ludovic Chabant <ludovic@chabant.com> parents: 971 diff changeset	101 chef_args = []
45ad976712ec tests: Big push to get the tests to pass again. Ludovic Chabant <ludovic@chabant.com> parents: 971 diff changeset	102 if res.log_debug:
45ad976712ec tests: Big push to get the tests to pass again. Ludovic Chabant <ludovic@chabant.com> parents: 971 diff changeset	103 chef_args.append('--debug')
45ad976712ec tests: Big push to get the tests to pass again. Ludovic Chabant <ludovic@chabant.com> parents: 971 diff changeset	104 if res.log_file:
45ad976712ec tests: Big push to get the tests to pass again. Ludovic Chabant <ludovic@chabant.com> parents: 971 diff changeset	105 chef_args += ['--log', res.log_file]
45ad976712ec tests: Big push to get the tests to pass again. Ludovic Chabant <ludovic@chabant.com> parents: 971 diff changeset	106
45ad976712ec tests: Big push to get the tests to pass again. Ludovic Chabant <ludovic@chabant.com> parents: 971 diff changeset	107 root_logger = logging.getLogger()
45ad976712ec tests: Big push to get the tests to pass again. Ludovic Chabant <ludovic@chabant.com> parents: 971 diff changeset	108 while len(root_logger.handlers) > 0:
45ad976712ec tests: Big push to get the tests to pass again. Ludovic Chabant <ludovic@chabant.com> parents: 971 diff changeset	109 root_logger.removeHandler(root_logger.handlers[0])
45ad976712ec tests: Big push to get the tests to pass again. Ludovic Chabant <ludovic@chabant.com> parents: 971 diff changeset	110
45ad976712ec tests: Big push to get the tests to pass again. Ludovic Chabant <ludovic@chabant.com> parents: 971 diff changeset	111 from piecrust.main import _pre_parse_chef_args
45ad976712ec tests: Big push to get the tests to pass again. Ludovic Chabant <ludovic@chabant.com> parents: 971 diff changeset	112 _pre_parse_chef_args(chef_args)
45ad976712ec tests: Big push to get the tests to pass again. Ludovic Chabant <ludovic@chabant.com> parents: 971 diff changeset	113
45ad976712ec tests: Big push to get the tests to pass again. Ludovic Chabant <ludovic@chabant.com> parents: 971 diff changeset	114
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	115 def _real_worker_func_unsafe(params):
852 4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	116 wid = params.wid
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	117
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	118 stats = ExecutionStats()
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	119 stats.registerTimer('WorkerInit')
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	120 init_start_time = time.perf_counter()
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	121
500 22a230d99621 bake: Fix logging configuration for multi-processing on Windows. Ludovic Chabant <ludovic@chabant.com> parents: 462 diff changeset	122 # In a context where `multiprocessing` is using the `spawn` forking model,
22a230d99621 bake: Fix logging configuration for multi-processing on Windows. Ludovic Chabant <ludovic@chabant.com> parents: 462 diff changeset	123 # the new process doesn't inherit anything, so we lost all our logging
22a230d99621 bake: Fix logging configuration for multi-processing on Windows. Ludovic Chabant <ludovic@chabant.com> parents: 462 diff changeset	124 # configuration here. Let's set it up again.
979 45ad976712ec tests: Big push to get the tests to pass again. Ludovic Chabant <ludovic@chabant.com> parents: 971 diff changeset	125 if (hasattr(multiprocessing, 'get_start_method') and
566 8073ae8cb164 bake: Don't re-setup logging for workers unless we're sure we need it. Ludovic Chabant <ludovic@chabant.com> parents: 500 diff changeset	126 multiprocessing.get_start_method() == 'spawn'):
979 45ad976712ec tests: Big push to get the tests to pass again. Ludovic Chabant <ludovic@chabant.com> parents: 971 diff changeset	127 if not params.is_unit_testing:
45ad976712ec tests: Big push to get the tests to pass again. Ludovic Chabant <ludovic@chabant.com> parents: 971 diff changeset	128 from piecrust.main import _pre_parse_chef_args
45ad976712ec tests: Big push to get the tests to pass again. Ludovic Chabant <ludovic@chabant.com> parents: 971 diff changeset	129 _pre_parse_chef_args(sys.argv[1:])
45ad976712ec tests: Big push to get the tests to pass again. Ludovic Chabant <ludovic@chabant.com> parents: 971 diff changeset	130 else:
45ad976712ec tests: Big push to get the tests to pass again. Ludovic Chabant <ludovic@chabant.com> parents: 971 diff changeset	131 _pre_parse_pytest_args()
45ad976712ec tests: Big push to get the tests to pass again. Ludovic Chabant <ludovic@chabant.com> parents: 971 diff changeset	132 elif params.is_unit_testing:
45ad976712ec tests: Big push to get the tests to pass again. Ludovic Chabant <ludovic@chabant.com> parents: 971 diff changeset	133 _pre_parse_pytest_args()
500 22a230d99621 bake: Fix logging configuration for multi-processing on Windows. Ludovic Chabant <ludovic@chabant.com> parents: 462 diff changeset	134
854 08e02c2a2a1a core: Keep refactoring, this time to prepare for generator sources. Ludovic Chabant <ludovic@chabant.com> parents: 852 diff changeset	135 from piecrust.main import ColoredFormatter
08e02c2a2a1a core: Keep refactoring, this time to prepare for generator sources. Ludovic Chabant <ludovic@chabant.com> parents: 852 diff changeset	136 root_logger = logging.getLogger()
08e02c2a2a1a core: Keep refactoring, this time to prepare for generator sources. Ludovic Chabant <ludovic@chabant.com> parents: 852 diff changeset	137 root_logger.handlers[0].setFormatter(ColoredFormatter(
08e02c2a2a1a core: Keep refactoring, this time to prepare for generator sources. Ludovic Chabant <ludovic@chabant.com> parents: 852 diff changeset	138 ('[W-%d]' % wid) + '[%(name)s] %(message)s'))
08e02c2a2a1a core: Keep refactoring, this time to prepare for generator sources. Ludovic Chabant <ludovic@chabant.com> parents: 852 diff changeset	139
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	140 logger.debug("Worker %d initializing..." % wid)
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	141
693 d2a87365b85b bake: Use threads to read/write from/to the main arbitrator process. Ludovic Chabant <ludovic@chabant.com> parents: 691 diff changeset	142 # We don't need those.
461 b015e38d4ee1 internal: Handle data serialization more under the hood. Ludovic Chabant <ludovic@chabant.com> parents: 460 diff changeset	143 params.inqueue._writer.close()
b015e38d4ee1 internal: Handle data serialization more under the hood. Ludovic Chabant <ludovic@chabant.com> parents: 460 diff changeset	144 params.outqueue._reader.close()
b015e38d4ee1 internal: Handle data serialization more under the hood. Ludovic Chabant <ludovic@chabant.com> parents: 460 diff changeset	145
693 d2a87365b85b bake: Use threads to read/write from/to the main arbitrator process. Ludovic Chabant <ludovic@chabant.com> parents: 691 diff changeset	146 # Initialize the underlying worker class.
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	147 w = params.worker_class(*params.initargs)
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	148 w.wid = wid
453 8351a77e13f5 bake: Don't pass the previous record entries to the workers. Ludovic Chabant <ludovic@chabant.com> parents: 451 diff changeset	149 try:
8351a77e13f5 bake: Don't pass the previous record entries to the workers. Ludovic Chabant <ludovic@chabant.com> parents: 451 diff changeset	150 w.initialize()
8351a77e13f5 bake: Don't pass the previous record entries to the workers. Ludovic Chabant <ludovic@chabant.com> parents: 451 diff changeset	151 except Exception as ex:
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	152 logger.error("Worker %d failed to initialize." % wid)
453 8351a77e13f5 bake: Don't pass the previous record entries to the workers. Ludovic Chabant <ludovic@chabant.com> parents: 451 diff changeset	153 logger.exception(ex)
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	154 raise
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	155
852 4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	156 stats.stepTimerSince('WorkerInit', init_start_time)
693 d2a87365b85b bake: Use threads to read/write from/to the main arbitrator process. Ludovic Chabant <ludovic@chabant.com> parents: 691 diff changeset	157
d2a87365b85b bake: Use threads to read/write from/to the main arbitrator process. Ludovic Chabant <ludovic@chabant.com> parents: 691 diff changeset	158 # Start pumping!
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	159 completed = 0
691 9ae9390192da bake: Use standard pickle and queue for now to fix some small issues. Ludovic Chabant <ludovic@chabant.com> parents: 687 diff changeset	160 time_in_get = 0
9ae9390192da bake: Use standard pickle and queue for now to fix some small issues. Ludovic Chabant <ludovic@chabant.com> parents: 687 diff changeset	161 time_in_put = 0
852 4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	162 get = params.inqueue.get
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	163 put = params.outqueue.put
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	164
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	165 while True:
691 9ae9390192da bake: Use standard pickle and queue for now to fix some small issues. Ludovic Chabant <ludovic@chabant.com> parents: 687 diff changeset	166 get_start_time = time.perf_counter()
697 9e5393fcfab2 bake: Re-enable faster serialization between processes. Ludovic Chabant <ludovic@chabant.com> parents: 693 diff changeset	167 task = get()
691 9ae9390192da bake: Use standard pickle and queue for now to fix some small issues. Ludovic Chabant <ludovic@chabant.com> parents: 687 diff changeset	168 time_in_get += (time.perf_counter() - get_start_time)
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	169
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	170 task_type, task_data = task
852 4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	171
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	172 # Job task... just do it.
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	173 if task_type == TASK_JOB:
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	174 try:
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	175 res = (task_type, task_data, True, wid, w.process(task_data))
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	176 except Exception as e:
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	177 logger.debug(
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	178 "Error processing job, sending exception to main process:")
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	179 logger.debug(traceback.format_exc())
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	180 we = WorkerExceptionData(wid)
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	181 res = (task_type, task_data, False, wid, we)
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	182
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	183 put_start_time = time.perf_counter()
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	184 put(res)
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	185 time_in_put += (time.perf_counter() - put_start_time)
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	186
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	187 completed += 1
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	188
852 4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	189 # End task... gather stats to send back to the main process.
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	190 elif task_type == TASK_END:
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	191 logger.debug("Worker %d got end task, exiting." % wid)
852 4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	192 stats.registerTimer('WorkerTaskGet', time=time_in_get)
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	193 stats.registerTimer('WorkerResultPut', time=time_in_put)
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	194 try:
852 4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	195 stats.mergeStats(w.getStats())
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	196 rep = (task_type, task_data, True, wid, (wid, stats))
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	197 except Exception as e:
852 4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	198 logger.debug(
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	199 "Error getting report, sending exception to main process:")
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	200 logger.debug(traceback.format_exc())
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	201 we = WorkerExceptionData(wid)
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	202 rep = (task_type, task_data, False, wid, (wid, we))
697 9e5393fcfab2 bake: Re-enable faster serialization between processes. Ludovic Chabant <ludovic@chabant.com> parents: 693 diff changeset	203 put(rep)
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	204 break
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	205
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	206 # Emergy abort.
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	207 elif task_type == _TASK_ABORT_WORKER:
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	208 logger.debug("Worker %d got abort signal." % wid)
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	209 break
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	210
852 4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	211 else:
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	212 raise Exception("Unknown task type: %s" % task_type)
693 d2a87365b85b bake: Use threads to read/write from/to the main arbitrator process. Ludovic Chabant <ludovic@chabant.com> parents: 691 diff changeset	213
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	214 try:
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	215 w.shutdown()
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	216 except Exception as e:
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	217 logger.error("Worker %s failed to shutdown.")
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	218 logger.exception(e)
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	219 raise
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	220
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	221 logger.debug("Worker %d completed %d tasks." % (wid, completed))
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	222
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	223
852 4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	224 class _WorkerParams:
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	225 def __init__(self, wid, inqueue, outqueue, worker_class, initargs=(),
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	226 is_profiling=False, is_unit_testing=False):
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	227 self.wid = wid
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	228 self.inqueue = inqueue
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	229 self.outqueue = outqueue
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	230 self.worker_class = worker_class
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	231 self.initargs = initargs
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	232 self.is_profiling = is_profiling
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	233 self.is_unit_testing = is_unit_testing
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	234
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	235
852 4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	236 class WorkerPool:
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	237 def __init__(self, worker_class, initargs=(), *,
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	238 callback=None, error_callback=None,
854 08e02c2a2a1a core: Keep refactoring, this time to prepare for generator sources. Ludovic Chabant <ludovic@chabant.com> parents: 852 diff changeset	239 worker_count=None, batch_size=None,
08e02c2a2a1a core: Keep refactoring, this time to prepare for generator sources. Ludovic Chabant <ludovic@chabant.com> parents: 852 diff changeset	240 userdata=None):
08e02c2a2a1a core: Keep refactoring, this time to prepare for generator sources. Ludovic Chabant <ludovic@chabant.com> parents: 852 diff changeset	241 self.userdata = userdata
08e02c2a2a1a core: Keep refactoring, this time to prepare for generator sources. Ludovic Chabant <ludovic@chabant.com> parents: 852 diff changeset	242
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	243 worker_count = worker_count or os.cpu_count() or 1
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	244
461 b015e38d4ee1 internal: Handle data serialization more under the hood. Ludovic Chabant <ludovic@chabant.com> parents: 460 diff changeset	245 if use_fastqueue:
b015e38d4ee1 internal: Handle data serialization more under the hood. Ludovic Chabant <ludovic@chabant.com> parents: 460 diff changeset	246 self._task_queue = FastQueue()
b015e38d4ee1 internal: Handle data serialization more under the hood. Ludovic Chabant <ludovic@chabant.com> parents: 460 diff changeset	247 self._result_queue = FastQueue()
b015e38d4ee1 internal: Handle data serialization more under the hood. Ludovic Chabant <ludovic@chabant.com> parents: 460 diff changeset	248 self._quick_put = self._task_queue.put
b015e38d4ee1 internal: Handle data serialization more under the hood. Ludovic Chabant <ludovic@chabant.com> parents: 460 diff changeset	249 self._quick_get = self._result_queue.get
b015e38d4ee1 internal: Handle data serialization more under the hood. Ludovic Chabant <ludovic@chabant.com> parents: 460 diff changeset	250 else:
b015e38d4ee1 internal: Handle data serialization more under the hood. Ludovic Chabant <ludovic@chabant.com> parents: 460 diff changeset	251 self._task_queue = multiprocessing.SimpleQueue()
b015e38d4ee1 internal: Handle data serialization more under the hood. Ludovic Chabant <ludovic@chabant.com> parents: 460 diff changeset	252 self._result_queue = multiprocessing.SimpleQueue()
878 313db67cfc35 bake: Use the basic Python queue again. Ludovic Chabant <ludovic@chabant.com> parents: 854 diff changeset	253 self._quick_put = self._task_queue.put
313db67cfc35 bake: Use the basic Python queue again. Ludovic Chabant <ludovic@chabant.com> parents: 854 diff changeset	254 self._quick_get = self._result_queue.get
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	255
852 4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	256 self._callback = callback
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	257 self._error_callback = error_callback
462 04abc97dd3b6 bake: Add CLI argument to specify job batch size. Ludovic Chabant <ludovic@chabant.com> parents: 461 diff changeset	258 self._batch_size = batch_size
852 4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	259 self._jobs_left = 0
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	260 self._lock_jobs_left = threading.Lock()
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	261 self._lock_workers = threading.Lock()
852 4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	262 self._event = threading.Event()
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	263 self._error_on_join = None
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	264 self._closed = False
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	265
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	266 main_module = sys.modules['__main__']
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	267 is_profiling = os.path.basename(main_module.__file__) in [
852 4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	268 'profile.py', 'cProfile.py']
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	269 is_unit_testing = os.path.basename(main_module.__file__) in [
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	270 'py.test']
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	271
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	272 self._pool = []
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	273 for i in range(worker_count):
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	274 worker_params = _WorkerParams(
852 4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	275 i, self._task_queue, self._result_queue,
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	276 worker_class, initargs,
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	277 is_profiling=is_profiling,
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	278 is_unit_testing=is_unit_testing)
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	279 w = multiprocessing.Process(target=worker_func,
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	280 args=(worker_params,))
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	281 w.name = w.name.replace('Process', 'PoolWorker')
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	282 w.daemon = True
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	283 w.start()
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	284 self._pool.append(w)
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	285
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	286 self._result_handler = threading.Thread(
852 4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	287 target=WorkerPool._handleResults,
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	288 args=(self,))
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	289 self._result_handler.daemon = True
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	290 self._result_handler.start()
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	291
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	292 def queueJobs(self, jobs):
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	293 if self._closed:
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	294 if self._error_on_join:
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	295 raise self._error_on_join
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	296 raise Exception("This worker pool has been closed.")
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	297
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	298 jobs = list(jobs)
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	299 new_job_count = len(jobs)
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	300 if new_job_count > 0:
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	301 with self._lock_jobs_left:
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	302 self._jobs_left += new_job_count
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	303
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	304 self._event.clear()
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	305 for job in jobs:
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	306 self._quick_put((TASK_JOB, job))
979 45ad976712ec tests: Big push to get the tests to pass again. Ludovic Chabant <ludovic@chabant.com> parents: 971 diff changeset	307 else:
45ad976712ec tests: Big push to get the tests to pass again. Ludovic Chabant <ludovic@chabant.com> parents: 971 diff changeset	308 with self._lock_jobs_left:
45ad976712ec tests: Big push to get the tests to pass again. Ludovic Chabant <ludovic@chabant.com> parents: 971 diff changeset	309 done = (self._jobs_left == 0)
45ad976712ec tests: Big push to get the tests to pass again. Ludovic Chabant <ludovic@chabant.com> parents: 971 diff changeset	310 if done:
45ad976712ec tests: Big push to get the tests to pass again. Ludovic Chabant <ludovic@chabant.com> parents: 971 diff changeset	311 self._event.set()
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	312
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	313 def wait(self, timeout=None):
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	314 if self._closed:
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	315 raise Exception("This worker pool has been closed.")
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	316
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	317 ret = self._event.wait(timeout)
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	318 if self._error_on_join:
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	319 raise self._error_on_join
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	320 return ret
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	321
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	322 def close(self):
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	323 if self._closed:
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	324 raise Exception("This worker pool has been closed.")
979 45ad976712ec tests: Big push to get the tests to pass again. Ludovic Chabant <ludovic@chabant.com> parents: 971 diff changeset	325 if self._jobs_left > 0:
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	326 raise Exception("A previous job queue has not finished yet.")
979 45ad976712ec tests: Big push to get the tests to pass again. Ludovic Chabant <ludovic@chabant.com> parents: 971 diff changeset	327 if not self._event.is_set():
45ad976712ec tests: Big push to get the tests to pass again. Ludovic Chabant <ludovic@chabant.com> parents: 971 diff changeset	328 raise Exception("A previous job queue hasn't been cleared.")
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	329
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	330 logger.debug("Closing worker pool...")
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	331 live_workers = list(filter(lambda w: w is not None, self._pool))
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	332 handler = _ReportHandler(len(live_workers))
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	333 self._callback = handler._handle
852 4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	334 self._error_callback = handler._handleError
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	335 for w in live_workers:
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	336 self._quick_put((TASK_END, None))
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	337 for w in live_workers:
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	338 w.join()
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	339
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	340 logger.debug("Waiting for reports...")
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	341 if not handler.wait(2):
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	342 missing = handler.reports.index(None)
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	343 logger.warning(
852 4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	344 "Didn't receive all worker reports before timeout. "
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	345 "Missing report from worker %d." % missing)
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	346
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	347 logger.debug("Exiting result handler thread...")
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	348 self._result_queue.put(None)
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	349 self._result_handler.join()
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	350 self._closed = True
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	351
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	352 return handler.reports
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	353
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	354 def _onResultHandlerCriticalError(self, wid):
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	355 logger.error("Result handler received a critical error from "
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	356 "worker %d." % wid)
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	357 with self._lock_workers:
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	358 self._pool[wid] = None
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	359 if all(map(lambda w: w is None, self._pool)):
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	360 logger.error("All workers have died!")
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	361 self._closed = True
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	362 self._error_on_join = Exception("All workers have died!")
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	363 self._event.set()
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	364 return False
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	365
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	366 return True
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	367
852 4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	368 def _onTaskDone(self):
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	369 with self._lock_jobs_left:
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	370 left = self._jobs_left - 1
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	371 self._jobs_left = left
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	372
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	373 if left == 0:
852 4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	374 self._event.set()
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	375
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	376 @staticmethod
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	377 def _handleResults(pool):
854 08e02c2a2a1a core: Keep refactoring, this time to prepare for generator sources. Ludovic Chabant <ludovic@chabant.com> parents: 852 diff changeset	378 userdata = pool.userdata
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	379 while True:
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	380 try:
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	381 res = pool._quick_get()
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	382 except (EOFError, OSError):
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	383 logger.debug("Result handler thread encountered connection "
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	384 "problem, exiting.")
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	385 return
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	386
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	387 if res is None:
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	388 logger.debug("Result handler exiting.")
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	389 return
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	390
852 4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	391 task_type, task_data, success, wid, data = res
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	392 try:
852 4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	393 if success:
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	394 if pool._callback:
854 08e02c2a2a1a core: Keep refactoring, this time to prepare for generator sources. Ludovic Chabant <ludovic@chabant.com> parents: 852 diff changeset	395 pool._callback(task_data, data, userdata)
852 4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	396 else:
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	397 if task_type == _CRITICAL_WORKER_ERROR:
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	398 logger.error(data)
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	399 do_continue = pool._onResultHandlerCriticalError(wid)
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	400 if not do_continue:
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	401 logger.debug("Aborting result handling thread.")
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	402 return
451 838f3964f400 bake: Optimize the bake by not using custom classes for passing info. Ludovic Chabant <ludovic@chabant.com> parents: 447 diff changeset	403 else:
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	404 if pool._error_callback:
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	405 pool._error_callback(task_data, data, userdata)
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	406 else:
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	407 logger.error(
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	408 "Worker %d failed to process a job:" % wid)
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	409 logger.error(data)
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	410 except Exception as ex:
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	411 logger.exception(ex)
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	412
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	413 if task_type == TASK_JOB:
852 4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	414 pool._onTaskDone()
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	415
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	416
852 4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	417 class _ReportHandler:
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	418 def __init__(self, worker_count):
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	419 self.reports = [None] * worker_count
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	420 self._count = worker_count
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	421 self._received = 0
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	422 self._event = threading.Event()
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	423
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	424 def wait(self, timeout=None):
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	425 return self._event.wait(timeout)
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	426
854 08e02c2a2a1a core: Keep refactoring, this time to prepare for generator sources. Ludovic Chabant <ludovic@chabant.com> parents: 852 diff changeset	427 def _handle(self, job, res, _):
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	428 wid, data = res
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	429 if wid < 0 or wid > self._count:
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	430 logger.error("Ignoring report from unknown worker %d." % wid)
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	431 return
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	432
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	433 self._received += 1
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	434 self.reports[wid] = data
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	435
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	436 if self._received == self._count:
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	437 self._event.set()
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	438
854 08e02c2a2a1a core: Keep refactoring, this time to prepare for generator sources. Ludovic Chabant <ludovic@chabant.com> parents: 852 diff changeset	439 def _handleError(self, job, res, _):
852 4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	440 logger.error("Worker %d failed to send its report." % res.wid)
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	441 logger.error(res)
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	442
461 b015e38d4ee1 internal: Handle data serialization more under the hood. Ludovic Chabant <ludovic@chabant.com> parents: 460 diff changeset	443
852 4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	444 class FastQueue:
691 9ae9390192da bake: Use standard pickle and queue for now to fix some small issues. Ludovic Chabant <ludovic@chabant.com> parents: 687 diff changeset	445 def __init__(self):
461 b015e38d4ee1 internal: Handle data serialization more under the hood. Ludovic Chabant <ludovic@chabant.com> parents: 460 diff changeset	446 self._reader, self._writer = multiprocessing.Pipe(duplex=False)
b015e38d4ee1 internal: Handle data serialization more under the hood. Ludovic Chabant <ludovic@chabant.com> parents: 460 diff changeset	447 self._rlock = multiprocessing.Lock()
b015e38d4ee1 internal: Handle data serialization more under the hood. Ludovic Chabant <ludovic@chabant.com> parents: 460 diff changeset	448 self._wlock = multiprocessing.Lock()
697 9e5393fcfab2 bake: Re-enable faster serialization between processes. Ludovic Chabant <ludovic@chabant.com> parents: 693 diff changeset	449 self._initBuffers()
9e5393fcfab2 bake: Re-enable faster serialization between processes. Ludovic Chabant <ludovic@chabant.com> parents: 693 diff changeset	450
9e5393fcfab2 bake: Re-enable faster serialization between processes. Ludovic Chabant <ludovic@chabant.com> parents: 693 diff changeset	451 def _initBuffers(self):
691 9ae9390192da bake: Use standard pickle and queue for now to fix some small issues. Ludovic Chabant <ludovic@chabant.com> parents: 687 diff changeset	452 self._rbuf = io.BytesIO()
9ae9390192da bake: Use standard pickle and queue for now to fix some small issues. Ludovic Chabant <ludovic@chabant.com> parents: 687 diff changeset	453 self._rbuf.truncate(256)
9ae9390192da bake: Use standard pickle and queue for now to fix some small issues. Ludovic Chabant <ludovic@chabant.com> parents: 687 diff changeset	454 self._wbuf = io.BytesIO()
9ae9390192da bake: Use standard pickle and queue for now to fix some small issues. Ludovic Chabant <ludovic@chabant.com> parents: 687 diff changeset	455 self._wbuf.truncate(256)
461 b015e38d4ee1 internal: Handle data serialization more under the hood. Ludovic Chabant <ludovic@chabant.com> parents: 460 diff changeset	456
b015e38d4ee1 internal: Handle data serialization more under the hood. Ludovic Chabant <ludovic@chabant.com> parents: 460 diff changeset	457 def __getstate__(self):
691 9ae9390192da bake: Use standard pickle and queue for now to fix some small issues. Ludovic Chabant <ludovic@chabant.com> parents: 687 diff changeset	458 return (self._reader, self._writer, self._rlock, self._wlock)
461 b015e38d4ee1 internal: Handle data serialization more under the hood. Ludovic Chabant <ludovic@chabant.com> parents: 460 diff changeset	459
b015e38d4ee1 internal: Handle data serialization more under the hood. Ludovic Chabant <ludovic@chabant.com> parents: 460 diff changeset	460 def __setstate__(self, state):
691 9ae9390192da bake: Use standard pickle and queue for now to fix some small issues. Ludovic Chabant <ludovic@chabant.com> parents: 687 diff changeset	461 (self._reader, self._writer, self._rlock, self._wlock) = state
697 9e5393fcfab2 bake: Re-enable faster serialization between processes. Ludovic Chabant <ludovic@chabant.com> parents: 693 diff changeset	462 self._initBuffers()
461 b015e38d4ee1 internal: Handle data serialization more under the hood. Ludovic Chabant <ludovic@chabant.com> parents: 460 diff changeset	463
b015e38d4ee1 internal: Handle data serialization more under the hood. Ludovic Chabant <ludovic@chabant.com> parents: 460 diff changeset	464 def get(self):
b015e38d4ee1 internal: Handle data serialization more under the hood. Ludovic Chabant <ludovic@chabant.com> parents: 460 diff changeset	465 with self._rlock:
691 9ae9390192da bake: Use standard pickle and queue for now to fix some small issues. Ludovic Chabant <ludovic@chabant.com> parents: 687 diff changeset	466 try:
9ae9390192da bake: Use standard pickle and queue for now to fix some small issues. Ludovic Chabant <ludovic@chabant.com> parents: 687 diff changeset	467 with self._rbuf.getbuffer() as b:
697 9e5393fcfab2 bake: Re-enable faster serialization between processes. Ludovic Chabant <ludovic@chabant.com> parents: 693 diff changeset	468 bufsize = self._reader.recv_bytes_into(b)
691 9ae9390192da bake: Use standard pickle and queue for now to fix some small issues. Ludovic Chabant <ludovic@chabant.com> parents: 687 diff changeset	469 except multiprocessing.BufferTooShort as e:
697 9e5393fcfab2 bake: Re-enable faster serialization between processes. Ludovic Chabant <ludovic@chabant.com> parents: 693 diff changeset	470 bufsize = len(e.args[0])
9e5393fcfab2 bake: Re-enable faster serialization between processes. Ludovic Chabant <ludovic@chabant.com> parents: 693 diff changeset	471 self._rbuf.truncate(bufsize * 2)
691 9ae9390192da bake: Use standard pickle and queue for now to fix some small issues. Ludovic Chabant <ludovic@chabant.com> parents: 687 diff changeset	472 self._rbuf.seek(0)
9ae9390192da bake: Use standard pickle and queue for now to fix some small issues. Ludovic Chabant <ludovic@chabant.com> parents: 687 diff changeset	473 self._rbuf.write(e.args[0])
9ae9390192da bake: Use standard pickle and queue for now to fix some small issues. Ludovic Chabant <ludovic@chabant.com> parents: 687 diff changeset	474
9ae9390192da bake: Use standard pickle and queue for now to fix some small issues. Ludovic Chabant <ludovic@chabant.com> parents: 687 diff changeset	475 self._rbuf.seek(0)
852 4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	476 return _unpickle(self._rbuf, bufsize)
461 b015e38d4ee1 internal: Handle data serialization more under the hood. Ludovic Chabant <ludovic@chabant.com> parents: 460 diff changeset	477
b015e38d4ee1 internal: Handle data serialization more under the hood. Ludovic Chabant <ludovic@chabant.com> parents: 460 diff changeset	478 def put(self, obj):
691 9ae9390192da bake: Use standard pickle and queue for now to fix some small issues. Ludovic Chabant <ludovic@chabant.com> parents: 687 diff changeset	479 self._wbuf.seek(0)
852 4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	480 _pickle(obj, self._wbuf)
691 9ae9390192da bake: Use standard pickle and queue for now to fix some small issues. Ludovic Chabant <ludovic@chabant.com> parents: 687 diff changeset	481 size = self._wbuf.tell()
9ae9390192da bake: Use standard pickle and queue for now to fix some small issues. Ludovic Chabant <ludovic@chabant.com> parents: 687 diff changeset	482
9ae9390192da bake: Use standard pickle and queue for now to fix some small issues. Ludovic Chabant <ludovic@chabant.com> parents: 687 diff changeset	483 self._wbuf.seek(0)
461 b015e38d4ee1 internal: Handle data serialization more under the hood. Ludovic Chabant <ludovic@chabant.com> parents: 460 diff changeset	484 with self._wlock:
691 9ae9390192da bake: Use standard pickle and queue for now to fix some small issues. Ludovic Chabant <ludovic@chabant.com> parents: 687 diff changeset	485 with self._wbuf.getbuffer() as b:
9ae9390192da bake: Use standard pickle and queue for now to fix some small issues. Ludovic Chabant <ludovic@chabant.com> parents: 687 diff changeset	486 self._writer.send_bytes(b, 0, size)
461 b015e38d4ee1 internal: Handle data serialization more under the hood. Ludovic Chabant <ludovic@chabant.com> parents: 460 diff changeset	487
852 4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	488
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	489 if use_fastpickle:
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	490 from piecrust import fastpickle
852 4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	491
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	492 def _pickle_fast(obj, buf):
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	493 fastpickle.pickle_intob(obj, buf)
852 4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	494
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	495 def _unpickle_fast(buf, bufsize):
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	496 return fastpickle.unpickle_fromb(buf, bufsize)
852 4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	497
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	498 _pickle = _pickle_fast
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	499 _unpickle = _unpickle_fast
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	500
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	501 elif use_msgpack:
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	502 import msgpack
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	503
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	504 def _pickle_msgpack(obj, buf):
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	505 msgpack.pack(obj, buf)
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	506
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	507 def _unpickle_msgpack(buf, bufsize):
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	508 return msgpack.unpack(buf)
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	509
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	510 _pickle = _pickle_msgpack
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	511 _unpickle = _unpickle_msgpack
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	512
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	513 elif use_marshall:
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	514 import marshal
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	515
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	516 def _pickle_marshal(obj, buf):
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	517 marshal.dump(obj, buf)
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	518
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	519 def _unpickle_marshal(buf, bufsize):
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	520 return marshal.load(buf)
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	521
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	522 _pickle = _pickle_marshal
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	523 _unpickle = _unpickle_marshal
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	524
852 4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	525 else:
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	526 import pickle
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	527
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	528 def _pickle_default(obj, buf):
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	529 pickle.dump(obj, buf, pickle.HIGHEST_PROTOCOL)
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	530
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	531 def _unpickle_default(buf, bufsize):
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	532 return pickle.load(buf)
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	533
852 4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	534 _pickle = _pickle_default
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	535 _unpickle = _unpickle_default
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	536

Mercurial > piecrust2

annotate piecrust/workerpool.py @ 979:45ad976712ec