[Notes] [Git][BuildStream/buildstream][mac_fixes] Moving `os.sched_getaffinity(0)` logic

[Phillip Smyth <gitlab mg gitlab com>]

Title: GitLab

Phillip Smyth pushed to branch mac_fixes at BuildStream / buildstream

Commits:

• 0924de03
  by knownexus at 2018-08-30T13:28:11Z

  Moving `os.sched_getaffinity(0)` logic
  
  Removed `os.sched_getaffinity(0)` from _project.py
  Added `os.sched_getaffinity(0)` to platform.py
  Added `os.cpu_count()` to darwin.py
  

3 changed files:

• buildstream/_platform/darwin.py
• buildstream/_platform/platform.py
• buildstream/_project.py

Changes:

buildstream/_platform/darwin.py

---

...	...	@@ -49,3 +49,6 @@ class Darwin(Platform):
49	49
50	50	def create_sandbox(self, *args, **kwargs):
51	51	return SandboxChroot(*args, **kwargs)
	52	+
	53	+ def get_cpu_count(self):
	54	+ return str(min(len(os.cpu_count())))

buildstream/_platform/platform.py

---

...	...	@@ -96,3 +96,6 @@ class Platform():
96	96	def create_sandbox(self, *args, **kwargs):
97	97	raise ImplError("Platform {platform} does not implement create_sandbox()"
98	98	.format(platform=type(self).__name__))
	99	+
	100	+ def get_cpu_count(self):
	101	+ return str(min(len(os.sched_getaffinity(0)), 8))

buildstream/_project.py

---

...	...	@@ -19,6 +19,7 @@
19	19	# Tiago Gomes <tiago gomes codethink co uk>
20	20
21	21	import os
	22	+import sys
22	23	from collections import Mapping, OrderedDict
23	24	from pluginbase import PluginBase
24	25	from . import utils
...	...	@@ -38,6 +39,7 @@ from ._loader import Loader
38	39	from .element import Element
39	40	from ._message import Message, MessageType
40	41	from ._includes import Includes
	42	+from ._platform import Platform
41	43
42	44
43	45	# Project Configuration file
...	...	@@ -140,6 +142,7 @@ class Project():
140	142	profile_start(Topics.LOAD_PROJECT, self.directory.replace(os.sep, '-'))
141	143	self._load(parent_loader=parent_loader, tempdir=tempdir)
142	144	profile_end(Topics.LOAD_PROJECT, self.directory.replace(os.sep, '-'))
	145	+ self.platform = Platform.get_platform()
143	146
144	147	self._partially_loaded = True
145	148
...	...	@@ -594,7 +597,7 @@ class Project():
594	597	# Based on some testing (mainly on AWS), maximum effective
595	598	# max-jobs value seems to be around 8-10 if we have enough cores
596	599	# users should set values based on workload and build infrastructure
597		- output.base_variables['max-jobs'] = str(min(len(os.sched_getaffinity(0)), 8))
	600	+ output.base_variables['max-jobs'] = self.platform.get_cpu_count()
598	601
599	602	# Export options into variables, if that was requested
600	603	output.options.export_variables(output.base_variables)

—
View it on GitLab.
You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.