MonetDB: default - merge with Jun2010

[Stefan Manegold]

Changeset: cf84208ca2a9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cf84208ca2a9
Modified Files:
        
Branch: default
Log Message:

merge with Jun2010


diffs (17 lines):

diff -r 51580c5e5c45 -r cf84208ca2a9 MonetDB/src/gdk/gdk_system.mx
--- a/MonetDB/src/gdk/gdk_system.mx     Fri Jul 30 10:36:37 2010 +0200
+++ b/MonetDB/src/gdk/gdk_system.mx     Fri Jul 30 11:46:14 2010 +0200
@@ -630,8 +630,12 @@
         * http://ndevilla.free.fr/threads/ */
 
 #ifdef WIN32
-       ncpus = 1;
+       SYSTEM_INFO sysinfo;
+
+       GetSystemInfo( &sysinfo );
+       ncpus = sysinfo.dwNumberOfProcessors;
 #endif
+
        if (ncpus <= 0)
                return MT_check_nr_cores_();
        return ncpus;
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list