summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
a6b30c2)
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7860
48e7efb5-ca39-0410-a469-
dd3cf9ba447f
CHECK_INCLUDE_FILE(stdlib.h HAVE_STDLIB_H)
CHECK_INCLUDE_FILE(strings.h HAVE_STRINGS_H)
CHECK_INCLUDE_FILE(string.h HAVE_STRING_H)
CHECK_INCLUDE_FILE(stdlib.h HAVE_STDLIB_H)
CHECK_INCLUDE_FILE(strings.h HAVE_STRINGS_H)
CHECK_INCLUDE_FILE(string.h HAVE_STRING_H)
+CHECK_INCLUDE_FILE(ucontext.h HAVE_UCONTEXT_H)
CHECK_FUNCTION_EXISTS(gettimeofday HAVE_GETTIMEOFDAY)
CHECK_FUNCTION_EXISTS(usleep HAVE_USLEEP)
CHECK_FUNCTION_EXISTS(gettimeofday HAVE_GETTIMEOFDAY)
CHECK_FUNCTION_EXISTS(usleep HAVE_USLEEP)
CHECK_FUNCTION_EXISTS(makecontext HAVE_MAKECONTEXT)
CHECK_FUNCTION_EXISTS(mmap HAVE_MMAP)
CHECK_FUNCTION_EXISTS(makecontext HAVE_MAKECONTEXT)
CHECK_FUNCTION_EXISTS(mmap HAVE_MMAP)
+if(WIN32)
+ set(HAVE_UCONTEXT_H 1)
+ set(HAVE_MAKECONTEXT 1)
+endif(WIN32)
+
set(CONTEXT_UCONTEXT 0)
SET(CONTEXT_THREADS 0)
SET(HAVE_RUBY 0)
set(CONTEXT_UCONTEXT 0)
SET(CONTEXT_THREADS 0)
SET(HAVE_RUBY 0)
STRING(REPLACE " +0000" "" GIT_DATE ${GIT_DATE})
STRING(REPLACE " " "~" GIT_DATE ${GIT_DATE})
STRING(REPLACE ":" "-" GIT_DATE ${GIT_DATE})
STRING(REPLACE " +0000" "" GIT_DATE ${GIT_DATE})
STRING(REPLACE " " "~" GIT_DATE ${GIT_DATE})
STRING(REPLACE ":" "-" GIT_DATE ${GIT_DATE})
- message("GIT_DATE : ${GIT_DATE}")
- message("GIT_VERSION : ${GIT_VERSION}")
foreach(line ${GIT_SVN_VERSION})
string(REGEX MATCH "^Revision:.*" line_good ${line})
if(line_good)
foreach(line ${GIT_SVN_VERSION})
string(REGEX MATCH "^Revision:.*" line_good ${line})
if(line_good)
set(SVN_VERSION ${line_good})
endif(line_good)
endforeach(line ${GIT_SVN_VERSION})
set(SVN_VERSION ${line_good})
endif(line_good)
endforeach(line ${GIT_SVN_VERSION})
- message("GIT_SVN_VERSION : ${SVN_VERSION}")
endif(IS_DIRECTORY ${PROJECT_DIRECTORY}/.git)
###################################
endif(IS_DIRECTORY ${PROJECT_DIRECTORY}/.git)
###################################
#--------------------------------------------------------------------------------------------------
set(makecontext_CPPFLAGS_2 "")
#--------------------------------------------------------------------------------------------------
set(makecontext_CPPFLAGS_2 "")
+if(HAVE_MAKECONTEXT OR WIN32)
set(makecontext_CPPFLAGS "-DTEST_makecontext")
if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
set(makecontext_CPPFLAGS_2 "-DOSX")
endif(CMAKE_SYSTEM_NAME MATCHES "Darwin")
set(makecontext_CPPFLAGS "-DTEST_makecontext")
if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
set(makecontext_CPPFLAGS_2 "-DOSX")
endif(CMAKE_SYSTEM_NAME MATCHES "Darwin")
+
+ if(WIN32)
+ set(makecontext_CPPFLAGS_2 "-DWIN32 ${INCLUDES}")
+ endif(WIN32)
try_run(RUN_makecontext_VAR COMPILE_makecontext_VAR
${PROJECT_DIRECTORY}
${PROJECT_DIRECTORY}/buildtools/Cmake/test_prog/prog_stacksetup.c
COMPILE_DEFINITIONS "${makecontext_CPPFLAGS} ${makecontext_CPPFLAGS_2}"
)
try_run(RUN_makecontext_VAR COMPILE_makecontext_VAR
${PROJECT_DIRECTORY}
${PROJECT_DIRECTORY}/buildtools/Cmake/test_prog/prog_stacksetup.c
COMPILE_DEFINITIONS "${makecontext_CPPFLAGS} ${makecontext_CPPFLAGS_2}"
)
file(READ ${simgrid_BINARY_DIR}/conftestval MAKECONTEXT_ADDR_SIZE)
file(READ ${simgrid_BINARY_DIR}/conftestval MAKECONTEXT_ADDR_SIZE)
- message("MAKECONTEXT_ADDR_SIZE : ${MAKECONTEXT_ADDR_SIZE}")
string(REPLACE "\n" "" MAKECONTEXT_ADDR_SIZE "${MAKECONTEXT_ADDR_SIZE}")
string(REGEX MATCH ;^.*,;MAKECONTEXT_ADDR "${MAKECONTEXT_ADDR_SIZE}")
string(REGEX MATCH ;,.*$; MAKECONTEXT_SIZE "${MAKECONTEXT_ADDR_SIZE}")
string(REPLACE "\n" "" MAKECONTEXT_ADDR_SIZE "${MAKECONTEXT_ADDR_SIZE}")
string(REGEX MATCH ;^.*,;MAKECONTEXT_ADDR "${MAKECONTEXT_ADDR_SIZE}")
string(REGEX MATCH ;,.*$; MAKECONTEXT_SIZE "${MAKECONTEXT_ADDR_SIZE}")
set(pth_skaddr_makecontext "#define pth_skaddr_makecontext(skaddr,sksize) (${makecontext_addr})")
set(pth_sksize_makecontext "#define pth_sksize_makecontext(skaddr,sksize) (${makecontext_size})")
set(pth_skaddr_makecontext "#define pth_skaddr_makecontext(skaddr,sksize) (${makecontext_addr})")
set(pth_sksize_makecontext "#define pth_sksize_makecontext(skaddr,sksize) (${makecontext_size})")
+endif(HAVE_MAKECONTEXT OR WIN32)
#--------------------------------------------------------------------------------------------------
#--------------------------------------------------------------------------------------------------
message("Mode supernovae and maintainer disable with Windows.")
set(enable_supernovae false CACHE TYPE INTERNAL FORCE)
set(enable_maintainer_mode false CACHE TYPE INTERNAL FORCE)
message("Mode supernovae and maintainer disable with Windows.")
set(enable_supernovae false CACHE TYPE INTERNAL FORCE)
set(enable_maintainer_mode false CACHE TYPE INTERNAL FORCE)
- set(with_context "windows" CACHE TYPE INTERNAL FORCE)
endif(WIN32)
mark_as_advanced(enable_coverage)
endif(WIN32)
mark_as_advanced(enable_coverage)
/* Define if xbt contexts are based on our threads implementation or not */
#cmakedefine CONTEXT_THREADS @CONTEXT_THREADS@
/* Define if xbt contexts are based on our threads implementation or not */
#cmakedefine CONTEXT_THREADS @CONTEXT_THREADS@
+/* Define to 1 if you have the <ucontext.h> header file. */
+#cmakedefine HAVE_UCONTEXT_H @HAVE_UCONTEXT_H@
+
/* Define if xbt contexts are based on ucontext or not */
#cmakedefine CONTEXT_UCONTEXT @CONTEXT_UCONTEXT@
/* Define if xbt contexts are based on ucontext or not */
#cmakedefine CONTEXT_UCONTEXT @CONTEXT_UCONTEXT@
#if defined OSX
#define _XOPEN_SOURCE
#endif
#if defined OSX
#define _XOPEN_SOURCE
#endif
+
+#ifdef WIN32
+ #include "ucontext.h"
+ #include "ucontext.c"
+#endif
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "smx_context_sysv_private.h"
#ifdef HAVE_VALGRIND_VALGRIND_H
# include <valgrind/valgrind.h>
#endif /* HAVE_VALGRIND_VALGRIND_H */
#include "smx_context_sysv_private.h"
#ifdef HAVE_VALGRIND_VALGRIND_H
# include <valgrind/valgrind.h>
#endif /* HAVE_VALGRIND_VALGRIND_H */
+#ifdef WIN32
+ #include "ucontext.h"
+ #include "ucontext.c"
+#endif
+
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
static smx_context_t
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_context);
static smx_context_t
XBT_LOG_EXTERNAL_CATEGORY(surf_timer);
XBT_LOG_EXTERNAL_CATEGORY(surf_workstation);
XBT_LOG_EXTERNAL_CATEGORY(surf_config);
XBT_LOG_EXTERNAL_CATEGORY(surf_timer);
XBT_LOG_EXTERNAL_CATEGORY(surf_workstation);
XBT_LOG_EXTERNAL_CATEGORY(surf_config);
-XBT_LOG_EXTERNAL_CATEGORY(surf_routing);
+XBT_LOG_EXTERNAL_CATEGORY(surf_route);
XBT_LOG_CONNECT(surf_timer, surf);
XBT_LOG_CONNECT(surf_workstation, surf);
XBT_LOG_CONNECT(surf_config, surf);
XBT_LOG_CONNECT(surf_timer, surf);
XBT_LOG_CONNECT(surf_workstation, surf);
XBT_LOG_CONNECT(surf_config, surf);
- XBT_LOG_CONNECT(surf_routing, surf);
+ XBT_LOG_CONNECT(surf_route, surf);
#ifdef HAVE_GTNETS
XBT_LOG_CONNECT(surf_network_gtnets, surf);
#ifdef HAVE_GTNETS
XBT_LOG_CONNECT(surf_network_gtnets, surf);
#define va_copy(d, s) __VA_COPY_USE(d, s)
#endif
#define va_copy(d, s) __VA_COPY_USE(d, s)
#endif
+ /* Define to id of used va_copy() implementation */
+ #ifndef __VA_COPY_USE
+ #define __VA_COPY_USE __VA_COPY_USE_C99
+ #endif
#endif
/* xbt contexts are based on our threads implementation */
#endif
/* xbt contexts are based on our threads implementation */
#define CONTEXT_THREADS 1
#endif
#define CONTEXT_THREADS 1
#endif
/* xbt contexts are not based on ucontext */
#ifdef CONTEXT_UCONTEXT
#undef CONTEXT_UCONTEXT
#endif
/* xbt contexts are not based on ucontext */
#ifdef CONTEXT_UCONTEXT
#undef CONTEXT_UCONTEXT
#endif
-/* Define to id of used va_copy() implementation */
-#ifndef __VA_COPY_USE
- #define __VA_COPY_USE __VA_COPY_USE_C99
-#endif
#ifndef _XBT_CALL
#if defined(_XBT_DESIGNATED_DLL)
#ifndef _XBT_CALL
#if defined(_XBT_DESIGNATED_DLL)