piecrust2: piecrust/workerpool.py annotate

annotate piecrust/workerpool.py @ 1014:071f30aa04bb

bake: Do template caching in a background job if possible.

author	Ludovic Chabant <ludovic@chabant.com>
date	Tue, 28 Nov 2017 21:28:15 -0800
parents	c4cf3cfe2726
children	bd544b65cfad

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
991 1857dbd4580f bake: Fix bugs introduced by bake optimizations, of course. Ludovic Chabant <ludovic@chabant.com> parents: 989 diff changeset	14 use_fastqueue = False
852 4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	15 use_fastpickle = False
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	16 use_msgpack = False
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	17 use_marshall = False
989 8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	18 use_json = 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
989 8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	37 def _get_worker_exception_data(wid):
8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	38 t, v, tb = sys.exc_info()
8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	39 return {
8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	40 'wid': wid,
8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	41 'type': str(t),
8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	42 'value': '\n'.join(_get_errors(v)),
8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	43 'traceback': ''.join(traceback.format_exception(t, v, tb))
8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	44 }
852 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
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	47 def _get_errors(ex):
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	48 errors = []
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	49 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	50 msg = str(ex)
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	51 errors.append(msg)
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	52 ex = ex.__cause__
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	53 return errors
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	54
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	55
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	56 TASK_JOB = 0
989 8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	57 TASK_JOB_BATCH = 1
8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	58 TASK_END = 2
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	59 _TASK_ABORT_WORKER = 10
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	60 _CRITICAL_WORKER_ERROR = 11
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	61
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	62
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	63 def worker_func(params):
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	64 if params.is_profiling:
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	65 try:
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	66 import cProfile as profile
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	67 except ImportError:
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	68 import profile
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	69
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	70 params.is_profiling = False
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	71 name = params.worker_class.__name__
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	72 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	73 globals(), locals(),
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	74 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	75 else:
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	76 _real_worker_func(params)
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	77
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	78
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	79 def _real_worker_func(params):
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	80 try:
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	81 _real_worker_func_unsafe(params)
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	82 except Exception as ex:
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	83 logger.exception(ex)
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	84 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	85 params.outqueue.put((
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	86 _CRITICAL_WORKER_ERROR, None, False, params.wid, msg))
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	87
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	88
979 45ad976712ec tests: Big push to get the tests to pass again. Ludovic Chabant <ludovic@chabant.com> parents: 971 diff changeset	89 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	90 # 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	91 # 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	92 import argparse
45ad976712ec tests: Big push to get the tests to pass again. Ludovic Chabant <ludovic@chabant.com> parents: 971 diff changeset	93 parser = argparse.ArgumentParser()
45ad976712ec tests: Big push to get the tests to pass again. Ludovic Chabant <ludovic@chabant.com> parents: 971 diff changeset	94 # 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	95 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	96 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	97 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	98
45ad976712ec tests: Big push to get the tests to pass again. Ludovic Chabant <ludovic@chabant.com> parents: 971 diff changeset	99 chef_args = []
45ad976712ec tests: Big push to get the tests to pass again. Ludovic Chabant <ludovic@chabant.com> parents: 971 diff changeset	100 if res.log_debug:
45ad976712ec tests: Big push to get the tests to pass again. Ludovic Chabant <ludovic@chabant.com> parents: 971 diff changeset	101 chef_args.append('--debug')
45ad976712ec tests: Big push to get the tests to pass again. Ludovic Chabant <ludovic@chabant.com> parents: 971 diff changeset	102 if res.log_file:
45ad976712ec tests: Big push to get the tests to pass again. Ludovic Chabant <ludovic@chabant.com> parents: 971 diff changeset	103 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	104
45ad976712ec tests: Big push to get the tests to pass again. Ludovic Chabant <ludovic@chabant.com> parents: 971 diff changeset	105 root_logger = logging.getLogger()
45ad976712ec tests: Big push to get the tests to pass again. Ludovic Chabant <ludovic@chabant.com> parents: 971 diff changeset	106 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	107 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	108
45ad976712ec tests: Big push to get the tests to pass again. Ludovic Chabant <ludovic@chabant.com> parents: 971 diff changeset	109 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	110 _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	111
45ad976712ec tests: Big push to get the tests to pass again. Ludovic Chabant <ludovic@chabant.com> parents: 971 diff changeset	112
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	113 def _real_worker_func_unsafe(params):
1011 c4cf3cfe2726 bake: Better performance stats, and add callback to preload templates. Ludovic Chabant <ludovic@chabant.com> parents: 1008 diff changeset	114 init_start_time = time.perf_counter()
c4cf3cfe2726 bake: Better performance stats, and add callback to preload templates. Ludovic Chabant <ludovic@chabant.com> parents: 1008 diff changeset	115
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
500 22a230d99621 bake: Fix logging configuration for multi-processing on Windows. Ludovic Chabant <ludovic@chabant.com> parents: 462 diff changeset	121 # 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	122 # 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	123 # 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	124 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	125 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	126 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	127 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	128 _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	129 else:
45ad976712ec tests: Big push to get the tests to pass again. Ludovic Chabant <ludovic@chabant.com> parents: 971 diff changeset	130 _pre_parse_pytest_args()
45ad976712ec tests: Big push to get the tests to pass again. Ludovic Chabant <ludovic@chabant.com> parents: 971 diff changeset	131 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	132 _pre_parse_pytest_args()
500 22a230d99621 bake: Fix logging configuration for multi-processing on Windows. Ludovic Chabant <ludovic@chabant.com> parents: 462 diff changeset	133
854 08e02c2a2a1a core: Keep refactoring, this time to prepare for generator sources. Ludovic Chabant <ludovic@chabant.com> parents: 852 diff changeset	134 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	135 root_logger = logging.getLogger()
08e02c2a2a1a core: Keep refactoring, this time to prepare for generator sources. Ludovic Chabant <ludovic@chabant.com> parents: 852 diff changeset	136 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	137 ('[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	138
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	139 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	140
693 d2a87365b85b bake: Use threads to read/write from/to the main arbitrator process. Ludovic Chabant <ludovic@chabant.com> parents: 691 diff changeset	141 # We don't need those.
461 b015e38d4ee1 internal: Handle data serialization more under the hood. Ludovic Chabant <ludovic@chabant.com> parents: 460 diff changeset	142 params.inqueue._writer.close()
b015e38d4ee1 internal: Handle data serialization more under the hood. Ludovic Chabant <ludovic@chabant.com> parents: 460 diff changeset	143 params.outqueue._reader.close()
b015e38d4ee1 internal: Handle data serialization more under the hood. Ludovic Chabant <ludovic@chabant.com> parents: 460 diff changeset	144
693 d2a87365b85b bake: Use threads to read/write from/to the main arbitrator process. Ludovic Chabant <ludovic@chabant.com> parents: 691 diff changeset	145 # 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	146 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	147 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	148 try:
8351a77e13f5 bake: Don't pass the previous record entries to the workers. Ludovic Chabant <ludovic@chabant.com> parents: 451 diff changeset	149 w.initialize()
8351a77e13f5 bake: Don't pass the previous record entries to the workers. Ludovic Chabant <ludovic@chabant.com> parents: 451 diff changeset	150 except Exception as ex:
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	151 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	152 logger.exception(ex)
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	153 raise
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	154
852 4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	155 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	156
d2a87365b85b bake: Use threads to read/write from/to the main arbitrator process. Ludovic Chabant <ludovic@chabant.com> parents: 691 diff changeset	157 # Start pumping!
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	158 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	159 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	160 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	161 get = params.inqueue.get
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	162 put = params.outqueue.put
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	163
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	164 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	165 get_start_time = time.perf_counter()
697 9e5393fcfab2 bake: Re-enable faster serialization between processes. Ludovic Chabant <ludovic@chabant.com> parents: 693 diff changeset	166 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	167 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	168
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	169 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	170
989 8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	171 # Job task(s)... just do it.
8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	172 if task_type == TASK_JOB or task_type == TASK_JOB_BATCH:
8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	173
8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	174 task_data_list = task_data
8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	175 if task_type == TASK_JOB:
8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	176 task_data_list = [task_data]
8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	177
8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	178 result_list = []
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	179
989 8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	180 for td in task_data_list:
8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	181 try:
1008 09c3d415d9e5 bake: Make `batch-size` option work again. Ludovic Chabant <ludovic@chabant.com> parents: 991 diff changeset	182 worker_res = w.process(td)
09c3d415d9e5 bake: Make `batch-size` option work again. Ludovic Chabant <ludovic@chabant.com> parents: 991 diff changeset	183 result_list.append((td, worker_res, True))
989 8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	184 except Exception as e:
8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	185 logger.debug(
8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	186 "Error processing job, sending exception to main process:")
8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	187 logger.debug(traceback.format_exc())
8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	188 we = _get_worker_exception_data(wid)
1008 09c3d415d9e5 bake: Make `batch-size` option work again. Ludovic Chabant <ludovic@chabant.com> parents: 991 diff changeset	189 error_res = (td, we, False)
09c3d415d9e5 bake: Make `batch-size` option work again. Ludovic Chabant <ludovic@chabant.com> parents: 991 diff changeset	190 result_list.append((td, error_res, False))
989 8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	191
8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	192 res = (task_type, wid, result_list)
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	193 put_start_time = time.perf_counter()
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	194 put(res)
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	195 time_in_put += (time.perf_counter() - put_start_time)
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	196
989 8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	197 completed += len(task_data_list)
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	198
852 4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	199 # 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	200 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	201 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	202 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	203 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	204 try:
852 4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	205 stats.mergeStats(w.getStats())
991 1857dbd4580f bake: Fix bugs introduced by bake optimizations, of course. Ludovic Chabant <ludovic@chabant.com> parents: 989 diff changeset	206 stats_data = stats.toData()
1857dbd4580f bake: Fix bugs introduced by bake optimizations, of course. Ludovic Chabant <ludovic@chabant.com> parents: 989 diff changeset	207 rep = (task_type, wid, [(task_data, (wid, stats_data), True)])
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	208 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	209 logger.debug(
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	210 "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	211 logger.debug(traceback.format_exc())
989 8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	212 we = _get_worker_exception_data(wid)
8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	213 rep = (task_type, wid, [(task_data, (wid, we), False)])
697 9e5393fcfab2 bake: Re-enable faster serialization between processes. Ludovic Chabant <ludovic@chabant.com> parents: 693 diff changeset	214 put(rep)
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	215 break
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	216
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	217 # Emergy abort.
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	218 elif task_type == _TASK_ABORT_WORKER:
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	219 logger.debug("Worker %d got abort signal." % wid)
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	220 break
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	221
852 4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	222 else:
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	223 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	224
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	225 try:
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	226 w.shutdown()
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	227 except Exception as e:
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	228 logger.error("Worker %s failed to shutdown.")
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	229 logger.exception(e)
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	230 raise
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	231
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	232 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	233
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	234
852 4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	235 class _WorkerParams:
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	236 def __init__(self, wid, inqueue, outqueue, worker_class, initargs=(),
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	237 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	238 self.wid = wid
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	239 self.inqueue = inqueue
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	240 self.outqueue = outqueue
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	241 self.worker_class = worker_class
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	242 self.initargs = initargs
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	243 self.is_profiling = is_profiling
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	244 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	245
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	246
852 4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	247 class WorkerPool:
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	248 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	249 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	250 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	251 userdata=None):
1011 c4cf3cfe2726 bake: Better performance stats, and add callback to preload templates. Ludovic Chabant <ludovic@chabant.com> parents: 1008 diff changeset	252 init_start_time = time.perf_counter()
c4cf3cfe2726 bake: Better performance stats, and add callback to preload templates. Ludovic Chabant <ludovic@chabant.com> parents: 1008 diff changeset	253
c4cf3cfe2726 bake: Better performance stats, and add callback to preload templates. Ludovic Chabant <ludovic@chabant.com> parents: 1008 diff changeset	254 stats = ExecutionStats()
c4cf3cfe2726 bake: Better performance stats, and add callback to preload templates. Ludovic Chabant <ludovic@chabant.com> parents: 1008 diff changeset	255 stats.registerTimer('MasterInit')
c4cf3cfe2726 bake: Better performance stats, and add callback to preload templates. Ludovic Chabant <ludovic@chabant.com> parents: 1008 diff changeset	256 self._stats = stats
c4cf3cfe2726 bake: Better performance stats, and add callback to preload templates. Ludovic Chabant <ludovic@chabant.com> parents: 1008 diff changeset	257 self._time_in_put = 0
c4cf3cfe2726 bake: Better performance stats, and add callback to preload templates. Ludovic Chabant <ludovic@chabant.com> parents: 1008 diff changeset	258 self._time_in_get = 0
c4cf3cfe2726 bake: Better performance stats, and add callback to preload templates. Ludovic Chabant <ludovic@chabant.com> parents: 1008 diff changeset	259
854 08e02c2a2a1a core: Keep refactoring, this time to prepare for generator sources. Ludovic Chabant <ludovic@chabant.com> parents: 852 diff changeset	260 self.userdata = userdata
08e02c2a2a1a core: Keep refactoring, this time to prepare for generator sources. Ludovic Chabant <ludovic@chabant.com> parents: 852 diff changeset	261
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	262 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	263
461 b015e38d4ee1 internal: Handle data serialization more under the hood. Ludovic Chabant <ludovic@chabant.com> parents: 460 diff changeset	264 if use_fastqueue:
b015e38d4ee1 internal: Handle data serialization more under the hood. Ludovic Chabant <ludovic@chabant.com> parents: 460 diff changeset	265 self._task_queue = FastQueue()
b015e38d4ee1 internal: Handle data serialization more under the hood. Ludovic Chabant <ludovic@chabant.com> parents: 460 diff changeset	266 self._result_queue = FastQueue()
b015e38d4ee1 internal: Handle data serialization more under the hood. Ludovic Chabant <ludovic@chabant.com> parents: 460 diff changeset	267 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	268 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	269 else:
b015e38d4ee1 internal: Handle data serialization more under the hood. Ludovic Chabant <ludovic@chabant.com> parents: 460 diff changeset	270 self._task_queue = multiprocessing.SimpleQueue()
b015e38d4ee1 internal: Handle data serialization more under the hood. Ludovic Chabant <ludovic@chabant.com> parents: 460 diff changeset	271 self._result_queue = multiprocessing.SimpleQueue()
878 313db67cfc35 bake: Use the basic Python queue again. Ludovic Chabant <ludovic@chabant.com> parents: 854 diff changeset	272 self._quick_put = self._task_queue.put
313db67cfc35 bake: Use the basic Python queue again. Ludovic Chabant <ludovic@chabant.com> parents: 854 diff changeset	273 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	274
852 4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	275 self._callback = callback
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	276 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	277 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	278 self._jobs_left = 0
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	279 self._lock_jobs_left = threading.Lock()
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	280 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	281 self._event = threading.Event()
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	282 self._error_on_join = None
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	283 self._closed = False
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	284
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	285 main_module = sys.modules['__main__']
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	286 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	287 'profile.py', 'cProfile.py']
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	288 is_unit_testing = os.path.basename(main_module.__file__) in [
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	289 'py.test']
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	290
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	291 self._pool = []
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	292 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	293 worker_params = _WorkerParams(
852 4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	294 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	295 worker_class, initargs,
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	296 is_profiling=is_profiling,
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	297 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	298 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	299 args=(worker_params,))
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	300 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	301 w.daemon = True
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	302 w.start()
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	303 self._pool.append(w)
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	304
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	305 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	306 target=WorkerPool._handleResults,
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	307 args=(self,))
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	308 self._result_handler.daemon = True
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	309 self._result_handler.start()
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	310
1011 c4cf3cfe2726 bake: Better performance stats, and add callback to preload templates. Ludovic Chabant <ludovic@chabant.com> parents: 1008 diff changeset	311 stats.stepTimerSince('MasterInit', init_start_time)
c4cf3cfe2726 bake: Better performance stats, and add callback to preload templates. Ludovic Chabant <ludovic@chabant.com> parents: 1008 diff changeset	312
1014 071f30aa04bb bake: Do template caching in a background job if possible. Ludovic Chabant <ludovic@chabant.com> parents: 1011 diff changeset	313 @property
071f30aa04bb bake: Do template caching in a background job if possible. Ludovic Chabant <ludovic@chabant.com> parents: 1011 diff changeset	314 def pool_size(self):
071f30aa04bb bake: Do template caching in a background job if possible. Ludovic Chabant <ludovic@chabant.com> parents: 1011 diff changeset	315 return len(self._pool)
071f30aa04bb bake: Do template caching in a background job if possible. Ludovic Chabant <ludovic@chabant.com> parents: 1011 diff changeset	316
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	317 def queueJobs(self, jobs):
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	318 if self._closed:
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	319 if self._error_on_join:
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	320 raise self._error_on_join
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	321 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	322
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	323 jobs = list(jobs)
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	324 new_job_count = len(jobs)
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	325 if new_job_count > 0:
1011 c4cf3cfe2726 bake: Better performance stats, and add callback to preload templates. Ludovic Chabant <ludovic@chabant.com> parents: 1008 diff changeset	326 put_start_time = time.perf_counter()
c4cf3cfe2726 bake: Better performance stats, and add callback to preload templates. Ludovic Chabant <ludovic@chabant.com> parents: 1008 diff changeset	327
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	328 with self._lock_jobs_left:
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	329 self._jobs_left += new_job_count
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	330
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	331 self._event.clear()
989 8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	332 bs = self._batch_size
8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	333 if not bs:
8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	334 for job in jobs:
8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	335 self._quick_put((TASK_JOB, job))
8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	336 else:
8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	337 cur_offset = 0
8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	338 while cur_offset < new_job_count:
8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	339 next_batch_idx = min(cur_offset + bs, new_job_count)
8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	340 job_batch = jobs[cur_offset:next_batch_idx]
8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	341 self._quick_put((TASK_JOB_BATCH, job_batch))
8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	342 cur_offset = next_batch_idx
1011 c4cf3cfe2726 bake: Better performance stats, and add callback to preload templates. Ludovic Chabant <ludovic@chabant.com> parents: 1008 diff changeset	343
c4cf3cfe2726 bake: Better performance stats, and add callback to preload templates. Ludovic Chabant <ludovic@chabant.com> parents: 1008 diff changeset	344 self._time_in_put += (time.perf_counter() - put_start_time)
979 45ad976712ec tests: Big push to get the tests to pass again. Ludovic Chabant <ludovic@chabant.com> parents: 971 diff changeset	345 else:
45ad976712ec tests: Big push to get the tests to pass again. Ludovic Chabant <ludovic@chabant.com> parents: 971 diff changeset	346 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	347 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	348 if done:
45ad976712ec tests: Big push to get the tests to pass again. Ludovic Chabant <ludovic@chabant.com> parents: 971 diff changeset	349 self._event.set()
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	350
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	351 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	352 if self._closed:
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	353 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	354
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	355 ret = self._event.wait(timeout)
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	356 if self._error_on_join:
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	357 raise self._error_on_join
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	358 return ret
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	359
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	360 def close(self):
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	361 if self._closed:
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	362 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	363 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	364 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	365 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	366 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	367
1011 c4cf3cfe2726 bake: Better performance stats, and add callback to preload templates. Ludovic Chabant <ludovic@chabant.com> parents: 1008 diff changeset	368 close_start_time = time.perf_counter()
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	369 logger.debug("Closing worker pool...")
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	370 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	371 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	372 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	373 self._error_callback = handler._handleError
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	374 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	375 self._quick_put((TASK_END, None))
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	376 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	377 w.join()
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	378
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	379 logger.debug("Waiting for reports...")
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	380 if not handler.wait(2):
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	381 missing = handler.reports.index(None)
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	382 logger.warning(
852 4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	383 "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	384 "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	385
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	386 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	387 self._result_queue.put(None)
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	388 self._result_handler.join()
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	389 self._closed = True
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	390
1011 c4cf3cfe2726 bake: Better performance stats, and add callback to preload templates. Ludovic Chabant <ludovic@chabant.com> parents: 1008 diff changeset	391 stats = self._stats
c4cf3cfe2726 bake: Better performance stats, and add callback to preload templates. Ludovic Chabant <ludovic@chabant.com> parents: 1008 diff changeset	392 stats.registerTimer('MasterTaskPut', time=self._time_in_put)
c4cf3cfe2726 bake: Better performance stats, and add callback to preload templates. Ludovic Chabant <ludovic@chabant.com> parents: 1008 diff changeset	393 stats.registerTimer('MasterResultGet', time=self._time_in_get)
c4cf3cfe2726 bake: Better performance stats, and add callback to preload templates. Ludovic Chabant <ludovic@chabant.com> parents: 1008 diff changeset	394 stats.registerTimer('MasterClose',
c4cf3cfe2726 bake: Better performance stats, and add callback to preload templates. Ludovic Chabant <ludovic@chabant.com> parents: 1008 diff changeset	395 time=(time.perf_counter() - close_start_time))
c4cf3cfe2726 bake: Better performance stats, and add callback to preload templates. Ludovic Chabant <ludovic@chabant.com> parents: 1008 diff changeset	396
c4cf3cfe2726 bake: Better performance stats, and add callback to preload templates. Ludovic Chabant <ludovic@chabant.com> parents: 1008 diff changeset	397 return [stats] + handler.reports
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	398
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	399 def _onResultHandlerCriticalError(self, wid):
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	400 logger.error("Result handler received a critical error from "
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	401 "worker %d." % wid)
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	402 with self._lock_workers:
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	403 self._pool[wid] = None
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	404 if all(map(lambda w: w is None, self._pool)):
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	405 logger.error("All workers have died!")
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	406 self._closed = True
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	407 self._error_on_join = Exception("All workers have died!")
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	408 self._event.set()
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	409 return False
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	410
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	411 return True
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	412
1008 09c3d415d9e5 bake: Make `batch-size` option work again. Ludovic Chabant <ludovic@chabant.com> parents: 991 diff changeset	413 def _onTaskDone(self, done_count):
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	414 with self._lock_jobs_left:
1008 09c3d415d9e5 bake: Make `batch-size` option work again. Ludovic Chabant <ludovic@chabant.com> parents: 991 diff changeset	415 left = self._jobs_left - done_count
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	416 self._jobs_left = left
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	417
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	418 if left == 0:
852 4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	419 self._event.set()
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	420
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	421 @staticmethod
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	422 def _handleResults(pool):
854 08e02c2a2a1a core: Keep refactoring, this time to prepare for generator sources. Ludovic Chabant <ludovic@chabant.com> parents: 852 diff changeset	423 userdata = pool.userdata
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	424 while True:
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	425 try:
1011 c4cf3cfe2726 bake: Better performance stats, and add callback to preload templates. Ludovic Chabant <ludovic@chabant.com> parents: 1008 diff changeset	426 get_start_time = time.perf_counter()
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	427 res = pool._quick_get()
1011 c4cf3cfe2726 bake: Better performance stats, and add callback to preload templates. Ludovic Chabant <ludovic@chabant.com> parents: 1008 diff changeset	428 pool._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	429 except (EOFError, OSError):
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	430 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	431 "problem, exiting.")
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	432 return
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	433
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	434 if res is None:
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	435 logger.debug("Result handler exiting.")
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	436 return
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	437
989 8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	438 task_type, wid, res_data_list = res
8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	439 for res_data in res_data_list:
8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	440 try:
8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	441 task_data, data, success = res_data
8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	442 if success:
8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	443 if pool._callback:
8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	444 pool._callback(task_data, data, userdata)
451 838f3964f400 bake: Optimize the bake by not using custom classes for passing info. Ludovic Chabant <ludovic@chabant.com> parents: 447 diff changeset	445 else:
989 8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	446 if task_type == _CRITICAL_WORKER_ERROR:
8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	447 logger.error(data)
8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	448 do_continue = pool._onResultHandlerCriticalError(wid)
8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	449 if not do_continue:
8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	450 logger.debug("Aborting result handling thread.")
8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	451 return
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	452 else:
989 8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	453 if pool._error_callback:
8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	454 pool._error_callback(task_data, data, userdata)
8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	455 else:
8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	456 logger.error(
8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	457 "Worker %d failed to process a job:" % wid)
8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	458 logger.error(data)
8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	459 except Exception as ex:
8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	460 logger.exception(ex)
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	461
1008 09c3d415d9e5 bake: Make `batch-size` option work again. Ludovic Chabant <ludovic@chabant.com> parents: 991 diff changeset	462 if task_type == TASK_JOB or task_type == TASK_JOB_BATCH:
09c3d415d9e5 bake: Make `batch-size` option work again. Ludovic Chabant <ludovic@chabant.com> parents: 991 diff changeset	463 pool._onTaskDone(len(res_data_list))
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	464
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	465
852 4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	466 class _ReportHandler:
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	467 def __init__(self, worker_count):
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	468 self.reports = [None] * worker_count
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	469 self._count = worker_count
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	470 self._received = 0
991 1857dbd4580f bake: Fix bugs introduced by bake optimizations, of course. Ludovic Chabant <ludovic@chabant.com> parents: 989 diff changeset	471 self._lock = threading.Lock()
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	472 self._event = threading.Event()
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	473
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	474 def wait(self, timeout=None):
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	475 return self._event.wait(timeout)
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	476
854 08e02c2a2a1a core: Keep refactoring, this time to prepare for generator sources. Ludovic Chabant <ludovic@chabant.com> parents: 852 diff changeset	477 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	478 wid, data = res
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	479 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	480 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	481 return
aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	482
991 1857dbd4580f bake: Fix bugs introduced by bake optimizations, of course. Ludovic Chabant <ludovic@chabant.com> parents: 989 diff changeset	483 stats = ExecutionStats()
1857dbd4580f bake: Fix bugs introduced by bake optimizations, of course. Ludovic Chabant <ludovic@chabant.com> parents: 989 diff changeset	484 stats.fromData(data)
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	485
991 1857dbd4580f bake: Fix bugs introduced by bake optimizations, of course. Ludovic Chabant <ludovic@chabant.com> parents: 989 diff changeset	486 with self._lock:
1857dbd4580f bake: Fix bugs introduced by bake optimizations, of course. Ludovic Chabant <ludovic@chabant.com> parents: 989 diff changeset	487 self.reports[wid] = stats
1857dbd4580f bake: Fix bugs introduced by bake optimizations, of course. Ludovic Chabant <ludovic@chabant.com> parents: 989 diff changeset	488 self._received += 1
1857dbd4580f bake: Fix bugs introduced by bake optimizations, of course. Ludovic Chabant <ludovic@chabant.com> parents: 989 diff changeset	489 if self._received == self._count:
1857dbd4580f bake: Fix bugs introduced by bake optimizations, of course. Ludovic Chabant <ludovic@chabant.com> parents: 989 diff changeset	490 self._event.set()
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	491
854 08e02c2a2a1a core: Keep refactoring, this time to prepare for generator sources. Ludovic Chabant <ludovic@chabant.com> parents: 852 diff changeset	492 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	493 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	494 logger.error(res)
447 aefe70229fdd bake: Commonize worker pool code between html and asset baking. Ludovic Chabant <ludovic@chabant.com> parents: diff changeset	495
461 b015e38d4ee1 internal: Handle data serialization more under the hood. Ludovic Chabant <ludovic@chabant.com> parents: 460 diff changeset	496
852 4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	497 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	498 def __init__(self):
461 b015e38d4ee1 internal: Handle data serialization more under the hood. Ludovic Chabant <ludovic@chabant.com> parents: 460 diff changeset	499 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	500 self._rlock = multiprocessing.Lock()
b015e38d4ee1 internal: Handle data serialization more under the hood. Ludovic Chabant <ludovic@chabant.com> parents: 460 diff changeset	501 self._wlock = multiprocessing.Lock()
697 9e5393fcfab2 bake: Re-enable faster serialization between processes. Ludovic Chabant <ludovic@chabant.com> parents: 693 diff changeset	502 self._initBuffers()
991 1857dbd4580f bake: Fix bugs introduced by bake optimizations, of course. Ludovic Chabant <ludovic@chabant.com> parents: 989 diff changeset	503 self._initSerializer()
697 9e5393fcfab2 bake: Re-enable faster serialization between processes. Ludovic Chabant <ludovic@chabant.com> parents: 693 diff changeset	504
9e5393fcfab2 bake: Re-enable faster serialization between processes. Ludovic Chabant <ludovic@chabant.com> parents: 693 diff changeset	505 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	506 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	507 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	508 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	509 self._wbuf.truncate(256)
461 b015e38d4ee1 internal: Handle data serialization more under the hood. Ludovic Chabant <ludovic@chabant.com> parents: 460 diff changeset	510
991 1857dbd4580f bake: Fix bugs introduced by bake optimizations, of course. Ludovic Chabant <ludovic@chabant.com> parents: 989 diff changeset	511 def _initSerializer(self):
1857dbd4580f bake: Fix bugs introduced by bake optimizations, of course. Ludovic Chabant <ludovic@chabant.com> parents: 989 diff changeset	512 pass
1857dbd4580f bake: Fix bugs introduced by bake optimizations, of course. Ludovic Chabant <ludovic@chabant.com> parents: 989 diff changeset	513
461 b015e38d4ee1 internal: Handle data serialization more under the hood. Ludovic Chabant <ludovic@chabant.com> parents: 460 diff changeset	514 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	515 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	516
b015e38d4ee1 internal: Handle data serialization more under the hood. Ludovic Chabant <ludovic@chabant.com> parents: 460 diff changeset	517 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	518 (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	519 self._initBuffers()
461 b015e38d4ee1 internal: Handle data serialization more under the hood. Ludovic Chabant <ludovic@chabant.com> parents: 460 diff changeset	520
b015e38d4ee1 internal: Handle data serialization more under the hood. Ludovic Chabant <ludovic@chabant.com> parents: 460 diff changeset	521 def get(self):
b015e38d4ee1 internal: Handle data serialization more under the hood. Ludovic Chabant <ludovic@chabant.com> parents: 460 diff changeset	522 with self._rlock:
991 1857dbd4580f bake: Fix bugs introduced by bake optimizations, of course. Ludovic Chabant <ludovic@chabant.com> parents: 989 diff changeset	523 self._rbuf.seek(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	524 try:
9ae9390192da bake: Use standard pickle and queue for now to fix some small issues. Ludovic Chabant <ludovic@chabant.com> parents: 687 diff changeset	525 with self._rbuf.getbuffer() as b:
697 9e5393fcfab2 bake: Re-enable faster serialization between processes. Ludovic Chabant <ludovic@chabant.com> parents: 693 diff changeset	526 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	527 except multiprocessing.BufferTooShort as e:
697 9e5393fcfab2 bake: Re-enable faster serialization between processes. Ludovic Chabant <ludovic@chabant.com> parents: 693 diff changeset	528 bufsize = len(e.args[0])
9e5393fcfab2 bake: Re-enable faster serialization between processes. Ludovic Chabant <ludovic@chabant.com> parents: 693 diff changeset	529 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	530 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	531 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	532
9ae9390192da bake: Use standard pickle and queue for now to fix some small issues. Ludovic Chabant <ludovic@chabant.com> parents: 687 diff changeset	533 self._rbuf.seek(0)
991 1857dbd4580f bake: Fix bugs introduced by bake optimizations, of course. Ludovic Chabant <ludovic@chabant.com> parents: 989 diff changeset	534 return _unpickle(self, self._rbuf, bufsize)
461 b015e38d4ee1 internal: Handle data serialization more under the hood. Ludovic Chabant <ludovic@chabant.com> parents: 460 diff changeset	535
b015e38d4ee1 internal: Handle data serialization more under the hood. Ludovic Chabant <ludovic@chabant.com> parents: 460 diff changeset	536 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	537 self._wbuf.seek(0)
991 1857dbd4580f bake: Fix bugs introduced by bake optimizations, of course. Ludovic Chabant <ludovic@chabant.com> parents: 989 diff changeset	538 _pickle(self, 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	539 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	540
9ae9390192da bake: Use standard pickle and queue for now to fix some small issues. Ludovic Chabant <ludovic@chabant.com> parents: 687 diff changeset	541 self._wbuf.seek(0)
461 b015e38d4ee1 internal: Handle data serialization more under the hood. Ludovic Chabant <ludovic@chabant.com> parents: 460 diff changeset	542 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	543 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	544 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	545
852 4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	546
991 1857dbd4580f bake: Fix bugs introduced by bake optimizations, of course. Ludovic Chabant <ludovic@chabant.com> parents: 989 diff changeset	547 class _BufferWrapper:
1857dbd4580f bake: Fix bugs introduced by bake optimizations, of course. Ludovic Chabant <ludovic@chabant.com> parents: 989 diff changeset	548 def __init__(self, buf, read_size=0):
1857dbd4580f bake: Fix bugs introduced by bake optimizations, of course. Ludovic Chabant <ludovic@chabant.com> parents: 989 diff changeset	549 self._buf = buf
1857dbd4580f bake: Fix bugs introduced by bake optimizations, of course. Ludovic Chabant <ludovic@chabant.com> parents: 989 diff changeset	550 self._read_size = read_size
1857dbd4580f bake: Fix bugs introduced by bake optimizations, of course. Ludovic Chabant <ludovic@chabant.com> parents: 989 diff changeset	551
1857dbd4580f bake: Fix bugs introduced by bake optimizations, of course. Ludovic Chabant <ludovic@chabant.com> parents: 989 diff changeset	552 def write(self, data):
1857dbd4580f bake: Fix bugs introduced by bake optimizations, of course. Ludovic Chabant <ludovic@chabant.com> parents: 989 diff changeset	553 self._buf.write(data.encode('utf8'))
1857dbd4580f bake: Fix bugs introduced by bake optimizations, of course. Ludovic Chabant <ludovic@chabant.com> parents: 989 diff changeset	554
1857dbd4580f bake: Fix bugs introduced by bake optimizations, of course. Ludovic Chabant <ludovic@chabant.com> parents: 989 diff changeset	555 def read(self):
1857dbd4580f bake: Fix bugs introduced by bake optimizations, of course. Ludovic Chabant <ludovic@chabant.com> parents: 989 diff changeset	556 return self._buf.read(self._read_size).decode('utf8')
1857dbd4580f bake: Fix bugs introduced by bake optimizations, of course. Ludovic Chabant <ludovic@chabant.com> parents: 989 diff changeset	557
1857dbd4580f bake: Fix bugs introduced by bake optimizations, of course. Ludovic Chabant <ludovic@chabant.com> parents: 989 diff changeset	558
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	559 if use_fastpickle:
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	560 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	561
991 1857dbd4580f bake: Fix bugs introduced by bake optimizations, of course. Ludovic Chabant <ludovic@chabant.com> parents: 989 diff changeset	562 def _pickle_fast(queue, obj, buf):
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	563 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	564
991 1857dbd4580f bake: Fix bugs introduced by bake optimizations, of course. Ludovic Chabant <ludovic@chabant.com> parents: 989 diff changeset	565 def _unpickle_fast(queue, buf, bufsize):
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	566 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	567
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	568 _pickle = _pickle_fast
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	569 _unpickle = _unpickle_fast
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	570
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	571 elif use_msgpack:
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	572 import msgpack
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	573
991 1857dbd4580f bake: Fix bugs introduced by bake optimizations, of course. Ludovic Chabant <ludovic@chabant.com> parents: 989 diff changeset	574 def _pickle_msgpack(queue, obj, buf):
1857dbd4580f bake: Fix bugs introduced by bake optimizations, of course. Ludovic Chabant <ludovic@chabant.com> parents: 989 diff changeset	575 buf.write(queue._packer.pack(obj))
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	576
991 1857dbd4580f bake: Fix bugs introduced by bake optimizations, of course. Ludovic Chabant <ludovic@chabant.com> parents: 989 diff changeset	577 def _unpickle_msgpack(queue, buf, bufsize):
1857dbd4580f bake: Fix bugs introduced by bake optimizations, of course. Ludovic Chabant <ludovic@chabant.com> parents: 989 diff changeset	578 queue._unpacker.feed(buf.getbuffer())
1857dbd4580f bake: Fix bugs introduced by bake optimizations, of course. Ludovic Chabant <ludovic@chabant.com> parents: 989 diff changeset	579 for o in queue._unpacker:
1857dbd4580f bake: Fix bugs introduced by bake optimizations, of course. Ludovic Chabant <ludovic@chabant.com> parents: 989 diff changeset	580 return o
1857dbd4580f bake: Fix bugs introduced by bake optimizations, of course. Ludovic Chabant <ludovic@chabant.com> parents: 989 diff changeset	581 # return msgpack.unpack(buf)
1857dbd4580f bake: Fix bugs introduced by bake optimizations, of course. Ludovic Chabant <ludovic@chabant.com> parents: 989 diff changeset	582
1857dbd4580f bake: Fix bugs introduced by bake optimizations, of course. Ludovic Chabant <ludovic@chabant.com> parents: 989 diff changeset	583 def _init_msgpack(queue):
1857dbd4580f bake: Fix bugs introduced by bake optimizations, of course. Ludovic Chabant <ludovic@chabant.com> parents: 989 diff changeset	584 queue._packer = msgpack.Packer()
1857dbd4580f bake: Fix bugs introduced by bake optimizations, of course. Ludovic Chabant <ludovic@chabant.com> parents: 989 diff changeset	585 queue._unpacker = msgpack.Unpacker()
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	586
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	587 _pickle = _pickle_msgpack
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	588 _unpickle = _unpickle_msgpack
991 1857dbd4580f bake: Fix bugs introduced by bake optimizations, of course. Ludovic Chabant <ludovic@chabant.com> parents: 989 diff changeset	589 FastQueue._initSerializer = _init_msgpack
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	590
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	591 elif use_marshall:
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	592 import marshal
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	593
991 1857dbd4580f bake: Fix bugs introduced by bake optimizations, of course. Ludovic Chabant <ludovic@chabant.com> parents: 989 diff changeset	594 def _pickle_marshal(queue, obj, buf):
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	595 marshal.dump(obj, buf)
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	596
991 1857dbd4580f bake: Fix bugs introduced by bake optimizations, of course. Ludovic Chabant <ludovic@chabant.com> parents: 989 diff changeset	597 def _unpickle_marshal(queue, buf, bufsize):
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	598 return marshal.load(buf)
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	599
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	600 _pickle = _pickle_marshal
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	601 _unpickle = _unpickle_marshal
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	602
989 8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	603 elif use_json:
8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	604 import json
8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	605
991 1857dbd4580f bake: Fix bugs introduced by bake optimizations, of course. Ludovic Chabant <ludovic@chabant.com> parents: 989 diff changeset	606 def _pickle_json(queue, obj, buf):
989 8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	607 buf = _BufferWrapper(buf)
8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	608 json.dump(obj, buf, indent=None, separators=(',', ':'))
8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	609
991 1857dbd4580f bake: Fix bugs introduced by bake optimizations, of course. Ludovic Chabant <ludovic@chabant.com> parents: 989 diff changeset	610 def _unpickle_json(queue, buf, bufsize):
1857dbd4580f bake: Fix bugs introduced by bake optimizations, of course. Ludovic Chabant <ludovic@chabant.com> parents: 989 diff changeset	611 buf = _BufferWrapper(buf, bufsize)
989 8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	612 return json.load(buf)
8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	613
8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	614 _pickle = _pickle_json
8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	615 _unpickle = _unpickle_json
8adc27285d93 bake: Big pass on bake performance. Ludovic Chabant <ludovic@chabant.com> parents: 979 diff changeset	616
852 4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	617 else:
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	618 import pickle
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	619
991 1857dbd4580f bake: Fix bugs introduced by bake optimizations, of course. Ludovic Chabant <ludovic@chabant.com> parents: 989 diff changeset	620 def _pickle_default(queue, obj, buf):
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	621 pickle.dump(obj, buf, pickle.HIGHEST_PROTOCOL)
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	622
991 1857dbd4580f bake: Fix bugs introduced by bake optimizations, of course. Ludovic Chabant <ludovic@chabant.com> parents: 989 diff changeset	623 def _unpickle_default(queue, buf, bufsize):
971 5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	624 return pickle.load(buf)
5485a11591ec internal: Worker pool improvements Ludovic Chabant <ludovic@chabant.com> parents: 911 diff changeset	625
852 4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	626 _pickle = _pickle_default
4850f8c21b6e core: Start of the big refactor for PieCrust 3.0. Ludovic Chabant <ludovic@chabant.com> parents: 702 diff changeset	627 _unpickle = _unpickle_default

Mercurial > piecrust2

annotate piecrust/workerpool.py @ 1014:071f30aa04bb