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

diff --git a/.gitignore b/.gitignore
index c611ce7..5c2ec2a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -94,12 +94,6 @@ doc/footer.html
 *.doc.toc
 doc/latex/
 doc/html
-doc/user_guide/html
-doc/user_guide/latex
-doc/ref_guide/html
-doc/ref_guide/latex
-doc/dev_guide/html
-doc/dev_guide/latex
 doc/index.php
 doc/simgrid.tag
 doc/doxygen/logcategories.doc

diff --git a/ChangeLog b/ChangeLog
index 00c3ebe..181c147 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-SimGrid (3.9) NOT RELEASED; urgency=low
+SimGrid (3.9) stable; urgency=low
 
  The Grasgory release: GRAS is really dead now.
 
@@ -48,7 +48,7 @@ SimGrid (3.9) NOT RELEASED; urgency=low
    congestion window) to a more realistic 4MiB value. If you notice changes in
    your simulation results, you can fall back to the previous 20k tiny window
    by adding --cfg=network/TCP_gamma:20000 on command line.
- * Bug fix about the way periodic availability/state traces are handled.
+ * (Hopefully) fix a bug wrt periodic availability and state traces
  * Bug fix: use default values at start when first event in availability/state
    trace is not at time 0.
 
@@ -72,7 +72,7 @@ SimGrid (3.9) NOT RELEASED; urgency=low
  TRACING:
  * Transfer the tracing files into the corresponding modules.
 
- -- $date Da SimGrid team <simgrid-devel@lists.gforge.inria.fr>
+ -- Tue Jan 29 19:38:56 CET 2013 Da SimGrid team <simgrid-devel@lists.gforge.inria.fr>
 
 SimGrid (3.8.1) stable; urgency=low
 

diff --git a/NEWS b/NEWS
index 221a8f8..d7f271c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,11 +3,13 @@ __   _____ _ __ ___(_) ___  _ __   |___ // _ \
 \ \ / / _ \ '__/ __| |/ _ \| '_ \    |_ \ (_) |
  \ V /  __/ |  \__ \ | (_) | | | |  ___) \__, |
   \_/ \___|_|  |___/_|\___/|_| |_| |____(_)/_/
+                Jan 29 2013
 
 The "Grasgory" release. Major changes:
 
  * Gras was completely removed from this version.
  * Documentation reorganization to ease browsing it.
+ * New default value for the TCP_gamma parameter: 4MiB
 
                     _               _____  ___   _
 __   _____ _ __ ___(_) ___  _ __   |___ / ( _ ) / |

diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake
index e71e814..2305926 100644 (file)
--- a/buildtools/Cmake/AddTests.cmake
+++ b/buildtools/Cmake/AddTests.cmake
@@ -413,7 +413,7 @@ if(NOT enable_memcheck)
         set_tests_properties(mc-centralized-raw PROPERTIES WILL_FAIL true)
       endif()
     endif()
-
+    set_tests_properties(msg-masterslave-virtual-machines PROPERTIES WILL_FAIL true)
   endif()
 
 endif()

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index 9c58bb2..65a93c8 100644 (file)
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -107,7 +107,7 @@ set(SMPI_SRC
   src/smpi/smpi_pmpi.c
   src/smpi/smpi_replay.c
   )
