* [PATCH v2 1/6] toasterui: reformat list of events
2016-02-25 15:10 [PATCH v2 0/6] Make toasterui to work in build mode Ed Bartosh
@ 2016-02-25 15:10 ` Ed Bartosh
2016-02-25 15:10 ` [PATCH v2 2/6] toasterui: update " Ed Bartosh
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Ed Bartosh @ 2016-02-25 15:10 UTC (permalink / raw)
To: toaster
Reformatted and reordered list of events to make changes
easily and see them clearly in the diffs.
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
---
bitbake/lib/bb/ui/toasterui.py | 36 +++++++++++++++++++++++++++---------
1 file changed, 27 insertions(+), 9 deletions(-)
diff --git a/bitbake/lib/bb/ui/toasterui.py b/bitbake/lib/bb/ui/toasterui.py
index 32b1889..377526e 100644
--- a/bitbake/lib/bb/ui/toasterui.py
+++ b/bitbake/lib/bb/ui/toasterui.py
@@ -92,15 +92,33 @@ def _close_build_log(build_log):
build_log.close()
logger.removeHandler(build_log)
-_evt_list = [ "bb.runqueue.runQueueExitWait", "bb.event.LogExecTTY", "logging.LogRecord",
- "bb.build.TaskFailed", "bb.build.TaskBase", "bb.event.ParseStarted",
- "bb.event.ParseProgress", "bb.event.ParseCompleted", "bb.event.CacheLoadStarted",
- "bb.event.CacheLoadProgress", "bb.event.CacheLoadCompleted", "bb.command.CommandFailed",
- "bb.command.CommandExit", "bb.command.CommandCompleted", "bb.cooker.CookerExit",
- "bb.event.MultipleProviders", "bb.event.NoProvider", "bb.runqueue.sceneQueueTaskStarted",
- "bb.runqueue.runQueueTaskStarted", "bb.runqueue.runQueueTaskFailed", "bb.runqueue.sceneQueueTaskFailed",
- "bb.event.BuildBase", "bb.build.TaskStarted", "bb.build.TaskSucceeded", "bb.build.TaskFailedSilent",
- "bb.event.MetadataEvent"]
+_evt_list = [
+ "bb.build.TaskBase",
+ "bb.build.TaskFailed",
+ "bb.build.TaskFailedSilent",
+ "bb.build.TaskStarted",
+ "bb.build.TaskSucceeded",
+ "bb.command.CommandCompleted",
+ "bb.command.CommandExit",
+ "bb.command.CommandFailed",
+ "bb.cooker.CookerExit",
+ "bb.event.BuildBase",
+ "bb.event.CacheLoadCompleted",
+ "bb.event.CacheLoadProgress",
+ "bb.event.CacheLoadStarted",
+ "bb.event.LogExecTTY",
+ "bb.event.MetadataEvent",
+ "bb.event.MultipleProviders",
+ "bb.event.NoProvider",
+ "bb.event.ParseCompleted",
+ "bb.event.ParseProgress",
+ "bb.event.ParseStarted",
+ "bb.runqueue.runQueueExitWait",
+ "bb.runqueue.runQueueTaskFailed",
+ "bb.runqueue.runQueueTaskStarted",
+ "bb.runqueue.sceneQueueTaskFailed",
+ "bb.runqueue.sceneQueueTaskStarted",
+ "logging.LogRecord"]
def main(server, eventHandler, params):
# set to a logging.FileHandler instance when a build starts;
--
2.1.4
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH v2 2/6] toasterui: update list of events
2016-02-25 15:10 [PATCH v2 0/6] Make toasterui to work in build mode Ed Bartosh
2016-02-25 15:10 ` [PATCH v2 1/6] toasterui: reformat list of events Ed Bartosh
@ 2016-02-25 15:10 ` Ed Bartosh
2016-02-25 15:10 ` [PATCH v2 3/6] command: make setEventMask readonly Ed Bartosh
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Ed Bartosh @ 2016-02-25 15:10 UTC (permalink / raw)
To: toaster
Removed events not used in the code from the list.
Added events that are used in the code.
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
---
bitbake/lib/bb/ui/toasterui.py | 27 ++++++++++++---------------
1 file changed, 12 insertions(+), 15 deletions(-)
diff --git a/bitbake/lib/bb/ui/toasterui.py b/bitbake/lib/bb/ui/toasterui.py
index 377526e..4bb33f1 100644
--- a/bitbake/lib/bb/ui/toasterui.py
+++ b/bitbake/lib/bb/ui/toasterui.py
@@ -102,10 +102,13 @@ _evt_list = [
"bb.command.CommandExit",
"bb.command.CommandFailed",
"bb.cooker.CookerExit",
- "bb.event.BuildBase",
+ "bb.event.BuildCompleted",
+ "bb.event.BuildStarted",
"bb.event.CacheLoadCompleted",
"bb.event.CacheLoadProgress",
"bb.event.CacheLoadStarted",
+ "bb.event.ConfigParsed",
+ "bb.event.DepTreeGenerated",
"bb.event.LogExecTTY",
"bb.event.MetadataEvent",
"bb.event.MultipleProviders",
@@ -113,9 +116,16 @@ _evt_list = [
"bb.event.ParseCompleted",
"bb.event.ParseProgress",
"bb.event.ParseStarted",
- "bb.runqueue.runQueueExitWait",
+ "bb.event.RecipeParsed",
+ "bb.event.SanityCheck",
+ "bb.event.SanityCheckPassed",
+ "bb.event.TreeDataPreparationCompleted",
+ "bb.event.TreeDataPreparationStarted",
+ "bb.runqueue.runQueueTaskCompleted",
"bb.runqueue.runQueueTaskFailed",
+ "bb.runqueue.runQueueTaskSkipped",
"bb.runqueue.runQueueTaskStarted",
+ "bb.runqueue.sceneQueueTaskCompleted",
"bb.runqueue.sceneQueueTaskFailed",
"bb.runqueue.sceneQueueTaskStarted",
"logging.LogRecord"]
@@ -395,19 +405,6 @@ def main(server, eventHandler, params):
main.shutdown = 1
continue
- # ignore
- if isinstance(event, (bb.event.BuildBase,
- bb.event.StampUpdate,
- bb.event.RecipePreFinalise,
- bb.runqueue.runQueueEvent,
- bb.runqueue.runQueueExitWait,
- bb.event.OperationProgress,
- bb.command.CommandFailed,
- bb.command.CommandExit,
- bb.command.CommandCompleted,
- bb.event.ReachableStamps)):
- continue
-
if isinstance(event, bb.event.DepTreeGenerated):
buildinfohelper.store_dependency_information(event)
continue
--
2.1.4
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH v2 3/6] command: make setEventMask readonly
2016-02-25 15:10 [PATCH v2 0/6] Make toasterui to work in build mode Ed Bartosh
2016-02-25 15:10 ` [PATCH v2 1/6] toasterui: reformat list of events Ed Bartosh
2016-02-25 15:10 ` [PATCH v2 2/6] toasterui: update " Ed Bartosh
@ 2016-02-25 15:10 ` Ed Bartosh
2016-02-25 15:10 ` [PATCH v2 4/6] toasterui: check if setEventMask succeeded Ed Bartosh
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Ed Bartosh @ 2016-02-25 15:10 UTC (permalink / raw)
To: toaster
Executing setEventMask command when bitbake server is in readonly
mode causes runCommand to fail with the following error:
'Not able to execute not readonly commands in readonly mode'
Set readonly attribute for setEventMask command to make it working
for Toaster UI. This should not do any harm as this command doesn't
influence cooker state.
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
---
bitbake/lib/bb/command.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/bitbake/lib/bb/command.py b/bitbake/lib/bb/command.py
index 74106d1..0559ffc 100644
--- a/bitbake/lib/bb/command.py
+++ b/bitbake/lib/bb/command.py
@@ -279,6 +279,7 @@ class CommandsSync:
mask = params[3]
return bb.event.set_UIHmask(handlerNum, llevel, debug_domains, mask)
setEventMask.needconfig = False
+ setEventMask.readonly = True
def setFeatures(self, command, params):
"""
--
2.1.4
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH v2 4/6] toasterui: check if setEventMask succeeded
2016-02-25 15:10 [PATCH v2 0/6] Make toasterui to work in build mode Ed Bartosh
` (2 preceding siblings ...)
2016-02-25 15:10 ` [PATCH v2 3/6] command: make setEventMask readonly Ed Bartosh
@ 2016-02-25 15:10 ` Ed Bartosh
2016-02-25 15:10 ` [PATCH v2 5/6] toasterui: make toasterui to work in build mode Ed Bartosh
2016-02-25 15:10 ` [PATCH v2 6/6] toasterui: exit on final events Ed Bartosh
5 siblings, 0 replies; 7+ messages in thread
From: Ed Bartosh @ 2016-02-25 15:10 UTC (permalink / raw)
To: toaster
Currently toasterui ignores return value of setEventMask
command, which created confusing difference between set of
events set by this command and the real set used in the code.
Checked if setEventMask succeeded. Print error message and
exit if it's not.
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
---
bitbake/lib/bb/ui/toasterui.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/bitbake/lib/bb/ui/toasterui.py b/bitbake/lib/bb/ui/toasterui.py
index 4bb33f1..fec6962 100644
--- a/bitbake/lib/bb/ui/toasterui.py
+++ b/bitbake/lib/bb/ui/toasterui.py
@@ -154,8 +154,10 @@ def main(server, eventHandler, params):
logger.addHandler(console)
logger.setLevel(logging.INFO)
llevel, debug_domains = bb.msg.constructLogOptions()
- server.runCommand(["setEventMask", server.getEventHandle(), llevel, debug_domains, _evt_list])
-
+ result, error = server.runCommand(["setEventMask", server.getEventHandle(), llevel, debug_domains, _evt_list])
+ if not result or error:
+ logger.error("can't set event mask: %s", error)
+ return 1
# verify and warn
build_history_enabled = True
--
2.1.4
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH v2 5/6] toasterui: make toasterui to work in build mode
2016-02-25 15:10 [PATCH v2 0/6] Make toasterui to work in build mode Ed Bartosh
` (3 preceding siblings ...)
2016-02-25 15:10 ` [PATCH v2 4/6] toasterui: check if setEventMask succeeded Ed Bartosh
@ 2016-02-25 15:10 ` Ed Bartosh
2016-02-25 15:10 ` [PATCH v2 6/6] toasterui: exit on final events Ed Bartosh
5 siblings, 0 replies; 7+ messages in thread
From: Ed Bartosh @ 2016-02-25 15:10 UTC (permalink / raw)
To: toaster
Currently toasterui works only in observer mode. This is
artificial limitation which was made to support current toaster
design. As we decided to stop using bitbake server we'll
need to run toasterui also in build mode.
[YOCTO #7880]
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
---
bitbake/lib/bb/ui/toasterui.py | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/bitbake/lib/bb/ui/toasterui.py b/bitbake/lib/bb/ui/toasterui.py
index fec6962..2d44377 100644
--- a/bitbake/lib/bb/ui/toasterui.py
+++ b/bitbake/lib/bb/ui/toasterui.py
@@ -168,8 +168,23 @@ def main(server, eventHandler, params):
build_history_enabled = False
if not params.observe_only:
- logger.error("ToasterUI can only work in observer mode")
- return 1
+ params.updateFromServer(server)
+ params.updateToServer(server, os.environ.copy())
+ cmdline = params.parseActions()
+ if not cmdline:
+ print("Nothing to do. Use 'bitbake world' to build everything, or run 'bitbake --help' for usage information.")
+ return 1
+ if 'msg' in cmdline and cmdline['msg']:
+ logger.error(cmdline['msg'])
+ return 1
+
+ ret, error = server.runCommand(cmdline['action'])
+ if error:
+ logger.error("Command '%s' failed: %s" % (cmdline, error))
+ return 1
+ elif ret != True:
+ logger.error("Command '%s' failed: returned %s" % (cmdline, ret))
+ return 1
# set to 1 when toasterui needs to shut down
main.shutdown = 0
--
2.1.4
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH v2 6/6] toasterui: exit on final events
2016-02-25 15:10 [PATCH v2 0/6] Make toasterui to work in build mode Ed Bartosh
` (4 preceding siblings ...)
2016-02-25 15:10 ` [PATCH v2 5/6] toasterui: make toasterui to work in build mode Ed Bartosh
@ 2016-02-25 15:10 ` Ed Bartosh
5 siblings, 0 replies; 7+ messages in thread
From: Ed Bartosh @ 2016-02-25 15:10 UTC (permalink / raw)
To: toaster
Toasterui exits only if bitbake observer shuts down.
In build mode it should exit when build is done.
Made toasterui exit on bb.command.CommandCompleted,
bb.command.CommandFailed and bb.command.CommandExit events
when it's running in build mode.
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
---
bitbake/lib/bb/ui/toasterui.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/bitbake/lib/bb/ui/toasterui.py b/bitbake/lib/bb/ui/toasterui.py
index 2d44377..728803d 100644
--- a/bitbake/lib/bb/ui/toasterui.py
+++ b/bitbake/lib/bb/ui/toasterui.py
@@ -388,7 +388,10 @@ def main(server, eventHandler, params):
if isinstance(event, (bb.command.CommandCompleted,
bb.command.CommandFailed,
bb.command.CommandExit)):
- errorcode = 0
+ if params.observe_only:
+ errorcode = 0
+ else:
+ main.shutdown = 1
continue
--
2.1.4
^ permalink raw reply related [flat|nested] 7+ messages in thread