[mpich2-commits] r5633 - mpich2/trunk

[jayesh at mcs.anl.gov]

Author: jayesh
Date: 2009-10-30 11:24:47 -0500 (Fri, 30 Oct 2009)
New Revision: 5633

Modified:
   mpich2/trunk/winconfigure.wsf
Log:
Define thread specific abstractions on windows as in unix. This change should be reverted back/re-visited after we figure out the *right* defaults for these abstractions

Modified: mpich2/trunk/winconfigure.wsf
===================================================================
--- mpich2/trunk/winconfigure.wsf	2009-10-30 16:24:36 UTC (rev 5632)
+++ mpich2/trunk/winconfigure.wsf	2009-10-30 16:24:47 UTC (rev 5633)
@@ -2917,23 +2917,15 @@
                                         fout.WriteLine("#define MPIU_THREAD_PACKAGE_NAME MPIU_THREAD_PACKAGE_NONE")
                                         fout.WriteLine("#endif")
 				Case "MPIU_THREAD_REFCOUNT"
-					fout.WriteLine("#ifdef MPICH_MULTITHREADED")
 					fout.WriteLine("#define MPIU_THREAD_REFCOUNT MPIU_REFCOUNT_NONE")
-					fout.WriteLine("#else")
-					fout.WriteLine("/* #undef MPIU_THREAD_REFCOUNT */")
-					fout.WriteLine("#endif")
 				Case "MPIU_THREAD_GRANULARITY"
 					fout.WriteLine("#ifdef MPICH_MULTITHREADED")
 					fout.WriteLine("#define MPIU_THREAD_GRANULARITY MPIU_THREAD_GRANULARITY_GLOBAL")
 					fout.WriteLine("#else")
-					fout.WriteLine("/* #undef MPIU_THREAD_GRANULARITY */")
+					fout.WriteLine("#define MPIU_THREAD_GRANULARITY MPIU_THREAD_GRANULARITY_SINGLE")
 					fout.WriteLine("#endif")
 				Case "MPIU_HANDLE_ALLOCATION_METHOD"
-					fout.WriteLine("#ifdef MPICH_MULTITHREADED")
 					fout.WriteLine("#define MPIU_HANDLE_ALLOCATION_METHOD MPIU_HANDLE_ALLOCATION_MUTEX")
-					fout.WriteLine("#else")
-					fout.WriteLine("/* #undef MPIU_HANDLE_ALLOCATION_METHOD */")
-					fout.WriteLine("#endif")
 				Case "MPIU_MUTEX_WAIT_TIME"
 					fout.WriteLine("/* #undef MPIU_MUTEX_WAIT_TIME */")
 				Case "_REENTRANT"