-  
+
 if(SMPI_F2C)
   set(SMPI_SRC
     ${SMPI_SRC}
@@ -533,52 +533,69 @@ endif()
 
 set(DOC_SOURCES
   doc/AS_hierarchy.png
+  doc/Doxyfile.in
+  doc/Layout.xml
   doc/sg_thread_model.fig
   doc/simix.fig
   doc/surf_nutshell.fig
-  doc/Doxyfile.in
-  doc/Layout.xml
   doc/triva-graph_configuration.png
   doc/triva-graph_visualization.png
   doc/triva-time_interval.png
-  
-    doc/doxygen/footer.html
-  doc/doxygen/header.html
-  doc/doxygen/stylesheet.css
-  
-  doc/doxygen/index.doc
-  doc/doxygen/getting_started.doc  
-  doc/doxygen/introduction.doc
-  doc/doxygen/use.doc
+
+  doc/doxygen/FAQ.doc
+  doc/doxygen/advanced.doc
   doc/doxygen/bindings.doc
+  doc/doxygen/contributing.doc
   doc/doxygen/deployment.doc
+  doc/doxygen/footer.html
+  doc/doxygen/getting_started.doc
+  doc/doxygen/header.html
+  doc/doxygen/help.doc
+  doc/doxygen/index.doc
+  doc/doxygen/inside_autotests.doc
+  doc/doxygen/inside_cmake.doc
+  doc/doxygen/inside_doxygen.doc
+  doc/doxygen/inside_extending.doc
+  doc/doxygen/inside_release.doc
   doc/doxygen/install.doc
+  doc/doxygen/internals.doc
+  doc/doxygen/introduction.doc
+  doc/doxygen/module-msg.doc
+  doc/doxygen/module-sd.doc
+  doc/doxygen/module-simix.doc
+  doc/doxygen/module-surf.doc
+  doc/doxygen/module-trace.doc
+  doc/doxygen/module-xbt.doc
+  doc/doxygen/modules.doc
   doc/doxygen/options.doc
   doc/doxygen/platform.doc
   doc/doxygen/pls.doc
+  doc/doxygen/stylesheet.css
   doc/doxygen/tracing.doc
-  doc/doxygen/FAQ.doc
-  doc/doxygen/advanced.doc
-    doc/doxygen/inside_autotests.doc  
-    doc/doxygen/inside_cmake.doc
-    doc/doxygen/inside_extending.doc 
-    doc/doxygen/inside_release.doc
-    doc/doxygen/contributing.doc
-  doc/doxygen/modules.doc
-    doc/doxygen/module-msg.doc
-    doc/doxygen/module-sd.doc
-    doc/doxygen/module-simix.doc
-    doc/doxygen/module-surf.doc
-    doc/doxygen/module-trace.doc
-    doc/doxygen/module-xbt.doc
+  doc/doxygen/use.doc
 
+  doc/msg-tuto-src/deployment0.xml
+  doc/msg-tuto-src/deployment1.xml
+  doc/msg-tuto-src/deployment2.xml
+  doc/msg-tuto-src/deployment3.xml
+  doc/msg-tuto-src/deployment_general.xml
+  doc/msg-tuto-src/masterworker0.c
+  doc/msg-tuto-src/masterworker1.c
+  doc/msg-tuto-src/masterworker2.c
+  doc/msg-tuto-src/masterworker3.c
+  doc/msg-tuto-src/masterworker4.c
+  doc/msg-tuto-src/platforms/cloud.xml
+  doc/msg-tuto-src/platforms/g5k.xml
+  doc/msg-tuto-src/platforms/griffon.xml
+  doc/msg-tuto-src/platforms/peers.xml
+  doc/msg-tuto-src/platforms/platform.xml
   )
 
 set(DOC_FIGS
   ${CMAKE_HOME_DIRECTORY}/doc/shared/fig/simgrid_modules.fig
   ${CMAKE_HOME_DIRECTORY}/doc/shared/fig/simgrid_modules2.fig
   )
-  
+
 set(DOC_TOOLS
   tools/doxygen/fig2dev_postprocessor.pl
   tools/doxygen/index_create.pl

diff --git a/buildtools/Cmake/Distrib.cmake b/buildtools/Cmake/Distrib.cmake
index ba1fc9c..426ef52 100644 (file)
--- a/buildtools/Cmake/Distrib.cmake
+++ b/buildtools/Cmake/Distrib.cmake
@@ -3,24 +3,9 @@
 #########################################
 
 # doc
-file(MAKE_DIRECTORY ${CMAKE_HOME_DIRECTORY}/doc/shared/doxygen/)
-file(MAKE_DIRECTORY ${CMAKE_HOME_DIRECTORY}/doc/ref_guide/html/)
-
-install(DIRECTORY "${CMAKE_HOME_DIRECTORY}/doc/ref_guide/html/"
-  DESTINATION "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/doc/simgrid/ref_guide/html/"
-  PATTERN ".svn" EXCLUDE
-  PATTERN ".git" EXCLUDE
-  PATTERN "*.o" EXCLUDE
-  PATTERN "*~" EXCLUDE
-  )
-
-install(DIRECTORY "${CMAKE_HOME_DIRECTORY}/doc/user_guide/html/"
-  DESTINATION "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/doc/simgrid/user_guide/html/"
-  PATTERN ".svn" EXCLUDE
-  PATTERN ".git" EXCLUDE
-  PATTERN "*.o" EXCLUDE
-  PATTERN "*~" EXCLUDE
-  )
+file(MAKE_DIRECTORY ${CMAKE_HOME_DIRECTORY}/doc/html/)
+install(DIRECTORY "${CMAKE_HOME_DIRECTORY}/doc/html/"
+  DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/doc/html/)
 
 #### Generate the manpages
 if(NOT WIN32)
@@ -229,10 +214,6 @@ add_custom_target(dist-dir
   COMMAND ${CMAKE_COMMAND} -E remove_directory ${PROJECT_NAME}-${release_version}/
   COMMAND ${CMAKE_COMMAND} -E remove ${PROJECT_NAME}-${release_version}.tar.gz
   COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_NAME}-${release_version}
-  COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_NAME}-${release_version}/doc/user_guide/html/
-  COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_NAME}-${release_version}/doc/ref_guide/html/
-  COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_HOME_DIRECTORY}/doc/user_guide/html/ ${PROJECT_NAME}-${release_version}/doc/user_guide/html/
-  COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_HOME_DIRECTORY}/doc/ref_guide/html/ ${PROJECT_NAME}-${release_version}/doc/ref_guide/html/
   )
 add_dependencies(dist-dir simgrid_documentation)
 add_dependencies(dist-dir maintainer_files)
