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

diff --git a/src/instr/instr_private.hpp b/src/instr/instr_private.hpp
index e34187ce6d..35e9893ac2 100644
--- a/src/instr/instr_private.hpp
+++ b/src/instr/instr_private.hpp
@@ -24,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;
 
@@ -59,43 +53,43 @@ public:
   std::string recv_type        = "";
 
   // NoOpTI: init, finalize, test, wait, barrier
-  explicit TIData(std::string name) : name_(std::move(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_(std::move(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)
-      : name_(std::move(name)), endpoint(endpoint), send_size(size), send_type(std::move(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)
-      : name_(std::move(name))
+  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)
       , send_size(send_size)
       , recv_size(recv_size)
-      , send_type(std::move(send_type))
-      , recv_type(std::move(recv_type)){};
+      , 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)
-      : TIData(std::move(name), root, send_size, std::shared_ptr<std::vector<int>>(sendcounts), recv_size,
-               std::shared_ptr<std::vector<int>>(recvcounts), std::move(send_type), std::move(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)
-      : name_(std::move(name))
+  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(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)
       , sendcounts(sendcounts)
       , recv_size(recv_size)
       , recvcounts(recvcounts)
-      , send_type(std::move(send_type))
-      , recv_type(std::move(recv_type)){};
+      , send_type(send_type)
+      , recv_type(recv_type){};
 
   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;
@@ -103,14 +97,14 @@ public:
 
 class NoOpTIData : public TIData {
 public:
-  explicit NoOpTIData(std::string name) : TIData(std::move(name)){};
+  explicit NoOpTIData(const std::string& name) : TIData(name){};
   std::string print() override { return getName(); }
   std::string display_size() override { return "NA"; }
 };
 
 class CpuTIData : public TIData {
 public:
-  explicit CpuTIData(std::string name, double amount) : TIData(std::move(name), amount){};
+  explicit CpuTIData(const std::string& name, double amount) : TIData(name, amount){};
   std::string print() override
   {
     std::stringstream stream;
@@ -123,11 +117,11 @@ public:
 class Pt2PtTIData : public TIData {
   int tag;
 public:
-  explicit Pt2PtTIData(std::string name, int endpoint, int size, int tag, std::string datatype)
-      : TIData(std::move(name), endpoint, size, std::move(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(std::move(name), endpoint, size, std::move(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;
@@ -140,9 +134,9 @@ 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)
-      : TIData(std::move(name), root, amount, send_size, recv_size, std::move(send_type), std::move(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
   {
     std::stringstream stream;
@@ -162,16 +156,14 @@ 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)
-      : TIData(std::move(name), root, send_size, sendcounts, recv_size, recvcounts, std::move(send_type),
-               std::move(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)
-      : TIData(std::move(name), root, send_size, sendcounts, recv_size, recvcounts, std::move(send_type),
-               std::move(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
   {
@@ -237,7 +229,7 @@ public:
 }
 }
 
-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;