diff options
author | Bogdan Marinescu <bogdan.a.marinescu@intel.com> | 2013-05-31 14:19:14 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-06-14 12:52:58 +0100 |
commit | 5aa5fc470ef20a3eda761d7dd8899732cb799ca4 (patch) | |
tree | 14a59dd1e48548477dab05f6852b6bac713fc8ee /bitbake/lib/bb/event.py | |
parent | 542d6a87db0bab1210f2b5b51c0becdafe4d1b83 (diff) | |
download | poky-5aa5fc470ef20a3eda761d7dd8899732cb799ca4.tar.gz |
bitbake: bitbake: Add event mask flag support
Add a flag to event handlers which lists the events a given handler wishes to
process. By default event handlers recieve all events but this means
we can stop running code in many cases if we know it doesn't want the event.
This is part of the fix for YOCTO #3812, but implements filtering only
for class event handlers; the other part (events filter for UIs) will be
the subject of a different patch.
(Bitbake rev: 074003a4e7530a72863b9c685fc5c31b0f08c039)
Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/event.py')
-rw-r--r-- | bitbake/lib/bb/event.py | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/bitbake/lib/bb/event.py b/bitbake/lib/bb/event.py index d73067fcf9..9c134eed0d 100644 --- a/bitbake/lib/bb/event.py +++ b/bitbake/lib/bb/event.py | |||
@@ -64,6 +64,8 @@ def clean_class_handlers(): | |||
64 | _handlers = clean_class_handlers() | 64 | _handlers = clean_class_handlers() |
65 | _ui_handlers = {} | 65 | _ui_handlers = {} |
66 | _ui_handler_seq = 0 | 66 | _ui_handler_seq = 0 |
67 | _event_handler_map = {} | ||
68 | _catchall_handlers = {} | ||
67 | 69 | ||
68 | def execute_handler(name, handler, event, d): | 70 | def execute_handler(name, handler, event, d): |
69 | event.data = d | 71 | event.data = d |
@@ -87,11 +89,14 @@ def fire_class_handlers(event, d): | |||
87 | if isinstance(event, logging.LogRecord): | 89 | if isinstance(event, logging.LogRecord): |
88 | return | 90 | return |
89 | 91 | ||
92 | eid = str(event.__class__)[8:-2] | ||
93 | evt_hmap = _event_handler_map.get(eid, {}) | ||
90 | for name, handler in _handlers.iteritems(): | 94 | for name, handler in _handlers.iteritems(): |
91 | try: | 95 | if name in _catchall_handlers or name in evt_hmap: |
92 | execute_handler(name, handler, event, d) | 96 | try: |
93 | except Exception: | 97 | execute_handler(name, handler, event, d) |
94 | continue | 98 | except Exception: |
99 | continue | ||
95 | 100 | ||
96 | ui_queue = [] | 101 | ui_queue = [] |
97 | @atexit.register | 102 | @atexit.register |
@@ -160,7 +165,7 @@ def fire_from_worker(event, d): | |||
160 | fire_ui_handlers(event, d) | 165 | fire_ui_handlers(event, d) |
161 | 166 | ||
162 | noop = lambda _: None | 167 | noop = lambda _: None |
163 | def register(name, handler): | 168 | def register(name, handler, mask=[]): |
164 | """Register an Event handler""" | 169 | """Register an Event handler""" |
165 | 170 | ||
166 | # already registered | 171 | # already registered |
@@ -185,6 +190,14 @@ def register(name, handler): | |||
185 | else: | 190 | else: |
186 | _handlers[name] = handler | 191 | _handlers[name] = handler |
187 | 192 | ||
193 | if not mask: | ||
194 | _catchall_handlers[name] = True | ||
195 | else: | ||
196 | for m in mask: | ||
197 | if _event_handler_map.get(m, None) is None: | ||
198 | _event_handler_map[m] = {} | ||
199 | _event_handler_map[m][name] = True | ||
200 | |||
188 | return Registered | 201 | return Registered |
189 | 202 | ||
190 | def remove(name, handler): | 203 | def remove(name, handler): |