@@ -321,7 +302,7 @@ add_custom_target(distcheck
   COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_TEST_DIR}/${PROJECT_NAME}-${release_version}/_build ${CMAKE_MAKE_PROGRAM}
 
   COMMAND ${CMAKE_COMMAND} -E echo "XXX Test"
-  COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_TEST_DIR}/${PROJECT_NAME}-${release_version}/_build ctest || true
+  COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_TEST_DIR}/${PROJECT_NAME}-${release_version}/_build ctest
 
   COMMAND ${CMAKE_COMMAND} -E echo "XXX Install"
   COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_TEST_DIR}/${PROJECT_NAME}-${release_version}/_build ${CMAKE_MAKE_PROGRAM} install
@@ -329,6 +310,12 @@ add_custom_target(distcheck
   ${CMAKE_BINARY_TEST_DIR}/${PROJECT_NAME}-${release_version}/_inst/lib/libsimgrid.so
   ${CMAKE_BINARY_TEST_DIR}/${PROJECT_NAME}-${release_version}/_inst/lib/libsimgridtest.so
 
+  COMMAND ${CMAKE_COMMAND} -E echo "XXX Build documentation"
+  COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_TEST_DIR}/${PROJECT_NAME}-${release_version}/_build ${CMAKE_MAKE_PROGRAM} simgrid_documentation
+
+  COMMAND ${CMAKE_COMMAND} -E echo "XXX Install with documentation"
+  COMMAND ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_TEST_DIR}/${PROJECT_NAME}-${release_version}/_build ${CMAKE_MAKE_PROGRAM} install
+
   COMMAND ${CMAKE_COMMAND} -E echo "XXX Remove temp directories"
   COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_BINARY_TEST_DIR}/${PROJECT_NAME}-${release_version}
   )

