* [PATCH 1/3] hob: don't set PARALLEL_MAKE and BB_NUMBER_THREADS based on cpu count
2011-08-24 20:25 [PATCH 0/3] Fix some bugs and usability issues in hob Joshua Lock
@ 2011-08-24 20:25 ` Joshua Lock
2011-08-24 20:25 ` [PATCH 2/3] bb/ui/crumbs/tasklistmodel: fix find_reverse_depends method Joshua Lock
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Joshua Lock @ 2011-08-24 20:25 UTC (permalink / raw)
To: bitbake-devel
This was actually broken with recent changes as the values were never
persisted to a file (meaning they were unset on the server at reparse
despite the UI indicating they were set).
However, I've chosen to remove the 'feature' as pegging a users CPU without
them asking to use high thread counts seems a little offensive.
Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
lib/bb/ui/crumbs/hobprefs.py | 4 +---
lib/bb/ui/hob.py | 11 +++--------
2 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/lib/bb/ui/crumbs/hobprefs.py b/lib/bb/ui/crumbs/hobprefs.py
index ee42e58..3859b29 100644
--- a/lib/bb/ui/crumbs/hobprefs.py
+++ b/lib/bb/ui/crumbs/hobprefs.py
@@ -166,7 +166,7 @@ class HobPrefs(gtk.Dialog):
self.reload_required = False
def __init__(self, configurator, handler, curr_sdk_mach, curr_distro, pclass,
- cpu_cnt, pmake, bbthread, selected_image_types, all_image_types,
+ pmake, bbthread, selected_image_types, all_image_types,
gplv3disabled, build_toolchain, build_toolchain_headers):
"""
"""
@@ -185,7 +185,6 @@ class HobPrefs(gtk.Dialog):
self.curr_sdk_mach = curr_sdk_mach
self.curr_distro = curr_distro
self.curr_package_format = pclass
- self.cpu_cnt = cpu_cnt
self.pmake = pmake
self.bbthread = bbthread
self.selected_image_types = selected_image_types.split(" ")
@@ -283,7 +282,6 @@ class HobPrefs(gtk.Dialog):
# set a high maximum as a value for upper bounds is required by the
# gtk.Adjustment
spin_max = 30 # seems like a high enough arbitrary number
- #spin_max = self.cpu_cnt * 3
hbox.pack_start(label, expand=False, fill=False, padding=6)
bbadj = gtk.Adjustment(value=self.bbthread, lower=1, upper=spin_max, step_incr=1)
bbspinner = gtk.SpinButton(adjustment=bbadj, climb_rate=1, digits=0)
diff --git a/lib/bb/ui/hob.py b/lib/bb/ui/hob.py
index 105b0ef..7278643 100644
--- a/lib/bb/ui/hob.py
+++ b/lib/bb/ui/hob.py
@@ -962,9 +962,6 @@ class MainWindow (gtk.Window):
return scroll
def main (server, eventHandler):
- import multiprocessing
- cpu_cnt = multiprocessing.cpu_count()
-
gobject.threads_init()
taskmodel = TaskListModel()
@@ -979,14 +976,12 @@ def main (server, eventHandler):
distro = server.runCommand(["getVariable", "DISTRO"])
bbthread = server.runCommand(["getVariable", "BB_NUMBER_THREADS"])
if not bbthread:
- bbthread = cpu_cnt
- handler.set_bbthreads(cpu_cnt)
+ bbthread = 1
else:
bbthread = int(bbthread)
pmake = server.runCommand(["getVariable", "PARALLEL_MAKE"])
if not pmake:
- pmake = cpu_cnt
- handler.set_pmake(cpu_cnt)
+ pmake = 1
else:
# The PARALLEL_MAKE variable will be of the format: "-j 3" and we only
# want a number for the spinner, so strip everything from the variable
@@ -1012,7 +1007,7 @@ def main (server, eventHandler):
build_headers = bool(server.runCommand(["getVariable", "HOB_BUILD_TOOLCHAIN_HEADERS"]))
handler.toggle_toolchain_headers(build_headers)
- prefs = HobPrefs(configurator, handler, sdk_mach, distro, pclass, cpu_cnt,
+ prefs = HobPrefs(configurator, handler, sdk_mach, distro, pclass,
pmake, bbthread, selected_image_types, all_image_types,
gplv3disabled, build_toolchain, build_headers)
layers = LayerEditor(configurator, None)
--
1.7.6
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 3/3] hob: disable some menu entries whilst build is in progress
2011-08-24 20:25 [PATCH 0/3] Fix some bugs and usability issues in hob Joshua Lock
2011-08-24 20:25 ` [PATCH 1/3] hob: don't set PARALLEL_MAKE and BB_NUMBER_THREADS based on cpu count Joshua Lock
2011-08-24 20:25 ` [PATCH 2/3] bb/ui/crumbs/tasklistmodel: fix find_reverse_depends method Joshua Lock
@ 2011-08-24 20:26 ` Joshua Lock
2011-08-25 2:33 ` [PATCH 0/3] Fix some bugs and usability issues in hob Richard Purdie
3 siblings, 0 replies; 5+ messages in thread
From: Joshua Lock @ 2011-08-24 20:26 UTC (permalink / raw)
To: bitbake-devel
It doesn't make sense to be able to modify the preferences and add/remove
layers whilst a build is in progress - disable the relevant menu items once
the build has started and re-enable them once the user has returned to the
creation view.
Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
lib/bb/ui/hob.py | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/lib/bb/ui/hob.py b/lib/bb/ui/hob.py
index 7278643..c2acada 100644
--- a/lib/bb/ui/hob.py
+++ b/lib/bb/ui/hob.py
@@ -469,12 +469,21 @@ class MainWindow (gtk.Window):
else:
self.handler.build_packages(self.model.get_selected_pn())
+ # Disable parts of the menu which shouldn't be used whilst building
+ self.set_menus_sensitive(False)
self.nb.set_current_page(1)
+ def set_menus_sensitive(self, sensitive):
+ self.add_layers_action.set_sensitive(sensitive)
+ self.layers_action.set_sensitive(sensitive)
+ self.prefs_action.set_sensitive(sensitive)
+ self.open_action.set_sensitive(sensitive)
+
def back_button_clicked_cb(self, button):
self.toggle_createview()
def toggle_createview(self):
+ self.set_menus_sensitive(True)
self.build.model.clear()
self.nb.set_current_page(0)
@@ -816,18 +825,27 @@ class MainWindow (gtk.Window):
actions = gtk.ActionGroup('ImageCreator')
self.actions = actions
- actions.add_actions([('Quit', gtk.STOCK_QUIT, None, None,
- None, self.menu_quit,),
+ actions.add_actions([('Quit', gtk.STOCK_QUIT, None, None, None, self.menu_quit,),
('File', None, '_File'),
('Save', gtk.STOCK_SAVE, None, None, None, self.save_cb),
('Save As', gtk.STOCK_SAVE_AS, None, None, None, self.save_as_cb),
- ('Open', gtk.STOCK_OPEN, None, None, None, self.open_cb),
- ('AddLayer', None, 'Add Layer', None, None, self.add_layer_cb),
('Edit', None, '_Edit'),
('Help', None, '_Help'),
- ('Layers', None, 'Layers', None, None, self.layers_cb),
- ('Preferences', gtk.STOCK_PREFERENCES, None, None, None, self.preferences_cb),
('About', gtk.STOCK_ABOUT, None, None, None, self.about_cb)])
+
+ self.add_layers_action = gtk.Action('AddLayer', 'Add Layer', None, None)
+ self.add_layers_action.connect("activate", self.add_layer_cb)
+ self.actions.add_action(self.add_layers_action)
+ self.layers_action = gtk.Action('Layers', 'Layers', None, None)
+ self.layers_action.connect("activate", self.layers_cb)
+ self.actions.add_action(self.layers_action)
+ self.prefs_action = gtk.Action('Preferences', 'Preferences', None, None)
+ self.prefs_action.connect("activate", self.preferences_cb)
+ self.actions.add_action(self.prefs_action)
+ self.open_action = gtk.Action('Open', 'Open', None, None)
+ self.open_action.connect("activate", self.open_cb)
+ self.actions.add_action(self.open_action)
+
uimanager.insert_action_group(actions, 0)
uimanager.add_ui_from_string(menu_items)
--
1.7.6
^ permalink raw reply related [flat|nested] 5+ messages in thread