[mpich2-commits] r5419 - in mpich2/branches/release/mpich2-1.2: . confdb

[jayesh at mcs.anl.gov]

Author: jayesh
Date: 2009-10-07 11:42:44 -0500 (Wed, 07 Oct 2009)
New Revision: 5419

Modified:
   mpich2/branches/release/mpich2-1.2/
   mpich2/branches/release/mpich2-1.2/confdb/
   mpich2/branches/release/mpich2-1.2/winconfigure.wsf
Log:
Merging r5418 from trunk - OPA defns for windows


Property changes on: mpich2/branches/release/mpich2-1.2
___________________________________________________________________
Modified: svn:mergeinfo
   - /mpich2/branches/dev/ckpt2:5182,5196,5198
/mpich2/branches/release/mpich2-1.1.1:5022,5032,5110,5113,5140-5141
/mpich2/trunk:5410
   + /mpich2/branches/dev/ckpt2:5182,5196,5198
/mpich2/branches/release/mpich2-1.1.1:5022,5032,5110,5113,5140-5141
/mpich2/trunk:5410,5418


Property changes on: mpich2/branches/release/mpich2-1.2/confdb
___________________________________________________________________
Modified: svn:mergeinfo
   - /mpich2/branches/dev/ckpt2/confdb:5180,5182,5196,5198
/mpich2/branches/release/mpich2-1.1.1/confdb:5022,5032,5110,5113,5140-5141
/mpich2/trunk/confdb:5410
   + /mpich2/branches/dev/ckpt2/confdb:5180,5182,5196,5198
/mpich2/branches/release/mpich2-1.1.1/confdb:5022,5032,5110,5113,5140-5141
/mpich2/trunk/confdb:5410,5418

Modified: mpich2/branches/release/mpich2-1.2/winconfigure.wsf
===================================================================
--- mpich2/branches/release/mpich2-1.2/winconfigure.wsf	2009-10-07 15:37:38 UTC (rev 5418)
+++ mpich2/branches/release/mpich2-1.2/winconfigure.wsf	2009-10-07 16:42:44 UTC (rev 5419)
@@ -2098,8 +2098,14 @@
                 fout.WriteLine("/* #undef HAVE_MEMORY_H */")
             Case "HAVE_NT_INTRINSICS"
                 fout.WriteLine("#define OPA_HAVE_NT_INTRINSICS 1")
+            Case "USE_UNSAFE_PRIMITIVES"
+                fout.WriteLine("/* #undef USE_UNSAFE_PRIMITIVES */")
             Case "HAVE_PTHREAD_H"
                 fout.WriteLine("/* #undef HAVE_PTHREAD_H */")
+            Case "HAVE_PTHREAD_YIELD"
+                fout.WriteLine("/* #undef HAVE_PTHREAD_YIELD */")
+            Case "HAVE_SCHED_YIELD"
+                fout.WriteLine("/* #undef HAVE_SCHED_YIELD */")
             Case "HAVE_STDINT_H"
                 fout.WriteLine("/* #undef HAVE_STDINT_H */")
             Case "HAVE_STDLIB_H"
@@ -2120,8 +2126,15 @@
                 fout.WriteLine("/* #undef HAVE_UNISTD_H */")
             Case "LIMIT_THREADS"
                 fout.WriteLine("/* #undef LIMIT_THREADS */")
+            ' Just using the default value in the unix build for max nthreads
+            Case "MAX_NTHREADS"
+                fout.WriteLine("#define MAX_NTHREADS 100")
             Case "NDEBUG"
                 fout.WriteLine("/* #undef NDEBUG */")
+            ' By default allow threads to yield
+            ' FIXME: However OPA_TEST_YIELD() is not defined on windows...
+            Case "HAVE_STRICT_FAIRNESS_CHECKS"
+                fout.WriteLine("/* #undef HAVE_STRICT_FAIRNESS_CHECKS */")
             Case "PACKAGE"
                 fout.WriteLine("#define OPA_PACKAGE ""openpa""")
             Case "PACKAGE_TARNAME"