diff --git a/buildtools/Cmake/MaintainerMode.cmake b/buildtools/Cmake/MaintainerMode.cmake
index 985d093..48282b1 100644 (file)
--- a/buildtools/Cmake/MaintainerMode.cmake
+++ b/buildtools/Cmake/MaintainerMode.cmake
@@ -1,3 +1,10 @@
+# Change the following when we need a recent enough version of flexml to get the maintainer mode working
+set(FLEXML_MIN_MAJOR 1)
+set(FLEXML_MIN_MINOR 9)
+set(FLEXML_MIN_PATCH 6)
+
+# the rest should only be changed if you understand what you're doing
+
 if(enable_maintainer_mode AND NOT WIN32)
   find_program(FLEX_EXE NAMES flex)
   find_program(FLEXML_EXE NAMES flexml)
@@ -50,9 +57,15 @@ if(enable_maintainer_mode AND NOT WIN32)
   IF(FLEXML_EXE)
     set(HAVE_FLEXML 1)
     exec_program("${FLEXML_EXE} --version" OUTPUT_VARIABLE FLEXML_VERSION)
-    string(REGEX MATCH "[0-9]+[.]+[0-9]+" FLEXML_VERSION "${FLEXML_VERSION}")
+    if (FLEXML_VERSION MATCHES "version Id:")
+      message(FATAL_ERROR "You have an ancient flexml version (${FLEXML_VERSION}). You need at least v${FLEXML_MIN_MAJOR}.${FLEXML_MIN_MINOR}.${FLEXML_MIN_PATCH} to compile in maintainer mode. Upgrade your flexml, or disable the Maintainer mode option in cmake.")
+    endif()
+ 
+    string(REGEX MATCH "[0-9]+[.]+[0-9]+[.]+[0-9]+" FLEXML_VERSION "${FLEXML_VERSION}")
     string(REGEX MATCH "^[0-9]*" FLEXML_MAJOR_VERSION "${FLEXML_VERSION}")
-    string(REGEX MATCH "[0-9]*$" FLEXML_MINOR_VERSION "${FLEXML_VERSION}")
+    string(REGEX MATCH "[0-9]+[.]+[0-9]+$" FLEXML_VERSION "${FLEXML_VERSION}")
+    string(REGEX MATCH "^[0-9]+" FLEXML_MINOR_VERSION "${FLEXML_VERSION}")
+    string(REGEX MATCH "[0-9]+$" FLEXML_PATCH_VERSION "${FLEXML_VERSION}")
   ENDIF()
 
   message(STATUS "Found flex: ${FLEX_EXE}")
@@ -62,7 +75,17 @@ if(enable_maintainer_mode AND NOT WIN32)
   if(HAVE_FLEXML AND HAVE_FLEX AND SED_EXE)
 
     message(STATUS "Flex version: ${FLEX_MAJOR_VERSION}.${FLEX_MINOR_VERSION}.${FLEX_PATCH_VERSION}")
-    message(STATUS "Flexml version: ${FLEXML_MAJOR_VERSION}.${FLEXML_MINOR_VERSION}")
+    message(STATUS "Flexml version: ${FLEXML_MAJOR_VERSION}.${FLEXML_MINOR_VERSION}.${FLEXML_PATCH_VERSION} (need at least version ${FLEXML_MIN_MAJOR}.${FLEXML_MIN_MINOR}.${FLEXML_MIN_PATCH})")
+
+    IF(     (${FLEXML_MAJOR_VERSION} LESS ${FLEXML_MIN_MAJOR}) 
+        OR ((${FLEXML_MAJOR_VERSION} EQUAL ${FLEXML_MIN_MAJOR}) AND (${FLEXML_MINOR_VERSION} LESS ${FLEXML_MIN_MINOR}) )
+        OR (    (${FLEXML_MAJOR_VERSION} EQUAL ${FLEXML_MIN_MAJOR}) 
+           AND (${FLEXML_MINOR_VERSION} EQUAL ${FLEXML_MIN_MINOR}) 
+           AND (${FLEXML_PATCH_VERSION} LESS ${FLEXML_MIN_PATCH}) ))
+
+      message(FATAL_ERROR "Your flexml version is too old to compile in maintainer mode (need at least v${FLEXML_MIN_MAJOR}.${FLEXML_MIN_MINOR}.${FLEXML_MIN_PATCH}). Upgrade your flexml, or disable the Maintainer mode option in cmake.")
+      
+    ENDIF()
 
     set(string1  "'s/extern  *\\([^ ]*[ \\*]*\\)/XBT_PUBLIC_DATA(\\1) /'")
     set(string2  "'s/XBT_PUBLIC_DATA(\\([^)]*\\)) *\\([^(]*\\)(/XBT_PUBLIC(\\1) \\2(/'")

