diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-07-03 18:34:07 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-07-15 10:28:12 +0100 |
commit | fb8fc5e78c475e217655a05add516c2520d17a4e (patch) | |
tree | 109da1d36f254df247299ab31b540dd06b21d459 /bitbake/lib | |
parent | 97fda91810a062a36e419b4d3993a4a36f90f7b9 (diff) | |
download | poky-fb8fc5e78c475e217655a05add516c2520d17a4e.tar.gz |
bitbake: event/runqueue: Drop StampUpdate event, its pointless/unused
Whilst this class has existed for years, it doesn't have any
users and has a questionable interface. Drop it to allow for further
simplification and changes.
(Bitbake rev: 3ab51764f7965d696bb2c5a872bf161473df4289)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
-rw-r--r-- | bitbake/lib/bb/event.py | 17 | ||||
-rw-r--r-- | bitbake/lib/bb/runqueue.py | 9 | ||||
-rw-r--r-- | bitbake/lib/bb/tests/event.py | 8 | ||||
-rw-r--r-- | bitbake/lib/bb/ui/knotty.py | 1 |
4 files changed, 0 insertions, 35 deletions
diff --git a/bitbake/lib/bb/event.py b/bitbake/lib/bb/event.py index 248fc1a6f8..d44621edf4 100644 --- a/bitbake/lib/bb/event.py +++ b/bitbake/lib/bb/event.py | |||
@@ -404,23 +404,6 @@ class RecipeTaskPreProcess(RecipeEvent): | |||
404 | class RecipeParsed(RecipeEvent): | 404 | class RecipeParsed(RecipeEvent): |
405 | """ Recipe Parsing Complete """ | 405 | """ Recipe Parsing Complete """ |
406 | 406 | ||
407 | class StampUpdate(Event): | ||
408 | """Trigger for any adjustment of the stamp files to happen""" | ||
409 | |||
410 | def __init__(self, targets, stampfns): | ||
411 | self._targets = targets | ||
412 | self._stampfns = stampfns | ||
413 | Event.__init__(self) | ||
414 | |||
415 | def getStampPrefix(self): | ||
416 | return self._stampfns | ||
417 | |||
418 | def getTargets(self): | ||
419 | return self._targets | ||
420 | |||
421 | stampPrefix = property(getStampPrefix) | ||
422 | targets = property(getTargets) | ||
423 | |||
424 | class BuildBase(Event): | 407 | class BuildBase(Event): |
425 | """Base class for bitbake build events""" | 408 | """Base class for bitbake build events""" |
426 | 409 | ||
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index e1cb1409bf..3cf8aed06f 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py | |||
@@ -2539,17 +2539,8 @@ def start_runqueue_tasks(rqexec): | |||
2539 | for task in self.rq.scenequeue_notcovered: | 2539 | for task in self.rq.scenequeue_notcovered: |
2540 | logger.debug(1, 'Not skipping task %s', task) | 2540 | logger.debug(1, 'Not skipping task %s', task) |
2541 | 2541 | ||
2542 | for mc in rqexec.rqdata.dataCaches: | ||
2543 | target_pairs = [] | ||
2544 | for tid in rqexec.rqdata.target_tids: | ||
2545 | (tidmc, fn, taskname, _) = split_tid_mcfn(tid) | ||
2546 | if tidmc == mc: | ||
2547 | target_pairs.append((fn, taskname)) | ||
2548 | |||
2549 | event.fire(bb.event.StampUpdate(target_pairs, rqexec.rqdata.dataCaches[mc].stamp), rqexec.cfgData) | ||
2550 | rqexec.sched.initbuildable() | 2542 | rqexec.sched.initbuildable() |
2551 | 2543 | ||
2552 | |||
2553 | class TaskFailure(Exception): | 2544 | class TaskFailure(Exception): |
2554 | """ | 2545 | """ |
2555 | Exception raised when a task in a runqueue fails | 2546 | Exception raised when a task in a runqueue fails |
diff --git a/bitbake/lib/bb/tests/event.py b/bitbake/lib/bb/tests/event.py index b6e40c6ae9..9229b63d47 100644 --- a/bitbake/lib/bb/tests/event.py +++ b/bitbake/lib/bb/tests/event.py | |||
@@ -561,14 +561,6 @@ class EventClassesTest(unittest.TestCase): | |||
561 | self.assertEqual(event.fn(1), callback(1)) | 561 | self.assertEqual(event.fn(1), callback(1)) |
562 | self.assertEqual(event.pid, EventClassesTest._worker_pid) | 562 | self.assertEqual(event.pid, EventClassesTest._worker_pid) |
563 | 563 | ||
564 | def test_StampUpdate(self): | ||
565 | targets = ["foo", "bar"] | ||
566 | stampfns = [lambda:"foobar"] | ||
567 | event = bb.event.StampUpdate(targets, stampfns) | ||
568 | self.assertEqual(event.targets, targets) | ||
569 | self.assertEqual(event.stampPrefix, stampfns) | ||
570 | self.assertEqual(event.pid, EventClassesTest._worker_pid) | ||
571 | |||
572 | def test_BuildBase(self): | 564 | def test_BuildBase(self): |
573 | """ Test base class for bitbake build events """ | 565 | """ Test base class for bitbake build events """ |
574 | name = "foo" | 566 | name = "foo" |
diff --git a/bitbake/lib/bb/ui/knotty.py b/bitbake/lib/bb/ui/knotty.py index 88f638fb38..1c72aa2947 100644 --- a/bitbake/lib/bb/ui/knotty.py +++ b/bitbake/lib/bb/ui/knotty.py | |||
@@ -660,7 +660,6 @@ def main(server, eventHandler, params, tf = TerminalFilter): | |||
660 | # ignore | 660 | # ignore |
661 | if isinstance(event, (bb.event.BuildBase, | 661 | if isinstance(event, (bb.event.BuildBase, |
662 | bb.event.MetadataEvent, | 662 | bb.event.MetadataEvent, |
663 | bb.event.StampUpdate, | ||
664 | bb.event.ConfigParsed, | 663 | bb.event.ConfigParsed, |
665 | bb.event.MultiConfigParsed, | 664 | bb.event.MultiConfigParsed, |
666 | bb.event.RecipeParsed, | 665 | bb.event.RecipeParsed, |