Merge branch 'master' into depencencies

diff --git a/examples/deprecated/java/cloud/migration/Daemon.java b/examples/deprecated/java/cloud/migration/Daemon.java
index 7013adb..d5fe01f 100644 (file)
--- a/examples/deprecated/java/cloud/migration/Daemon.java
+++ b/examples/deprecated/java/cloud/migration/Daemon.java
@@ -18,7 +18,6 @@ public class Daemon extends Process {
   public void main(String[] args) throws MsgException {
     int i = 1;
     while(!Main.isEndOfTest()) {
-      // TODO the binding is not yet available
     try {
       currentTask.execute();
     } catch (HostFailureException e) {

diff --git a/src/mc/ModelChecker.hpp b/src/mc/ModelChecker.hpp
index 50af859..53ff36b 100644 (file)
--- a/src/mc/ModelChecker.hpp
+++ b/src/mc/ModelChecker.hpp
@@ -25,7 +25,6 @@ class ModelChecker {
   struct event* socket_event_ = nullptr;
   struct event* signal_event_ = nullptr;
   /** String pool for host names */
-  // TODO, use std::set with heterogeneous comparison lookup (C++14)?
   std::set<std::string> hostnames_;
   // This is the parent snapshot of the current state:
   PageStore page_store_{500};

diff --git a/src/smpi/bindings/smpi_f77.cpp b/src/smpi/bindings/smpi_f77.cpp
index 451dfd7..86e43b5 100644 (file)
--- a/src/smpi/bindings/smpi_f77.cpp
+++ b/src/smpi/bindings/smpi_f77.cpp
@@ -979,4 +979,16 @@ void mpi_file_write_ ( int* fh, void* buf, int* count, int* datatype, MPI_Status
   *ierr=  MPI_File_write(reinterpret_cast<MPI_File>(*fh), buf, *count, simgrid::smpi::Datatype::f2c(*datatype), status);
 }
 
+void smpi_execute_flops_(double* flops){
+  smpi_execute_flops(*flops);
+}
+
+void smpi_execute_(double* duration){
+  smpi_execute(*duration);
+}
+
+void smpi_execute_benched_(double* duration){
+  smpi_execute_benched(*duration);
+}
+
 } // extern "C"

diff --git a/src/smpi/include/private.hpp b/src/smpi/include/private.hpp
index 07c4bfd..9f6c7d1 100644 (file)
--- a/src/smpi/include/private.hpp
+++ b/src/smpi/include/private.hpp
@@ -461,6 +461,9 @@ void mpi_file_set_view_(int* fh, long long int* offset, int* etype, int* filetyp
 void mpi_file_read_(int* fh, void* buf, int* count, int* datatype, MPI_Status* status, int* ierr);
 void mpi_file_write_(int* fh, void* buf, int* count, int* datatype, MPI_Status* status, int* ierr);
 void smpi_init_fortran_types();
+void smpi_execute_flops_(double* flops);
+void smpi_execute_(double* duration);
+void smpi_execute_benched_(double* duration);
 } // extern "C"
 
 XBT_PRIVATE int smpi_temp_shm_get();

diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp
index 43a1913..8f89621 100644 (file)
--- a/src/surf/sg_platf.cpp
+++ b/src/surf/sg_platf.cpp
@@ -116,6 +116,13 @@ simgrid::kernel::routing::NetPoint* sg_platf_new_router(const std::string& name,
 
 static void sg_platf_new_link(const simgrid::kernel::routing::LinkCreationArgs* link, const std::string& link_name)
 {
+  static double last_warned_latency = sg_surf_precision;
+  if (link->latency != 0.0 && link->latency < last_warned_latency) {
+    XBT_WARN("Latency for link %s is smaller than surf/precision (%g < %g)."
+             " For more accuracy, consider setting \"--cfg=surf/precision:%g\".",
+             link_name.c_str(), link->latency, sg_surf_precision, link->latency);
+    last_warned_latency = link->latency;
+  }
   simgrid::kernel::resource::LinkImpl* l =
       surf_network_model->create_link(link_name, link->bandwidths, link->latency, link->policy);