All of lore.kernel.org
 help / color / mirror / Atom feed
From: Richard Purdie <richard.purdie@linuxfoundation.org>
To: bitbake-devel@lists.openembedded.org
Subject: [PATCH 02/26] runqueue: Drop unused BB_SETSCENE_VERIFY_FUNCTION2
Date: Thu, 11 Jul 2019 00:53:56 +0100	[thread overview]
Message-ID: <20190710235420.23825-2-richard.purdie@linuxfoundation.org> (raw)
In-Reply-To: <20190710235420.23825-1-richard.purdie@linuxfoundation.org>

Nothing in OE-Core uses this and hasn't since 2017. It wasn't needed by core
metadata since the switch to recipe specific sysroots.

Since this function would be hard to implement with the planned changes to
runqueue, drop it which allows simplification and further code cleanup.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 lib/bb/runqueue.py | 33 +++------------------------------
 1 file changed, 3 insertions(+), 30 deletions(-)

diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py
index b19b524e77..19af73cb3c 100644
--- a/lib/bb/runqueue.py
+++ b/lib/bb/runqueue.py
@@ -1194,7 +1194,6 @@ class RunQueue:
 
         self.stamppolicy = cfgData.getVar("BB_STAMP_POLICY") or "perfile"
         self.hashvalidate = cfgData.getVar("BB_HASHCHECK_FUNCTION") or None
-        self.setsceneverify = cfgData.getVar("BB_SETSCENE_VERIFY_FUNCTION2") or None
         self.depvalidate = cfgData.getVar("BB_SETSCENE_DEPVALID") or None
 
         self.state = runQueuePrepare
@@ -1819,32 +1818,7 @@ class RunQueueExecuteTasks(RunQueueExecute):
                     found = True
                     self.rq.scenequeue_covered.add(tid)
 
-        logger.debug(1, 'Skip list (pre setsceneverify) %s', sorted(self.rq.scenequeue_covered))
-
-        # Allow the metadata to elect for setscene tasks to run anyway
-        covered_remove = set()
-        if self.rq.setsceneverify:
-            invalidtasks = []
-            tasknames = {}
-            fns = {}
-            for tid in self.rqdata.runtaskentries:
-                (mc, fn, taskname, taskfn) = split_tid_mcfn(tid)
-                taskdep = self.rqdata.dataCaches[mc].task_deps[taskfn]
-                fns[tid] = taskfn
-                tasknames[tid] = taskname
-                if 'noexec' in taskdep and taskname in taskdep['noexec']:
-                    continue
-                if self.rq.check_stamp_task(tid, taskname + "_setscene", cache=self.stampcache):
-                    logger.debug(2, 'Setscene stamp current for task %s', tid)
-                    continue
-                if self.rq.check_stamp_task(tid, taskname, recurse = True, cache=self.stampcache):
-                    logger.debug(2, 'Normal stamp current for task %s', tid)
-                    continue
-                invalidtasks.append(tid)
-
-            call = self.rq.setsceneverify + "(covered, tasknames, fns, d, invalidtasks=invalidtasks)"
-            locs = { "covered" : self.rq.scenequeue_covered, "tasknames" : tasknames, "fns" : fns, "d" : self.cooker.data, "invalidtasks" : invalidtasks }
-            covered_remove = bb.utils.better_eval(call, locs)
+        logger.debug(1, 'Skip list %s', sorted(self.rq.scenequeue_covered))
 
         def removecoveredtask(tid):
             (mc, fn, taskname, taskfn) = split_tid_mcfn(tid)
@@ -1852,9 +1826,9 @@ class RunQueueExecuteTasks(RunQueueExecute):
             bb.build.del_stamp(taskname, self.rqdata.dataCaches[mc], taskfn)
             self.rq.scenequeue_covered.remove(tid)
 
-        toremove = covered_remove | self.rq.scenequeue_notcovered
+        toremove = self.rq.scenequeue_notcovered
         for task in toremove:
-            logger.debug(1, 'Not skipping task %s due to setsceneverify', task)
+            logger.debug(1, 'Not skipping task %s', task)
         while toremove:
             covered_remove = []
             for task in toremove:
