diff options
| author |   Joshua Lock <josh@linux.intel.com> | 2011-08-23 16:11:47 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-08-24 19:32:42 -0700 |
| commit | 27dcf245abf3805be47894773406392fdf055e48 (patch) | |
| tree | 1d75b27f177259cde6a58b34d556148623b826b5 | |
| parent | 0ed281feb6d244d3700da484f4e83394ae394f93 (diff) | |
| download | bitbake-27dcf245abf3805be47894773406392fdf055e48.tar.gz | |
hob: don't set PARALLEL_MAKE and BB_NUMBER_THREADS based on cpu count
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>
| -rw-r--r-- | lib/bb/ui/crumbs/hobprefs.py | 4 | ||||
| -rw-r--r-- | 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 ee42e5845..3859b29a0 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 105b0ef12..72786432b 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) |