From: Martin Quinson <martin.quinson@loria.fr>
Date: Tue, 21 Nov 2017 23:15:16 +0000 (+0100)
Subject: Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
X-Git-Tag: v3.18~272
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/82230d737404aa70c3c2b5824d97109f1f129d58?hp=-c

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

82230d737404aa70c3c2b5824d97109f1f129d58
diff --combined .gitignore
index d342dc42ac,7c78757723..e0eb0b8fa8
--- a/.gitignore
+++ b/.gitignore
@@@ -209,7 -209,6 +209,7 @@@ examples/s4u/basic/s4u-basi
  examples/s4u/basic/s4u-basic_deployment
  examples/s4u/basic/s4u-basic_function
  examples/s4u/dht-chord/s4u-dht-chord
 +examples/s4u/energy-link/s4u-energy-link
  examples/s4u/io/s4u-io
  examples/s4u/mutex/s4u-mutex
  examples/s4u/plugin-hostload/s4u-plugin-hostload
@@@ -1078,7 -1077,6 +1078,6 @@@ teshsuite/surf/lmm_usage/lmm_usag
  teshsuite/surf/maxmin_bench/maxmin_bench
  teshsuite/surf/surf_usage/surf_usage
  teshsuite/surf/surf_usage2/surf_usage2
- teshsuite/xbt/heap_bench/heap_bench
  teshsuite/xbt/log_large/log_large
  teshsuite/xbt/log_usage/log_usage
  teshsuite/xbt/mallocator/mallocator
diff --combined src/surf/network_interface.cpp
index 6521cfd300,fdb7f86259..54c4bb8e5f
--- a/src/surf/network_interface.cpp
+++ b/src/surf/network_interface.cpp
@@@ -30,13 -30,6 +30,13 @@@ namespace simgrid 
    {
      return links->size();
    }
 +  void LinkImpl::linksList(std::vector<s4u::Link*>* linkList)
 +  {
 +    for (auto const& kv : *links) {
 +      linkList->push_back(&kv.second->piface_);
 +    }
 +  }
 +
    /** @brief Returns a list of all existing links */
    LinkImpl** LinkImpl::linksList()
    {
@@@ -70,7 -63,6 +70,6 @@@ namespace simgrid 
      NetworkModel::~NetworkModel()
      {
        lmm_system_free(maxminSystem_);
-       xbt_heap_free(actionHeap_);
        delete modifiedSet_;
      }
  
@@@ -90,7 -82,7 +89,7 @@@
      {
        double minRes = Model::nextOccuringEventFull(now);
  
-       for(auto it(getRunningActionSet()->begin()), itend(getRunningActionSet()->end()); it != itend ; it++) {
+       for (auto it(getRunningActionSet()->begin()); it != getRunningActionSet()->end(); it++) {
          NetworkAction *action = static_cast<NetworkAction*>(&*it);
          if (action->latency_ > 0)
            minRes = (minRes < 0) ? action->latency_ : std::min(minRes, action->latency_);
diff --combined tools/cmake/DefinePackages.cmake
index 8b29daf88a,a4e4ce8e9a..cff4bca7cc
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@@ -6,7 -6,6 +6,6 @@@ set(EXTRA_DIS
    src/include/mc/datatypes.h
    src/include/mc/mc.h
    src/include/simgrid/sg_config.h
-   src/include/smpi/smpi_utils.hpp
    src/include/surf/datatypes.h
    src/include/surf/maxmin.hpp
    src/include/surf/surf.hpp
@@@ -35,6 -34,7 +34,7 @@@
    src/smpi/colls/colls_private.hpp
    src/smpi/colls/smpi_mvapich2_selector_stampede.hpp
    src/smpi/include/private.hpp
+   src/smpi/include/smpi_utils.hpp
    src/surf/cpu_cas01.hpp
    src/surf/cpu_interface.hpp
    src/surf/cpu_ti.hpp
@@@ -71,7 -71,6 +71,6 @@@
    src/xbt/backtrace_linux.cpp
    src/xbt/dict_private.h
    src/xbt/graph_private.h
-   src/xbt/heap_private.h
    src/xbt/log_private.h
    src/xbt/mallocator_private.h
  
@@@ -275,7 -274,6 +274,6 @@@ set(XBT_SR
    src/xbt/ex.cpp
    src/xbt/exception.cpp
    src/xbt/graph.c
-   src/xbt/heap.c
    src/xbt/log.c
    src/xbt/mallocator.c
    src/xbt/memory_map.cpp
@@@ -346,7 -344,6 +344,7 @@@ set(SURF_SR
    src/surf/network_constant.cpp
    src/surf/network_interface.cpp
    src/surf/plugins/host_energy.cpp
 +  src/surf/plugins/link_energy.cpp
    src/surf/plugins/host_load.cpp
    src/surf/PropertyHolder.cpp
    src/surf/sg_platf.cpp
@@@ -727,7 -724,6 +725,6 @@@ set(headers_to_instal
    include/xbt/function_types.h
    include/xbt/future.hpp
    include/xbt/graph.h
-   include/xbt/heap.h
    include/xbt/log.h
    include/xbt/log.hpp
    include/xbt/mallocator.h