diff --git a/buildtools/Cmake/src/internal_config.h.in b/buildtools/Cmake/src/internal_config.h.in
index bf62388..6bb2129 100644 (file)
--- a/buildtools/Cmake/src/internal_config.h.in
+++ b/buildtools/Cmake/src/internal_config.h.in
@@ -1,5 +1,13 @@
-// <root>/buildtools/Cmake/internal_config.h.in is user-written.
-// With Cmake it creates <root>/src/internal_config.h
+/* internal_config.h -- characteristics of the platform, as probed by Cmake */
+
+/* This file is AUTOMATICALLY GENERATED by Cmake. Edit the following
+   template instead buildtools/Cmake/src/internal_config.h.in               */
+
+/* Copyright (c) 2004-2013. The SimGrid Team. All rights reserved.          */
+
+/* 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. */
+
 
 /* Set somes variables for Windows compilation */
 
@@ -288,9 +296,6 @@
 /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
 #cmakedefine TIME_WITH_SYS_TIME @TIME_WITH_SYS_TIME@
 
-/* Version number of package */
-#cmakedefine VERSION @VERSION@
-
 /* Tracing SimGrid */
 #cmakedefine HAVE_TRACING @HAVE_TRACING@
 

diff --git a/doc/doxygen/header.html b/doc/doxygen/header.html
index 00e49a8..af40754 100644 (file)
--- a/doc/doxygen/header.html
+++ b/doc/doxygen/header.html
@@ -50,7 +50,7 @@ $mathjax
 <div id="navrow1" class="tabs">
     <ul class="tablist">
       <li><a href="http://simgrid.gforge.inria.fr/"><span>Home page</span></a></li>
-      <li><a href="http://simgrid.gforge.inria.fr/tutorials.html"><span>Tutorials</span></a></li>
+      <li><a href="http://simgrid.gforge.inria.fr/documentation.html"><span>Online documentation</span></a></li>
       <li><a href="https://gforge.inria.fr/projects/simgrid"><span>Dev's Corner</span></a></li>
       <li>$searchbox</li>
     </ul>

diff --git a/doc/doxygen/index-API.doc b/doc/doxygen/index-API.doc
deleted file mode 100644 (file)
index aa50773..0000000
--- a/doc/doxygen/index-API.doc
+++ /dev/null
@@ -1,13 +0,0 @@
-This file was generated by tools/doxygen/index_create.pl. DO NOT EDIT.
-
-/** \defgroup API_index Full Index
-  * \brief The alphabetical list of all functions, macros and types 
-  *  defined by SimGrid
-  *
-  * List of all functions, variables, defines, enums, and typedefs with
-  * links to the files they belong to. 
-  *
-  * \htmlonly Altough completely useless, the complete list of structures defined can be found <a href="annotated.html">here</a> \endhtmlonly
-
-
-*/
\ No newline at end of file

diff --git a/doc/doxygen/install.doc b/doc/doxygen/install.doc
index 380f3c7..d65ddad 100644 (file)
--- a/doc/doxygen/install.doc
+++ b/doc/doxygen/install.doc
@@ -15,9 +15,9 @@ SimGrid has very few dependencies and rely only on very standard
 tools. Recompiling the archive should be done in a few lines:
 
 @verbatim
-wget https://gforge.inria.fr/frs/download.php/28674/simgrid-3.8.1.tar.gz
-tar xf simgrid-3.8.1.tar.gz
-cd simgrid-3.8.1
+wget https://gforge.inria.fr/frs/download.php/28674/SimGrid-3.9.tar.gz
+tar xf SimGrid-3.9.tar.gz
+cd SimGrid-3.9
 cmake -DCMAKE_INSTALL_PREFIX=/opt/simgrid .
 make
 make install

