simplication and uniformization

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

diff --git a/src/instr/instr_private.hpp b/src/instr/instr_private.hpp
index 0004fa9..579758c 100644 (file)
--- a/src/instr/instr_private.hpp
+++ b/src/instr/instr_private.hpp
@@ -8,7 +8,7 @@
 
 #include <xbt/base.h>
 
-#include "instr/instr_interface.h"
+#include "instr/instr_interface.hpp"
 #include "simgrid/instr.h"
 #include "simgrid_config.h"
 #include "src/instr/instr_paje_containers.hpp"
@@ -17,6 +17,7 @@
 #include "src/instr/instr_paje_values.hpp"
 #include "src/internal_config.h"
 #include "xbt/graph.h"
+
 #include <iomanip> /** std::setprecision **/
 #include <map>
 #include <memory>
@@ -36,6 +37,15 @@ typedef simgrid::instr::Container* container_t;
 namespace simgrid {
 namespace instr {
 
+/* Format of TRACING output.
+ *   - paje is the regular format, that we all know
+ *   - TI is a trick to reuse the tracing functions to generate a time independent trace during the execution. Such
+ *     trace can easily be replayed with smpi_replay afterward. This trick should be removed and replaced by some code
+ *     using the signal that we will create to cleanup the TRACING
+ */
+enum class TraceFormat { Paje, /*TimeIndependent*/ Ti };
+extern TraceFormat trace_format;
+
 class TIData {
   std::string name_;
   double amount_ = 0;
@@ -112,16 +122,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); }
@@ -187,8 +201,6 @@ public:
 
 XBT_PRIVATE std::string instr_pid(s4u_Actor* proc);
 
-extern "C" {
-
 extern XBT_PRIVATE std::set<std::string> created_categories;
 extern XBT_PRIVATE std::set<std::string> declared_marks;
 extern XBT_PRIVATE std::set<std::string> user_host_variables;
@@ -208,7 +220,6 @@ XBT_PRIVATE bool TRACE_needs_platform();
 XBT_PRIVATE bool TRACE_is_enabled();
 XBT_PRIVATE bool TRACE_platform();
 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_actor_is_enabled();
@@ -238,6 +249,7 @@ XBT_PRIVATE void TRACE_surf_link_set_utilization(const char* resource, const cha
 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_routing_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);
@@ -251,15 +263,6 @@ 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);
 
-/* Format of TRACING output.
- *   - paje is the regular format, that we all know
- *   - TI is a trick to reuse the tracing functions to generate a time independent trace during the execution. Such
- *     trace can easily be replayed with smpi_replay afterward. This trick should be removed and replaced by some code
- *     using the signal that we will create to cleanup the TRACING
- */
-enum instr_fmt_type_t { instr_fmt_paje, instr_fmt_TI };
-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();