Function smpi_process_papi_counters() was renamed (untested).

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

diff --git a/src/instr/instr_private.hpp b/src/instr/instr_private.hpp
index 77392a8..7569078 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. */
@@ -47,18 +47,17 @@ public:
   std::vector<int>* recvcounts = nullptr;
   std::string send_type        = "";
   std::string recv_type        = "";
-  ;
 
   // NoOpTI: init, finalize, test, wait, barrier
-  TIData(std::string name) : name_(name){};
+  explicit TIData(std::string name) : name_(name){};
   // CPuTI: compute, sleep (+ waitAny and waitAll out of laziness)
-  TIData(std::string name, double amount) : name_(name), amount_(amount){};
+  explicit TIData(std::string name, double amount) : name_(name), amount_(amount){};
   // Pt2PtTI: send, isend, sssend, issend, recv, irecv
-  TIData(std::string name, int endpoint, int size, std::string datatype)
+  explicit TIData(std::string name, int endpoint, int size, std::string datatype)
       : name_(name), endpoint(endpoint), send_size(size), send_type(datatype){};
   // CollTI: bcast, reduce, allReduce, gather, scatter, allGather, allToAll
-  TIData(std::string name, int root, double amount, int send_size, int recv_size, std::string send_type,
-         std::string recv_type)
+  explicit TIData(std::string name, int root, double amount, int send_size, int recv_size, std::string send_type,
+                  std::string recv_type)
       : name_(name)
       , amount_(amount)
       , endpoint(root)
@@ -67,8 +66,8 @@ public:
       , send_type(send_type)
       , recv_type(recv_type){};
   // VarCollTI: gatherV, scatterV, allGatherV, allToAllV (+ reduceScatter out of laziness)
-  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(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)
       : name_(name)
       , endpoint(root)
       , send_size(send_size)
@@ -92,14 +91,14 @@ public:
 
 class NoOpTIData : public TIData {
 public:
-  NoOpTIData(std::string name) : TIData(name){};
+  explicit NoOpTIData(std::string name) : TIData(name){};
   std::string print() override { return getName(); }
   std::string display_size() override { return ""; }
 };
 
 class CpuTIData : public TIData {
 public:
-  CpuTIData(std::string name, double amount) : TIData(name, amount){};
+  explicit CpuTIData(std::string name, double amount) : TIData(name, amount){};
   std::string print() override
   {
     std::stringstream stream;
@@ -111,7 +110,7 @@ public:
 
 class Pt2PtTIData : public TIData {
 public:
-  Pt2PtTIData(std::string name, int endpoint, int size, std::string datatype)
+  explicit Pt2PtTIData(std::string name, int endpoint, int size, std::string datatype)
       : TIData(name, endpoint, size, datatype){};
   std::string print() override
   {
@@ -127,8 +126,8 @@ public:
 
 class CollTIData : public TIData {
 public:
-  CollTIData(std::string name, int root, double amount, int send_size, int recv_size, std::string send_type,
-             std::string recv_type)
+  explicit CollTIData(std::string name, int root, double amount, int send_size, int recv_size, std::string send_type,
+                      std::string recv_type)
       : TIData(name, root, amount, send_size, recv_size, send_type, recv_type){};
   std::string print() override
   {
@@ -149,8 +148,8 @@ public:
 
 class VarCollTIData : public TIData {
 public:
-  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(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){};
   std::string print() override
   {
@@ -177,6 +176,8 @@ public:
 }
 }
 
+XBT_PRIVATE std::string instr_pid(s4u_Actor* proc);
+
 extern "C" {
 
 extern XBT_PRIVATE std::set<std::string> created_categories;
@@ -201,20 +202,15 @@ 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_actor_is_enabled();
 XBT_PRIVATE bool TRACE_msg_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 TRACE_generate_viva_uncat_conf();
-XBT_PRIVATE void TRACE_generate_viva_cat_conf();
-XBT_PRIVATE void instr_pause_tracing();
-XBT_PRIVATE void instr_resume_tracing();
 
 /* Public functions used in SMPI */
 XBT_PUBLIC(bool) TRACE_smpi_is_enabled();
@@ -228,7 +224,6 @@ XBT_PRIVATE void TRACE_surf_host_set_utilization(const char* resource, const cha
                                                  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;
@@ -259,7 +254,5 @@ extern instr_fmt_type_t instr_fmt_type;
 XBT_PRIVATE std::string TRACE_get_comment();
 XBT_PRIVATE std::string TRACE_get_comment_file();
 XBT_PRIVATE std::string TRACE_get_filename();
-XBT_PRIVATE std::string TRACE_get_viva_uncat_conf();
-XBT_PRIVATE std::string TRACE_get_viva_cat_conf();
 
 #endif