X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4c8cdcc7c2a4629350cbc3d61f36d63c5bbd4341..510c97d4c651c63ef9851a7e1d9c328f62b5b00b:/src/instr/instr_private.hpp

diff --git a/src/instr/instr_private.hpp b/src/instr/instr_private.hpp
index 1fc86dbc29..35e9893ac2 100644
--- a/src/instr/instr_private.hpp
+++ b/src/instr/instr_private.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2010-2019. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -14,7 +14,6 @@
 #include "src/instr/instr_paje_events.hpp"
 #include "src/instr/instr_paje_types.hpp"
 #include "src/instr/instr_paje_values.hpp"
-#include "src/internal_config.h"
 #include "xbt/graph.h"
 
 #include <fstream>
@@ -25,12 +24,6 @@
 #include <set>
 #include <sstream>
 #include <string>
-#include <sys/stat.h>
-#ifdef WIN32
-#include <direct.h> // _mkdir
-/* Need to define function drand48 for Windows */
-#define drand48() (rand() / (RAND_MAX + 1.0))
-#endif
 
 typedef simgrid::instr::Container* container_t;
 
@@ -60,15 +53,15 @@ public:
   std::string recv_type        = "";
 
   // NoOpTI: init, finalize, test, wait, barrier
-  explicit TIData(std::string name) : name_(name){};
+  explicit TIData(const std::string& name) : name_(name){};
   // CPuTI: compute, sleep (+ waitAny and waitall out of laziness)
-  explicit TIData(std::string name, double amount) : name_(name), amount_(amount){};
+  explicit TIData(const std::string& name, double amount) : name_(name), amount_(amount){};
   // Pt2PtTI: send, isend, sssend, issend, recv, irecv
-  explicit TIData(std::string name, int endpoint, int size, std::string datatype)
+  explicit TIData(const std::string& name, int endpoint, int size, const std::string& datatype)
       : name_(name), endpoint(endpoint), send_size(size), send_type(datatype){};
   // CollTI: bcast, reduce, allreduce, gather, scatter, allgather, alltoall
-  explicit TIData(std::string name, int root, double amount, int send_size, int recv_size, std::string send_type,
-                  std::string recv_type)
+  explicit TIData(const std::string& name, int root, double amount, int send_size, int recv_size,
+                  const std::string& send_type, const std::string& recv_type)
       : name_(name)
       , amount_(amount)
       , endpoint(root)
@@ -77,14 +70,14 @@ public:
       , send_type(send_type)
       , recv_type(recv_type){};
   // VarCollTI: gatherv, scatterv, allgatherv, alltoallv (+ reducescatter out of laziness)
-  explicit TIData(std::string name, int root, int send_size, std::vector<int>* sendcounts, int recv_size,
-                  std::vector<int>* recvcounts, std::string send_type, std::string recv_type)
+  explicit TIData(const std::string& name, int root, int send_size, std::vector<int>* sendcounts, int recv_size,
+                  std::vector<int>* recvcounts, const std::string& send_type, const std::string& recv_type)
       : TIData(name, root, send_size, std::shared_ptr<std::vector<int>>(sendcounts), recv_size,
                std::shared_ptr<std::vector<int>>(recvcounts), send_type, recv_type){};
 
-  explicit TIData(std::string name, int root, int send_size, std::shared_ptr<std::vector<int>> sendcounts,
-                  int recv_size, std::shared_ptr<std::vector<int>> recvcounts, std::string send_type,
-                  std::string recv_type)
+  explicit TIData(const std::string& name, int root, int send_size, std::shared_ptr<std::vector<int>> sendcounts,
+                  int recv_size, std::shared_ptr<std::vector<int>> recvcounts, const std::string& send_type,
+                  const std::string& recv_type)
       : name_(name)
       , endpoint(root)
       , send_size(send_size)
@@ -96,7 +89,7 @@ public:
 
   virtual ~TIData() {}
 
-  std::string getName() { return name_; }
+  const std::string& getName() const { return name_; }
   double getAmount() { return amount_; }
   virtual std::string print()        = 0;
   virtual std::string display_size() = 0;
