jenkins-bot has submitted this change and it was merged.
Change subject: Query WMI via win32ole for CPU count on Windows
......................................................................
Query WMI via win32ole for CPU count on Windows
Fall back to 1 core for all platforms if detection fails.
Bumped version to force auto configuration for Windows users.
Bug: T97087
Change-Id: I3d619570c4404c2ade279dc895937e823aaaeca4
---
M lib/mediawiki-vagrant/environment.rb
M lib/mediawiki-vagrant/version.rb
2 files changed, 19 insertions(+), 11 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/mediawiki-vagrant/environment.rb
b/lib/mediawiki-vagrant/environment.rb
index 0cc11f9..74d1a8e 100644
--- a/lib/mediawiki-vagrant/environment.rb
+++ b/lib/mediawiki-vagrant/environment.rb
@@ -34,16 +34,24 @@
# @return [Fixnum]
#
def total_cpus
- case operating_system
- when :osx
- `sysctl -n hw.ncpu`.to_i
- when :linux
- `nproc`.to_i
- when :windows
- `wmic CPU get NumberOfLogicalProcessors | more +1`.to_i
- else
- 1
- end
+ cores =
+ case operating_system
+ when :osx
+ `sysctl -n hw.ncpu`.to_i
+ when :linux
+ `nproc`.to_i
+ when :windows
+ require 'win32ole'
+
+ wmi = WIN32OLE.connect('winmgmts://')
+ q = wmi.ExecQuery('select NumberOfCores from Win32_Processor')
+
+ q.to_enum.reduce(0) { |cores, processor| cores +
processor.NumberOfCores }
+ else
+ 1
+ end
+
+ [1, cores].max
end
# Total host OS memory in MB.
diff --git a/lib/mediawiki-vagrant/version.rb b/lib/mediawiki-vagrant/version.rb
index 605c1cc..93ca639 100644
--- a/lib/mediawiki-vagrant/version.rb
+++ b/lib/mediawiki-vagrant/version.rb
@@ -1,3 +1,3 @@
module MediaWikiVagrant
- VERSION = '0.6.0'
+ VERSION = '0.7.0'
end
--
To view, visit https://gerrit.wikimedia.org/r/206332
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3d619570c4404c2ade279dc895937e823aaaeca4
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Dduvall <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
