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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3fdc359..c6a6618 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -177,7 +177,8 @@ endif()
 
 include_directories(${INCLUDES})
 
-
+# library dependency cannot start with a space (CMP0004), so initialize it with something that is never desactivated.
+set(SIMGRID_DEP "-lm") 
 
 ### Determine the assembly flavor that we need today
 set(HAVE_RAW_CONTEXTS 0)
@@ -280,18 +281,6 @@ else()
   endif()
 endif()
 
-# Try again to see if we have libboost-graph
-#find_package(Boost 1.42 COMPONENTS graph)
-#set(Boost_FOUND 1) # We don't care of whether this component is missing
-#
-#if(Boost_FOUND AND Boost_GRAPH_FOUND)
-#  set(HAVE_BOOST_GRAPH 1)
-#else()
-#  message ("   boost        : found.")
-#  message ("   boost-graph  : missing. Install libboost-graph-dev for this optional feature.")
-#  set(HAVE_BOOST_GRAPH 0)
-#endif()
-
 # Checks for header libraries functions.
 CHECK_LIBRARY_EXISTS(rt      clock_gettime           "" HAVE_POSIX_GETTIME)
 
@@ -356,6 +345,10 @@ if(HAVE_MMAP AND HAVE_THREAD_LOCAL_STORAGE)
   SET(HAVE_MMALLOC 1)
 else()
   SET(HAVE_MMALLOC 0)
+  if(enable_model-checking)
+    message(STATUS "Warning: support for model-checking has been disabled because you are missing either mmap or __thread.")
+  endif()
+  SET(enable_model-checking 0)
 endif()
 
 if(enable_jedule)
@@ -370,21 +363,35 @@ else()
   SET(HAVE_MALLOCATOR 0)
 endif()
 
+include(FindLibunwind)
+if(HAVE_LIBUNWIND)
+  SET(SIMGRID_DEP "${SIMGRID_DEP} -lunwind -lunwind-ptrace")
+  # This supposes that the host machine is either an AMD or a X86.
+  # This is deeply wrong, and should be fixed by manually loading -lunwind-PLAT (FIXME)
+  if(PROCESSOR_x86_64)
+    SET(SIMGRID_DEP "${SIMGRID_DEP} -lunwind-x86_64")
+  else()
+    SET(SIMGRID_DEP "${SIMGRID_DEP} -lunwind-x86")
+  endif()
+else()
+  if(enable_model-checking)
+    message(FATAL_ERROR "Please either install the libunwind7-dev package (or equivalent) or turn off the model-checking option of SimGrid.")
+  endif()
+endif()
+
 if(enable_model-checking AND NOT "${CMAKE_SYSTEM}" MATCHES "Linux")
   message(WARNING "Support for model-checking has not been enabled on ${CMAKE_SYSTEM}: disabling it")
   set(enable_model-checking FALSE)
   set(HAVE_MC 0)
 endif()
-if(enable_model-checking AND HAVE_MMALLOC)
+
+if(enable_model-checking)
   SET(HAVE_MC 1)
-  include(FindLibunwind)
-  include(FindLibdw)
+  
+  include(FindLibdw)  
+  SET(SIMGRID_DEP "${SIMGRID_DEP} -ldw")
 else()
-  if(enable_model-checking)
-    message(STATUS "Warning: support for model-checking has been disabled because you are missing either mmap or __thread.")
-  endif()
-  SET(HAVE_MC 0)
-  SET(HAVE_MMALLOC 0)
+  SET(HAVE_MC 0)  
 endif()
 
 if (enable_model-checking AND enable_ns3)

diff --git a/src/surf/VirtualMachineImpl.cpp b/src/surf/VirtualMachineImpl.cpp
index a2ab12e..8ad7f58 100644 (file)
--- a/src/surf/VirtualMachineImpl.cpp
+++ b/src/surf/VirtualMachineImpl.cpp
@@ -139,6 +139,8 @@ VirtualMachineImpl::~VirtualMachineImpl()
   /* Free the cpu_action of the VM. */
   XBT_ATTRIB_UNUSED int ret = action_->unref();
   xbt_assert(ret == 1, "Bug: some resource still remains");
+
+  delete piface_->pimpl_cpu;
 }
 
 e_surf_vm_state_t VirtualMachineImpl::getState()

diff --git a/tools/cmake/MakeLib.cmake b/tools/cmake/MakeLib.cmake
index 19f9452..67b6933 100644 (file)
--- a/tools/cmake/MakeLib.cmake
+++ b/tools/cmake/MakeLib.cmake
@@ -20,7 +20,6 @@ endif()
 
 # Compute the dependencies of SimGrid
 #####################################
-set(SIMGRID_DEP "-lm")
 if (HAVE_BOOST_CONTEXTS)
   set(SIMGRID_DEP "${SIMGRID_DEP} ${Boost_CONTEXT_LIBRARY}")
 endif()
@@ -70,23 +69,6 @@ if(HAVE_GRAPHVIZ)
   endif()
 endif()
 
-if(HAVE_MC)
-  # The availability of libunwind was checked in CompleteInFiles.cmake
-  #   (that includes FindLibunwind.cmake), so simply load it now.
-
-  SET(SIMGRID_DEP "${SIMGRID_DEP} -lunwind -lunwind-ptrace")
-
-  # Same for libdw
-  SET(SIMGRID_DEP "${SIMGRID_DEP} -ldw")
-  # This supposes that the host machine is either an AMD or a X86.
-  # This is deeply wrong, and should be fixed by manually loading -lunwind-PLAT (FIXME)
-  if(PROCESSOR_x86_64)
-    SET(SIMGRID_DEP "${SIMGRID_DEP} -lunwind-x86_64")
-  else()
-    SET(SIMGRID_DEP "${SIMGRID_DEP} -lunwind-x86")
-  endif()
-endif()
-
 if(HAVE_MC AND HAVE_GNU_LD)
   SET(SIMGRID_DEP "${SIMGRID_DEP} ${DL_LIBRARY}")
 endif()

diff --git a/tools/cmake/Modules/FindLibunwind.cmake b/tools/cmake/Modules/FindLibunwind.cmake
index 70f3ecf..67bcde6 100644 (file)
--- a/tools/cmake/Modules/FindLibunwind.cmake
+++ b/tools/cmake/Modules/FindLibunwind.cmake
@@ -64,8 +64,9 @@ if(PATH_LIBUNWIND_LIB AND PATH_LIBUNWIND_H)
       
   include_directories(${PATH_LIBUNWIND_H})
   link_directories(${PATH_LIBUNWIND_LIB})
+  SET(HAVE_LIBUNWIND 1)
 else()
-  message(FATAL_ERROR "Please either install the libunwind7-dev package (or equivalent) or turn off the model-checking option of SimGrid.")
+  SET(HAVE_LIBUNWIND 0)
 endif()
 
 mark_as_advanced(PATH_LIBDW_H)

diff --git a/tools/cmake/src/internal_config.h.in b/tools/cmake/src/internal_config.h.in
index c09fdc1..2f61c56 100644 (file)
--- a/tools/cmake/src/internal_config.h.in
+++ b/tools/cmake/src/internal_config.h.in
@@ -71,3 +71,4 @@
 /* Other checks */
 #cmakedefine ADDR2LINE       "@ADDR2LINE@" /* Path to the addr2line tool */
 #define HAVE_GRAPHVIZ   @HAVE_GRAPHVIZ@ /* The graphviz library */
+#define HAVE_LIBUNWIND  @HAVE_LIBUNWIND@ /* The lib unwind library (for MC and backtrace display) */
\ No newline at end of file