pool/0ad
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove failing assertion

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/games/0ad?expand=0&rev=7
This commit is contained in:
Philip Taylor 2010-07-24 21:53:39 +00:00 committed by Git OBS Bridge
parent 4f7165d27d
commit 69c944a939
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
0ad-apicids.patch
View File

@ -1,6 +1,6 @@
diff -r f2cdbf31ce9b source/lib/sysdep/arch/x86_x64/topology.cpp
--- source/lib/sysdep/arch/x86_x64/topology.cpp Sat Jul 10 18:42:54 2010 +0100
+++ source/lib/sysdep/arch/x86_x64/topology.cpp Sat Jul 24 19:57:17 2010 +0100
+++ source/lib/sysdep/arch/x86_x64/topology.cpp Sat Jul 24 22:34:51 2010 +0100
@@ -137,18 +137,24 @@
// core, package and shared cache. if they are available, we can determine
// the exact topology; otherwise we have to guess.
@ -35,3 +35,13 @@ diff -r f2cdbf31ce9b source/lib/sysdep/arch/x86_x64/topology.cpp
return false;
}
@@ -245,7 +251,8 @@
// assume cores are enabled and count as processors.
const size_t numPackagesTimesLogical = os_cpu_NumProcessors() / CoresPerPackage();
- debug_assert(numPackagesTimesLogical != 0);
+ // note: this might give numPackagesTimesLogical == 0 (e.g. when running in some VMs)
+
// assume hyperthreads are enabled.
size_t numPackages = numPackagesTimesLogical;
// if they are reported as processors, remove them from the count.