Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

diff --git a/appveyor.yml b/appveyor.yml
index c30d821..b1c3811 100644 (file)
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -19,27 +19,30 @@ environment:
 # - dir c:\projects\simgrid
 # - cmake --build . # be brutal: cmake is my only friend in this windows world.
 
-before_build:
-- ps: >-
-    mkdir C:\pthreads-win32
-    
-    $source = "ftp://sourceware.org/pub/pthreads-win32/pthreads-w32-2-9-1-release.zip"
-    
-    $destination = "C:\pthreads-win32\pthreads-win32.zip"
-    
-    Invoke-WebRequest $source -OutFile $destination
-
-    cd C:\pthreads-win32
-    
-    7z x C:\pthreads-win32\pthreads-win32.zip
+#before_build:
+#- ps: >-
+#    mkdir C:\pthreads-win32
+#    
+#    $source = "ftp://sourceware.org/pub/pthreads-win32/pthreads-w32-2-9-1-release.zip"
+#    
+#    $destination = "C:\pthreads-win32\pthreads-win32.zip"
+#    
+#    Invoke-WebRequest $source -OutFile $destination
+#
+#    cd C:\pthreads-win32
+#    
+#    7z x C:\pthreads-win32\pthreads-win32.zip
     
 build_script:
 - '"C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\Tools\VsDevCmd"'
 - C:\MinGW\msys\1.0\bin\bash -lc "echo \"C:/MinGW /mingw\" > /etc/fstab"
 - C:\MinGW\msys\1.0\bin\bash -lc "printenv"
-- C:\MinGW\msys\1.0\bin\bash -lc "cp /c/pthreads-win32/Pre-built.2/include/* /c/MinGW/include"
-- C:\MinGW\msys\1.0\bin\bash -lc "cp /c/pthreads-win32/Pre-built.2/dll/x86/*.dll /c/MinGW/bin"
-- C:\MinGW\msys\1.0\bin\bash -lc "cd /c/projects/simgrid && cmake -G \"MSYS Makefiles\" -DBOOST_ROOT=\"%BOOST_ROOT%\" -DBOOST_LIBRARYDIR=\"%BOOST_LIBRARYDIR%\" -DBoost_USE_STATIC_LIBS=ON -Denable_debug=ON -Denable_documentation=OFF -Denable_coverage=OFF -Denable_tracing=ON -Denable_java=ON ."
+#- C:\MinGW\msys\1.0\bin\bash -lc "cp /c/pthreads-win32/Pre-built.2/include/* /c/MinGW/include"
+#- C:\MinGW\msys\1.0\bin\bash -lc "cp /c/pthreads-win32/Pre-built.2/dll/x86/* /c/MinGW/bin"
+- C:\MinGW\msys\1.0\bin\bash -lc "cd /c/projects/simgrid && cmake -G \"MSYS Makefiles\" -DBOOST_ROOT=\"%BOOST_ROOT%\" -DBOOST_LIBRARYDIR=\"%BOOST_LIBRARYDIR%\" -DBoost_USE_STATIC_LIBS=ON -Denable_debug=ON -Denable_documentation=OFF -Denable_coverage=OFF -Denable_tracing=ON -Denable_java=ON -Denable_model-checking=OFF ."
+- C:\MinGW\msys\1.0\bin\bash -lc "cd /c/projects/simgrid; echo XXX simgrid_config.h; cat include/simgrid_config.h"
+- C:\MinGW\msys\1.0\bin\bash -lc "cd /c/projects/simgrid; echo XXX src/internal_config.h; cat src/internal_config.h"
+- C:\MinGW\msys\1.0\bin\bash -lc "cd /c/projects/simgrid; echo XXX Internal builtins; gcc -dM -E - < /dev/null"
 - C:\MinGW\msys\1.0\bin\bash -lc "cd /c/projects/simgrid && make"
 
 test_script:

diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake
index 52aef28..ec44421 100644 (file)
--- a/buildtools/Cmake/CompleteInFiles.cmake
+++ b/buildtools/Cmake/CompleteInFiles.cmake
@@ -146,7 +146,7 @@ endif()
 # Checks for header libraries functions.
 CHECK_LIBRARY_EXISTS(dl      dlopen                  "" HAVE_DLOPEN_IN_LIBDL)
 CHECK_LIBRARY_EXISTS(execinfo backtrace              "" HAVE_BACKTRACE_IN_LIBEXECINFO)
-CHECK_LIBRARY_EXISTS(pthread pthread_create          "" pthread)
+CHECK_LIBRARY_EXISTS(pthread pthread_create          "" HAVE_PTHREAD)
 CHECK_LIBRARY_EXISTS(pthread sem_init                "" HAVE_SEM_INIT_LIB)
 CHECK_LIBRARY_EXISTS(pthread sem_open                "" HAVE_SEM_OPEN_LIB)
 CHECK_LIBRARY_EXISTS(pthread sem_timedwait           "" HAVE_SEM_TIMEDWAIT_LIB)
@@ -333,13 +333,13 @@ endif()
 #--------------------------------------------------------------------------------------------------
 ### Initialize of CONTEXT THREADS
 
-if(pthread)
+if(HAVE_PTHREAD)
   set(pthread 1)
 elseif(pthread)
   set(pthread 0)
 endif()
 
-if(pthread)
+if(HAVE_PTHREAD)
   ### Test that we have a way to create semaphores
 
   if(HAVE_SEM_OPEN_LIB)
@@ -498,7 +498,7 @@ if(HAVE_UCONTEXT)
   message("-- Support for ucontext factory")
 endif()
 
-if(pthread)
+if(HAVE_PTHREAD)
   set(CONTEXT_THREADS 1)
   message("-- Support for thread context factory")
 endif()

diff --git a/src/xbt/win32_ucontext.c b/src/xbt/win32_ucontext.c
index 5c2e2b5..bd287d6 100644 (file)
--- a/src/xbt/win32_ucontext.c
+++ b/src/xbt/win32_ucontext.c
@@ -65,7 +65,7 @@ int makecontext(ucontext_t * ucp, void (*func) (), int argc, ...)
   }
   
       /* Set the instruction and the stack pointer */
-  #if defined(_I_X86_) || defined(__i383) || defined(__i383__)
+  #if defined(_I_X86_) || defined(__i386) || defined(__i386__)
   ucp->uc_mcontext.Eip = (DWORD) func;
   ucp->uc_mcontext.Esp = (DWORD) sp - sizeof(void*);
   #elif defined(_IA64_) || defined(__ia64) || defined(__ia64__)
@@ -74,7 +74,7 @@ int makecontext(ucontext_t * ucp, void (*func) (), int argc, ...)
   ucp->uc_mcontext.Rip = (DWORD64) func;
   ucp->uc_mcontext.Rsp = (DWORD64) sp - sizeof(void*);
   #else
-  #error "No architecture defined for Windows build.
+  #error "No architecture defined for Windows build."
   #endif
 
       /* Save/Restore the full machine context */