summaryrefslogtreecommitdiffstats
path: root/bitbake/lib
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2013-03-13 21:01:51 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-19 20:58:11 +0000
commit0ff4529c64a2de45a39b692249b7a8b62c5e9277 (patch)
tree77b04b0cb3a114686b97fe511d8ddb6821be3355 /bitbake/lib
parentb844a4292bdf364b3b56796f3b541c1d4a622850 (diff)
downloadpoky-0ff4529c64a2de45a39b692249b7a8b62c5e9277.tar.gz
bitbake: runqueue: Use taskData.fn_index[depdata] instead of uninitialized dep
* dep variable was removed in commit 3190cb83e2af195a464f669c5aa8aedbf795160e Author: Richard Purdie <richard.purdie@linuxfoundation.org> Date: Wed Jun 27 11:04:06 2012 +0100 taskdata: Add gettask_id_fromfnid helper function This is like gettask_id but doesn't require translation of fnid -> fn first which the function then translates back. This gives a sizeable performance improvement since a significant number of lookups are avoided. * now it fails completely instead of showing which task is missing (Bitbake rev: 58847fabd389e5b8d02d5a9c6827aabedb30312f) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
-rw-r--r--bitbake/lib/bb/runqueue.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
index 1bbe7911cd..872bb784d3 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -472,7 +472,7 @@ class RunQueueData:
472 if depdata is not None: 472 if depdata is not None:
473 taskid = taskData.gettask_id_fromfnid(depdata, idependtask) 473 taskid = taskData.gettask_id_fromfnid(depdata, idependtask)
474 if taskid is None: 474 if taskid is None:
475 bb.msg.fatal("RunQueue", "Task %s in %s depends upon non-existent task %s in %s" % (taskData.tasks_name[task], fn, idependtask, dep)) 475 bb.msg.fatal("RunQueue", "Task %s in %s depends upon non-existent task %s in %s" % (taskData.tasks_name[task], fn, idependtask, taskData.fn_index[depdata]))
476 depends.add(taskid) 476 depends.add(taskid)
477 irdepends = taskData.tasks_irdepends[task] 477 irdepends = taskData.tasks_irdepends[task]
478 for (depid, idependtask) in irdepends: 478 for (depid, idependtask) in irdepends:
@@ -482,7 +482,7 @@ class RunQueueData:
482 if depdata is not None: 482 if depdata is not None:
483 taskid = taskData.gettask_id_fromfnid(depdata, idependtask) 483 taskid = taskData.gettask_id_fromfnid(depdata, idependtask)
484 if taskid is None: 484 if taskid is None:
485 bb.msg.fatal("RunQueue", "Task %s in %s rdepends upon non-existent task %s in %s" % (taskData.tasks_name[task], fn, idependtask, dep)) 485 bb.msg.fatal("RunQueue", "Task %s in %s rdepends upon non-existent task %s in %s" % (taskData.tasks_name[task], fn, idependtask, taskData.fn_index[depdata]))
486 depends.add(taskid) 486 depends.add(taskid)
487 487
488 # Resolve recursive 'recrdeptask' dependencies (Part A) 488 # Resolve recursive 'recrdeptask' dependencies (Part A)