From fb8fc5e78c475e217655a05add516c2520d17a4e Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 3 Jul 2019 18:34:07 +0100 Subject: 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 --- bitbake/lib/bb/event.py | 17 ----------------- bitbake/lib/bb/runqueue.py | 9 --------- bitbake/lib/bb/tests/event.py | 8 -------- bitbake/lib/bb/ui/knotty.py | 1 - 4 files changed, 35 deletions(-) (limited to 'bitbake/lib') 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): class RecipeParsed(RecipeEvent): """ Recipe Parsing Complete """ -class StampUpdate(Event): - """Trigger for any adjustment of the stamp files to happen""" - - def __init__(self, targets, stampfns): - self._targets = targets - self._stampfns = stampfns - Event.__init__(self) - - def getStampPrefix(self): - return self._stampfns - - def getTargets(self): - return self._targets - - stampPrefix = property(getStampPrefix) - targets = property(getTargets) - class BuildBase(Event): """Base class for bitbake build events""" 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): for task in self.rq.scenequeue_notcovered: logger.debug(1, 'Not skipping task %s', task) - for mc in rqexec.rqdata.dataCaches: - target_pairs = [] - for tid in rqexec.rqdata.target_tids: - (tidmc, fn, taskname, _) = split_tid_mcfn(tid) - if tidmc == mc: - target_pairs.append((fn, taskname)) - - event.fire(bb.event.StampUpdate(target_pairs, rqexec.rqdata.dataCaches[mc].stamp), rqexec.cfgData) rqexec.sched.initbuildable() - class TaskFailure(Exception): """ 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): self.assertEqual(event.fn(1), callback(1)) self.assertEqual(event.pid, EventClassesTest._worker_pid) - def test_StampUpdate(self): - targets = ["foo", "bar"] - stampfns = [lambda:"foobar"] - event = bb.event.StampUpdate(targets, stampfns) - self.assertEqual(event.targets, targets) - self.assertEqual(event.stampPrefix, stampfns) - self.assertEqual(event.pid, EventClassesTest._worker_pid) - def test_BuildBase(self): """ Test base class for bitbake build events """ 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): # ignore if isinstance(event, (bb.event.BuildBase, bb.event.MetadataEvent, - bb.event.StampUpdate, bb.event.ConfigParsed, bb.event.MultiConfigParsed, bb.event.RecipeParsed, -- cgit v1.2.3-54-g00ecf