@@ -1871,7 +1845,6 @@ class RunQueueExecuteTasks(RunQueueExecute):
 
         logger.debug(1, 'Full skip list %s', self.rq.scenequeue_covered)
 
-
         for mc in self.rqdata.dataCaches:
             target_pairs = []
             for tid in self.rqdata.target_tids:
-- 
2.20.1



  reply	other threads:[~2019-07-10 23:54 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-07-10 23:53 [PATCH 01/26] runqueue: Tweak buildable variable handling in scheduler Richard Purdie
2019-07-10 23:53 ` Richard Purdie [this message]
2019-07-10 23:53 ` [PATCH 03/26] runqueue: Remove now uneeded code Richard Purdie
2019-07-10 23:53 ` [PATCH 04/26] runqueue: Move scenequeue data generation to a separate function Richard Purdie
2019-07-10 23:53 ` [PATCH 05/26] runqueue: Remove unused function parameter Richard Purdie
2019-07-10 23:54 ` [PATCH 06/26] runqueue: Factor out the process_setscene_whitelist checks Richard Purdie
2019-07-10 23:54 ` [PATCH 07/26] runqueue: Uniquely namespace the scenequeue functions Richard Purdie
2019-07-10 23:54 ` [PATCH 08/26] runqueue: Merge stats handling together for setscene/real tasks Richard Purdie
2019-07-10 23:54 ` [PATCH 09/26] runqueue: Merge scenequeue and real task queue code together Richard Purdie
2019-07-10 23:54 ` [PATCH 10/26] runqueue: Fix counter/task updating glitch Richard Purdie
2019-07-10 23:54 ` [PATCH 11/26] runqueue: Remove RunQueueExecuteScenequeue and RunQueueExecuteTasks Richard Purdie
2019-07-10 23:54 ` [PATCH 12/26] runqueue: Simplify _execute_runqueue logic Richard Purdie
2019-07-10 23:54 ` [PATCH 13/26] runqueue: Fold remains of the scenequeue setup into RunQueueExecute Richard Purdie
2019-07-10 23:54 ` [PATCH 14/26] event/runqueue: Drop StampUpdate event, its pointless/unused Richard Purdie
2019-07-10 23:54 ` [PATCH 15/26] runqueue: Add covered_tasks (or 'collated_deps') to scenequeue data Richard Purdie
2019-07-10 23:54 ` [PATCH 16/26] runqueue: Simplify scenequeue unskippable calculation Richard Purdie
2019-07-10 23:54 ` [PATCH 17/26] runqueue: Tweak comments and debug code Richard Purdie
2019-07-10 23:54 ` [PATCH 18/26] runqueue: Code simplification Richard Purdie
2019-07-10 23:54 ` [PATCH 19/26] runqueue: Remove pointless variable Richard Purdie
2019-07-10 23:54 ` [PATCH 20/26] runqueue: Further scheduler buildable tasks cleanup Richard Purdie
2019-07-10 23:54 ` [PATCH 21/26] runqueue: Clarify scenequeue_covered vs. tasks_covered Richard Purdie
2019-07-10 23:54 ` [PATCH 22/26] runqueue: Merge the queues and execute setscene and normal tasks in parallel Richard Purdie
2019-07-10 23:54 ` [PATCH 23/26] runqueue: Alter setscenewhitelist handling Richard Purdie
2019-07-10 23:54 ` [PATCH 24/26] runqueue: Complete the merge of scenequeue and normal task execution Richard Purdie
2019-07-10 23:54 ` [PATCH 25/26] siggen: Fix default handler Richard Purdie
2019-07-10 23:54 ` [PATCH 26/26] tests: Add initial scenario based test for runqueue Richard Purdie
2019-07-11  0:05 ` [PATCH 00/26] runqueue changes Richard Purdie
     [not found]   ` <63270c2a-f78a-65e1-16c0-8ce271d4dd8e@mikrodidakt.se>
2019-07-11 11:33     ` richard.purdie
2019-07-11 16:21   ` Richard Purdie
2019-07-12  0:57     ` Khem Raj
2019-07-12  8:13       ` richard.purdie

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190710235420.23825-2-richard.purdie@linuxfoundation.org \
    --to=richard.purdie@linuxfoundation.org \
    --cc=bitbake-devel@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.