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

diff --git a/buildtools/Cmake/Distrib.cmake b/buildtools/Cmake/Distrib.cmake
index 70cedba..426ef52 100644 (file)
--- a/buildtools/Cmake/Distrib.cmake
+++ b/buildtools/Cmake/Distrib.cmake
@@ -302,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

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/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)