[SMPI] Add 'tag' parameter for instr::Pt2PtTI class

[simgrid.git] / src / instr / instr_private.hpp

diff --git a/src/instr/instr_private.hpp b/src/instr/instr_private.hpp
index 263d4f4..5d6d12e 100644 (file)
--- a/src/instr/instr_private.hpp
+++ b/src/instr/instr_private.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2010-2018. 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. */
@@ -17,8 +17,10 @@
 #include "src/instr/instr_paje_values.hpp"
 #include "src/internal_config.h"
 #include "xbt/graph.h"
+
 #include <iomanip> /** std::setprecision **/
 #include <map>
+#include <memory>
 #include <set>
 #include <sstream>
 #include <string>
@@ -42,9 +44,9 @@ class TIData {
 public:
   int endpoint                 = 0;
   int send_size                = 0;
-  std::vector<int>* sendcounts = nullptr;
+  std::shared_ptr<std::vector<int>> sendcounts = nullptr;
   int recv_size                = 0;
-  std::vector<int>* recvcounts = nullptr;
+  std::shared_ptr<std::vector<int>> recvcounts = nullptr;
   std::string send_type        = "";
   std::string recv_type        = "";
 
@@ -68,6 +70,12 @@ public:
   // 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(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)
       : name_(name)
       , endpoint(root)
       , send_size(send_size)
@@ -77,11 +85,7 @@ public:
       , send_type(send_type)
       , recv_type(recv_type){};
 
-  virtual ~TIData()
-  {
-    delete sendcounts;
-    delete recvcounts;
-  }
+  virtual ~TIData() {}
 
   std::string getName() { return name_; }
   double getAmount() { return amount_; }
@@ -109,16 +113,20 @@ 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(std::string name, int endpoint, int size, std::string datatype)
-      : TIData(name, endpoint, size, datatype){};
+      : TIData(name, endpoint, size, datatype), tag(0) {};
   std::string print() override
   {
     std::stringstream stream;
     stream << getName() << " ";
     if (endpoint >= 0)
       stream << endpoint << " ";
-    stream << send_size << " " << send_type;
+    stream << tag << " " << send_size << " " << send_type;
     return stream.str();
   }
   std::string display_size() override { return std::to_string(send_size); }
@@ -151,6 +159,12 @@ 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(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(name, root, send_size, sendcounts, recv_size, recvcounts, send_type, recv_type){};
+
   std::string print() override
   {
     std::stringstream stream;
@@ -176,6 +190,8 @@ public:
 }
 }
 
+XBT_PRIVATE std::string instr_pid(s4u_Actor* proc);
+
 extern "C" {
 
 extern XBT_PRIVATE std::set<std::string> created_categories;
@@ -200,32 +216,28 @@ XBT_PRIVATE bool TRACE_platform_topology();
 XBT_PRIVATE bool TRACE_is_configured();
 XBT_PRIVATE bool TRACE_categorized();
 XBT_PRIVATE bool TRACE_uncategorized();
-XBT_PRIVATE bool TRACE_msg_process_is_enabled();
-XBT_PRIVATE bool TRACE_msg_vm_is_enabled();
+XBT_PRIVATE bool TRACE_actor_is_enabled();
+XBT_PRIVATE bool TRACE_vm_is_enabled();
 XBT_PRIVATE bool TRACE_buffer();
 XBT_PRIVATE bool TRACE_disable_link();
 XBT_PRIVATE bool TRACE_disable_speed();
-XBT_PRIVATE bool TRACE_onelink_only();
 XBT_PRIVATE bool TRACE_disable_destroy();
 XBT_PRIVATE bool TRACE_basic();
 XBT_PRIVATE bool TRACE_display_sizes();
 XBT_PRIVATE int TRACE_precision();
-XBT_PRIVATE void instr_pause_tracing();
-XBT_PRIVATE void instr_resume_tracing();
 
 /* Public functions used in SMPI */
-XBT_PUBLIC(bool) TRACE_smpi_is_enabled();
-XBT_PUBLIC(bool) TRACE_smpi_is_grouped();
-XBT_PUBLIC(bool) TRACE_smpi_is_computing();
-XBT_PUBLIC(bool) TRACE_smpi_is_sleeping();
-XBT_PUBLIC(bool) TRACE_smpi_view_internals();
+XBT_PUBLIC bool TRACE_smpi_is_enabled();
+XBT_PUBLIC bool TRACE_smpi_is_grouped();
+XBT_PUBLIC bool TRACE_smpi_is_computing();
+XBT_PUBLIC bool TRACE_smpi_is_sleeping();
+XBT_PUBLIC bool TRACE_smpi_view_internals();
 
 /* from resource_utilization.c */
 XBT_PRIVATE void TRACE_surf_host_set_utilization(const char* resource, const char* category, double value, double now,
                                                  double delta);
 XBT_PRIVATE void TRACE_surf_link_set_utilization(const char* resource, const char* category, double value, double now,
                                                  double delta);
-XBT_PUBLIC(void) TRACE_surf_resource_utilization_alloc();
 
 /* instr_paje.c */
 extern XBT_PRIVATE std::set<std::string> trivaNodeTypes;