@@ -104,14 +97,14 @@ public:
 
 class NoOpTIData : public TIData {
 public:
-  explicit NoOpTIData(std::string name) : TIData(name){};
+  explicit NoOpTIData(const std::string& name) : TIData(name){};
   std::string print() override { return getName(); }
-  std::string display_size() override { return ""; }
+  std::string display_size() override { return "NA"; }
 };
 
 class CpuTIData : public TIData {
 public:
-  explicit CpuTIData(std::string name, double amount) : TIData(name, amount){};
+  explicit CpuTIData(const std::string& name, double amount) : TIData(name, amount){};
   std::string print() override
   {
     std::stringstream stream;
@@ -124,17 +117,15 @@ public:
 class Pt2PtTIData : public TIData {
   int tag;
 public:
-  explicit Pt2PtTIData(std::string name, int endpoint, int size, int tag, std::string datatype)
-      : TIData(name, endpoint, size, datatype), tag(tag) {};
+  explicit Pt2PtTIData(const std::string& name, int endpoint, int size, int tag, const std::string& datatype)
+      : TIData(name, endpoint, size, datatype), tag(tag){};
 
-  explicit Pt2PtTIData(std::string name, int endpoint, int size, std::string datatype)
-      : TIData(name, endpoint, size, datatype), tag(0) {};
+  explicit Pt2PtTIData(const std::string& name, int endpoint, int size, const std::string& datatype)
+      : TIData(name, endpoint, size, datatype), tag(0){};
   std::string print() override
   {
     std::stringstream stream;
-    stream << getName() << " ";
-    if (endpoint >= 0)
-      stream << endpoint << " ";
+    stream << getName() << " " << endpoint << " ";
     stream << tag << " " << send_size << " " << send_type;
     return stream.str();
   }
@@ -143,8 +134,8 @@ public:
 
 class CollTIData : public TIData {
 public:
-  explicit CollTIData(std::string name, int root, double amount, int send_size, int recv_size, std::string send_type,
-                      std::string recv_type)
+  explicit CollTIData(const std::string& name, int root, double amount, int send_size, int recv_size,
+                      const std::string& send_type, const std::string& recv_type)
       : TIData(name, root, amount, send_size, recv_size, send_type, recv_type){};
   std::string print() override
   {
@@ -165,13 +156,13 @@ public:
 
 class VarCollTIData : public TIData {
 public:
-  explicit VarCollTIData(std::string name, int root, int send_size, std::vector<int>* sendcounts, int recv_size,
-                         std::vector<int>* recvcounts, std::string send_type, std::string recv_type)
+  explicit VarCollTIData(const std::string& name, int root, int send_size, std::vector<int>* sendcounts, int recv_size,
+                         std::vector<int>* recvcounts, const std::string& send_type, const std::string& recv_type)
       : TIData(name, root, send_size, sendcounts, recv_size, recvcounts, send_type, recv_type){};
 
-  explicit VarCollTIData(std::string name, int root, int send_size, std::shared_ptr<std::vector<int>> sendcounts,
-                         int recv_size, std::shared_ptr<std::vector<int>> recvcounts, std::string send_type,
-                         std::string recv_type)
+  explicit VarCollTIData(const std::string& name, int root, int send_size, std::shared_ptr<std::vector<int>> sendcounts,
+                         int recv_size, std::shared_ptr<std::vector<int>> recvcounts, const std::string& send_type,
+                         const std::string& recv_type)
       : TIData(name, root, send_size, sendcounts, recv_size, recvcounts, send_type, recv_type){};
 
   std::string print() override
@@ -217,12 +208,28 @@ public:
     return stream.str();
   }
 
-  std::string display_size() override { return ""; }
+  std::string display_size() override { return "NA"; }
+};
+
+class AmpiMigrateTIData : public TIData {
+  size_t memory_consumption;
+public:
+  explicit AmpiMigrateTIData(size_t memory_conso) : TIData("migrate"), memory_consumption(memory_conso) { };
+
+  std::string print() override
+  {
+    std::stringstream stream;
+    stream << getName() << " " << memory_consumption;
+
+    return stream.str();
+  }
+
+  std::string display_size() override { return "NA"; }
 };
 }
 }
 
-XBT_PRIVATE std::string instr_pid(s4u_Actor* proc);
+XBT_PRIVATE std::string instr_pid(simgrid::s4u::Actor const& proc);
 
 extern XBT_PRIVATE std::set<std::string> created_categories;
 extern XBT_PRIVATE std::set<std::string> declared_marks;
@@ -258,24 +265,26 @@ XBT_PUBLIC bool TRACE_smpi_is_sleeping();
 XBT_PUBLIC bool TRACE_smpi_view_internals();
 
 XBT_PRIVATE void TRACE_surf_resource_set_utilization(const char* type, const char* name, const char* resource,
-                                                     const char* category, double value, double now, double delta);
+                                                     const std::string& category, double value, double now,
+                                                     double delta);
 
 /* instr_paje.c */
 extern XBT_PRIVATE std::set<std::string> trivaNodeTypes;
 extern XBT_PRIVATE std::set<std::string> trivaEdgeTypes;
 XBT_PRIVATE long long int instr_new_paje_id();
 XBT_PRIVATE void instr_define_callbacks();
-void instr_new_variable_type(std::string new_typename, std::string color);
-void instr_new_user_variable_type(std::string father_type, std::string new_typename, std::string color);
-void instr_new_user_state_type(std::string father_type, std::string new_typename);
-void instr_new_value_for_user_state_type(std::string new_typename, const char* value, std::string color);
+void instr_new_variable_type(const std::string& new_typename, const std::string& color);
+void instr_new_user_variable_type(const std::string& father_type, const std::string& new_typename,
+                                  const std::string& color);
+void instr_new_user_state_type(const std::string& father_type, const std::string& new_typename);
+void instr_new_value_for_user_state_type(const std::string& new_typename, const char* value, const std::string& color);
 
 XBT_PRIVATE void TRACE_global_init();
 XBT_PRIVATE void TRACE_help();
 
 XBT_PRIVATE void TRACE_paje_dump_buffer(bool force);
-XBT_PRIVATE void dump_comment_file(std::string filename);
-XBT_PRIVATE void dump_comment(std::string comment);
+XBT_PRIVATE void dump_comment_file(const std::string& filename);
+XBT_PRIVATE void dump_comment(const std::string& comment);
 
 XBT_PRIVATE std::string TRACE_get_filename();