From ffc9ceec7dc66054c78e3be12215feea0111f072 Mon Sep 17 00:00:00 2001
From: rachytski <siarhei.rachytski@gmail.com>
Date: Thu, 26 Jan 2012 13:13:59 +0400
Subject: [PATCH] [android] fixed CpuCores.

---
 platform/platform_android.cpp | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/platform/platform_android.cpp b/platform/platform_android.cpp
index dc3c66ddf1..ffbdd7bb0d 100644
--- a/platform/platform_android.cpp
+++ b/platform/platform_android.cpp
@@ -85,10 +85,19 @@ void Platform::GetFilesInDir(string const & directory, string const & mask, File
 
 int Platform::CpuCores() const
 {
-  // @TODO temporarily commented to avoid crashes
-//  long const numCPU = sysconf(_SC_NPROCESSORS_ONLN);
-//  if (numCPU >= 1)
-//    return static_cast<int>(numCPU);
+  static long const numCPU = sysconf(_SC_NPROCESSORS_CONF);
+
+  /// for debugging only. _SC_NPROCESSORS_ONLN could change, so
+  /// we should test whether _SC_NPROCESSORS_CONF could change too
+
+  long const newNumCPU = sysconf(_SC_NPROCESSORS_CONF);
+
+  if (newNumCPU != numCPU)
+    LOG(LERROR, ("initially retrived", numCPU, "and now got", newNumCPU, "processors"));
+
+  if (numCPU >= 1)
+    return static_cast<int>(numCPU);
+
   return 1;
 }