Merge branch 'master' into hypervisor

diff --cc buildtools/Cmake/DefinePackages.cmake
Simple merge

diff --cc include/msg/msg.h
Simple merge

diff --cc include/simgrid/platf.h
Simple merge

diff --cc include/simgrid/simix.h
Simple merge

diff --cc include/xbt/ex.h
Simple merge

diff --cc src/simdag/sd_global.c
Simple merge

diff --cc src/simgrid/sg_config.c
Simple merge

diff --cc src/simix/smx_global.c
Simple merge

diff --cc src/simix/smx_network.c
Simple merge

diff --cc src/simix/smx_process.c
Simple merge

diff --cc src/simix/smx_smurf_private.h
Simple merge

diff --cc src/simix/smx_user.c
Simple merge

diff --cc src/surf/network.c
index 73d6095,2eee39c..0d7f5ba
--- 1/src/surf/network.c
--- 2/src/surf/network.c
+++ b/src/surf/network.c
@@@ -652,23 -652,22 +652,22 @@@ static int net_link_shared(const void *
        lmm_constraint_is_shared(((surf_resource_lmm_t) link)->constraint);
  }
  
 -static void net_finalize(void)
 +static void net_finalize(surf_model_t network_model)
  {
 -  lmm_system_free(surf_network_model->model_private->maxmin_system);
 -  surf_network_model->model_private->maxmin_system = NULL;
 +  lmm_system_free(network_model->model_private->maxmin_system);
 +  network_model->model_private->maxmin_system = NULL;
  
 -  if (surf_network_model->model_private->update_mechanism == UM_LAZY) {
 -    xbt_heap_free(surf_network_model->model_private->action_heap);
 -    xbt_swag_free(surf_network_model->model_private->modified_set);
 +  if (network_model->model_private->update_mechanism == UM_LAZY) {
 +    xbt_heap_free(network_model->model_private->action_heap);
 +    xbt_swag_free(network_model->model_private->modified_set);
    }
  
 -  surf_model_exit(surf_network_model);
 -  surf_network_model = NULL;
 +  surf_model_exit(network_model);
 +  network_model = NULL;
  
-   if (smpi_bw_factor)
-     xbt_dynar_free(&smpi_bw_factor);
-   if (smpi_lat_factor)
-     xbt_dynar_free(&smpi_lat_factor);
+   xbt_dict_free(&gap_lookup);
+   xbt_dynar_free(&smpi_bw_factor);
+   xbt_dynar_free(&smpi_lat_factor);
  }
  
  static void smpi_gap_append(double size, const link_CM02_t link,

diff --cc src/surf/storage.c
index 003c488,9de73f7..2e35c45
--- 1/src/surf/storage.c
--- 2/src/surf/storage.c
+++ b/src/surf/storage.c
@@@ -274,11 -272,10 +272,10 @@@ static void storage_finalize(surf_model
    lmm_system_free(storage_maxmin_system);
    storage_maxmin_system = NULL;
  
 -  surf_model_exit(surf_storage_model);
 -  surf_storage_model = NULL;
 +  surf_model_exit(storage_model);
 +  storage_model = NULL;
  
-   if(storage_list)
-     xbt_dynar_free(&storage_list);
+   xbt_dynar_free(&storage_list);
  
    xbt_swag_free
        (storage_running_action_set_that_does_not_need_being_checked);

diff --cc src/surf/workstation_ptask_L07.c
Simple merge