diff --git a/examples/msg/chainsend/CMakeLists.txt b/examples/msg/chainsend/CMakeLists.txt
index 2272988..26ff3cb 100644 (file)
--- a/examples/msg/chainsend/CMakeLists.txt
+++ b/examples/msg/chainsend/CMakeLists.txt
@@ -14,7 +14,7 @@ set(tesh_files
   )
 set(xml_files
   ${xml_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/deployment_chainsend.xml
+  ${CMAKE_CURRENT_SOURCE_DIR}/deployment_tesh.xml
   ${CMAKE_CURRENT_SOURCE_DIR}/platform_chainsend.xml
   PARENT_SCOPE
   )

diff --git a/examples/msg/chainsend/deployment_chainsend.xml b/examples/msg/chainsend/deployment_chainsend.xml
deleted file mode 100644 (file)
index e190c88..0000000
--- a/examples/msg/chainsend/deployment_chainsend.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
-<platform version="3"><!-- For using with chainsend, platform_chainsend.xml -->
-
-  <!-- Broadcaster -->
-  <process host="host0" function="broadcaster">
-       <argument value="8"/> <!-- number of peers -->
-  </process>
-
-  <!-- Peers -->
-  <process host="host1" function="peer">
-       <argument value="1"/>
-  </process>
-  <process host="host2" function="peer">
-       <argument value="2"/>
-  </process>
-  <process host="host3" function="peer">
-       <argument value="3"/>
-  </process>
-  <process host="host4" function="peer">
-       <argument value="4"/>
-  </process>
-  <process host="host5" function="peer">
-       <argument value="5"/>
-  </process>
-  <process host="host6" function="peer">
-       <argument value="6"/>
-  </process>
-  <process host="host7" function="peer">
-       <argument value="7"/>
-  </process>
-  <process host="host8" function="peer">
-       <argument value="8"/>
-  </process>
-  <!--<process host="host9" function="peer">
-       <argument value="9"/>
-  </process>-->
-</platform>

diff --git a/examples/msg/kademlia/answer.c b/examples/msg/kademlia/answer.c
index 4eb095f..712b6fa 100644 (file)
--- a/examples/msg/kademlia/answer.c
+++ b/examples/msg/kademlia/answer.c
@@ -78,7 +78,13 @@ static int _answer_sort_function(const void *e1, const void *e2)
 {
   node_contact_t c1 = *(void **) e1;
   node_contact_t c2 = *(void **) e2;
-  return c1->distance >= c2->distance;
+  if (c1->distance == c2->distance)
+    return 0;
+  else
+    if (c1->distance < c2->distance)
+      return -1;
+    else
+      return 1;
 }
 
 /**

diff --git a/examples/simdag/CMakeLists.txt b/examples/simdag/CMakeLists.txt
index d177379..afb0ab6 100644 (file)
--- a/examples/simdag/CMakeLists.txt
+++ b/examples/simdag/CMakeLists.txt
@@ -57,11 +57,11 @@ set(tesh_files
   ${tesh_files}
   ${CMAKE_CURRENT_SOURCE_DIR}/test_simdag.tesh
   ${CMAKE_CURRENT_SOURCE_DIR}/test_simdag2.tesh
-  ${CMAKE_CURRENT_SOURCE_DIR}/test_simdag2_lua.tesh
   ${CMAKE_CURRENT_SOURCE_DIR}/test_simdag_comm_throttling.tesh
   ${CMAKE_CURRENT_SOURCE_DIR}/test_simdag_seq_access.tesh
   ${CMAKE_CURRENT_SOURCE_DIR}/test_simdag_tracing.tesh
   ${CMAKE_CURRENT_SOURCE_DIR}/test_simdag_typed_tasks.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/test_simdag_avail.tesh
   ${CMAKE_CURRENT_SOURCE_DIR}/test_simdag_fail.tesh
   PARENT_SCOPE
   )

diff --git a/src/simdag/sd_global.c b/src/simdag/sd_global.c
index b10b000..233706a 100644 (file)
--- a/src/simdag/sd_global.c
+++ b/src/simdag/sd_global.c
@@ -138,6 +138,9 @@ void SD_application_reinit(void)
         xbt_dynar_length(done_task->tasks_before);
       done_task->is_not_ready = done_task->unsatisfied_dependencies;
     }
+    free(done_task->workstation_list);
+    done_task->workstation_list = NULL;
+    done_task->workstation_nb = 0;
   }
 
   xbt_swag_free(sd_global->done_task_set);
@@ -158,6 +161,7 @@ void SD_application_reinit(void)
 
 
 #ifdef HAVE_JEDULE
+  jedule_sd_dump();
   jedule_sd_cleanup();
   jedule_sd_init();
 #endif

diff --git a/src/surf/storage.c b/src/surf/storage.c
index ff82779..6c4e2ab 100644 (file)
--- a/src/surf/storage.c
+++ b/src/surf/storage.c
@@ -594,20 +594,22 @@ static xbt_dict_t parse_storage_content(char *filename, unsigned long *used_size
   surf_stat_t content;
 
   while ((read = getline(&line, &len, file)) != -1) {
+    if (read){
     content = xbt_new0(s_surf_stat_t,1);
     if(sscanf(line,"%s %d %s %s %ld %s %s %s",user_rights,&nb,user,group,&size,date,time,path)==8) {
-      content->stat.date = xbt_strdup(date);
-      content->stat.group = xbt_strdup(group);
-      content->stat.size = size;
-      content->stat.time = xbt_strdup(time);
-      content->stat.user = xbt_strdup(user);
-      content->stat.user_rights = xbt_strdup(user_rights);
-      *used_size += content->stat.size;
-      xbt_dict_set(parse_content,path,content,NULL);
-    } else {
-      xbt_die("Be sure of passing a good format for content file.\n");
-      // You can generate this kind of file with command line:
-      // find /path/you/want -type f -exec ls -l {} \; 2>/dev/null > ./content.txt
+        content->stat.date = xbt_strdup(date);
+        content->stat.group = xbt_strdup(group);
+        content->stat.size = size;
+        content->stat.time = xbt_strdup(time);
+        content->stat.user = xbt_strdup(user);
+        content->stat.user_rights = xbt_strdup(user_rights);
+        *used_size += content->stat.size;
+        xbt_dict_set(parse_content,path,content,NULL);
+      } else {
+        xbt_die("Be sure of passing a good format for content file.\n");
+        // You can generate this kind of file with command line:
+        // find /path/you/want -type f -exec ls -l {} \; 2>/dev/null > ./content.txt
+      }
     }
   }
   if (line)

diff --git a/src/xbt/log.c b/src/xbt/log.c
index 94f7c60..adaa919 100644 (file)
--- a/src/xbt/log.c
+++ b/src/xbt/log.c
@@ -548,6 +548,7 @@ static void xbt_log_connect_categories(void)
   XBT_LOG_CONNECT(xbt_ex);
   XBT_LOG_CONNECT(xbt_fifo);
   XBT_LOG_CONNECT(xbt_graph);
+  XBT_LOG_CONNECT(xbt_heap);
   XBT_LOG_CONNECT(xbt_lib);
   XBT_LOG_CONNECT(xbt_mallocator);
   XBT_LOG_CONNECT(xbt_matrix);

diff --git a/teshsuite/smpi/CMakeLists.txt b/teshsuite/smpi/CMakeLists.txt
index 6484293..7674959 100644 (file)
--- a/teshsuite/smpi/CMakeLists.txt
+++ b/teshsuite/smpi/CMakeLists.txt
@@ -62,6 +62,7 @@ endif()
 set(tesh_files
   ${tesh_files}
   ${CMAKE_CURRENT_SOURCE_DIR}/bcast.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/compute.tesh
   ${CMAKE_CURRENT_SOURCE_DIR}/hvector.tesh
   ${CMAKE_CURRENT_SOURCE_DIR}/indexed.tesh
   ${CMAKE_CURRENT_SOURCE_DIR}/pt2pt.tesh