X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ad11907f9221fee26cbe223d667a33744278f46b..08f143449e19751e23fbc4e986f46f764ac03196:/src/smpi/smpi_bench.cpp

diff --git a/src/smpi/smpi_bench.cpp b/src/smpi/smpi_bench.cpp
index 3128889670..a536790ea4 100644
--- a/src/smpi/smpi_bench.cpp
+++ b/src/smpi/smpi_bench.cpp
@@ -12,6 +12,7 @@
 #include "src/internal_config.h"
 #include "private.h"
 #include "private.hpp"
+#include <xbt/ex.hpp>
 #include "xbt/dict.h"
 #include "xbt/sysdep.h"
 #include "xbt/ex.h"
@@ -97,10 +98,10 @@ namespace {
 class smpi_source_location {
 public:
   smpi_source_location(const char* filename, int line)
-    : filename(filename), filename_length(strlen(filename)), line(line) {}
+    : filename(xbt_strdup(filename)), filename_length(strlen(filename)), line(line) {}
 
   /** Pointer to a static string containing the file name */
-  const char* filename = nullptr;
+  char* filename = nullptr;
   int filename_length = 0;
   int line = 0;
 
@@ -174,7 +175,7 @@ static void* shm_map(int fd, size_t size, shared_data_key_type* data) {
 
   mem = mmap(nullptr, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
   if(mem == MAP_FAILED) {
-    xbt_die("Could not map fd %d: %s", fd, strerror(errno));
+    xbt_die("Could not map fd %d with size %zu: %s", fd, size, strerror(errno));
   }
   snprintf(loc, PTR_STRLEN, "%p", mem);
   meta.size = size;
@@ -185,7 +186,7 @@ static void* shm_map(int fd, size_t size, shared_data_key_type* data) {
 }
 #endif
 
-void smpi_bench_destroy(void)
+void smpi_bench_destroy()
 {
   allocs.clear();
   allocs_metadata.clear();
@@ -206,9 +207,9 @@ void smpi_execute_(double *duration)
 }
 
 void smpi_execute_flops(double flops) {
-  smx_synchro_t action;
+  smx_activity_t action;
   XBT_DEBUG("Handle real computation time: %f flops", flops);
-  action = simcall_execution_start("computation", flops, 1, 0, 0);
+  action = simcall_execution_start("computation", flops, 1, 0);
   simcall_set_category (action, TRACE_internal_smpi_get_category());
   simcall_execution_wait(action);
   smpi_switch_data_segment(smpi_process_index());
@@ -234,7 +235,7 @@ void smpi_execute(double duration)
   }
 }
 
-void smpi_bench_begin(void)
+void smpi_bench_begin()
 {
   if (smpi_privatize_global_variables) {
     smpi_switch_data_segment(smpi_process_index());
@@ -259,7 +260,7 @@ void smpi_bench_begin(void)
   xbt_os_threadtimer_start(smpi_process_timer());
 }
 
-void smpi_bench_end(void)
+void smpi_bench_end()
 {
   if (MC_is_active() || MC_record_replay_is_active())
     return;
@@ -402,7 +403,7 @@ int smpi_clock_gettime(clockid_t clk_id, struct timespec *tp)
 #endif
 
 extern double sg_surf_precision;
-unsigned long long smpi_rastro_resolution (void)
+unsigned long long smpi_rastro_resolution ()
 {
   smpi_bench_end();
   double resolution = (1/sg_surf_precision);
@@ -410,7 +411,7 @@ unsigned long long smpi_rastro_resolution (void)
   return static_cast<unsigned long long>(resolution);
 }
 
-unsigned long long smpi_rastro_timestamp (void)
+unsigned long long smpi_rastro_timestamp ()
 {
   smpi_bench_end();
   double now = SIMIX_get_clock();
@@ -567,7 +568,7 @@ void smpi_sample_3(int global, const char *file, int line)
 void *smpi_shared_malloc(size_t size, const char *file, int line)
 {
   void* mem;
-  if (xbt_cfg_get_boolean("smpi/use-shared-malloc")){
+  if (size > 0 && xbt_cfg_get_boolean("smpi/use-shared-malloc")){
     int fd;
     smpi_source_location loc(file, line);
     auto res = allocs.insert(std::make_pair(loc, shared_data_t()));
@@ -612,7 +613,7 @@ void smpi_shared_free(void *ptr)
     snprintf(loc, PTR_STRLEN, "%p", ptr);
     auto meta = allocs_metadata.find(ptr);
     if (meta == allocs_metadata.end()) {
-      XBT_WARN("Cannot free: %p was not shared-allocated by SMPI", ptr);
+      XBT_WARN("Cannot free: %p was not shared-allocated by SMPI - maybe its size was 0?", ptr);
       return;
     }
     shared_data_t* data = &meta->second.data->second;
@@ -620,11 +621,12 @@ void smpi_shared_free(void *ptr)
       XBT_WARN("Unmapping of fd %d failed: %s", data->fd, strerror(errno));
     }
     data->count--;
-    XBT_DEBUG("Shared free - no removal - of %p, count = %d", ptr, data->count);
     if (data->count <= 0) {
       close(data->fd);
       allocs.erase(allocs.find(meta->second.data->first));
       XBT_DEBUG("Shared free - with removal - of %p", ptr);
+    }else{
+      XBT_DEBUG("Shared free - no removal - of %p, count = %d", ptr, data->count);
     }
   }else{
     XBT_DEBUG("Classic free of %p", ptr);