include cleanups (mostly surf/surf.hpp)

[simgrid.git] / src / instr / instr_config.cpp

diff --git a/src/instr/instr_config.cpp b/src/instr/instr_config.cpp
index 9d3d8bf..d3e3128 100644 (file)
--- a/src/instr/instr_config.cpp
+++ b/src/instr/instr_config.cpp
@@ -1,14 +1,14 @@
-/* Copyright (c) 2010-2020. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2010-2021. 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. */
 
-#include "include/xbt/config.hpp"
-#include "simgrid/Exception.hpp"
-#include "simgrid/s4u/Engine.hpp"
-#include "simgrid/version.h"
+#include <simgrid/Exception.hpp>
+#include <simgrid/s4u/Engine.hpp>
+#include <simgrid/version.h>
+
 #include "src/instr/instr_private.hpp"
-#include "surf/surf.hpp"
+#include "xbt/config.hpp"
 
 #include <sys/stat.h>
 #ifdef WIN32
@@ -24,7 +24,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_config, instr, "Configuration");
 
 std::ofstream tracing_file;
 std::map<const simgrid::instr::Container*, std::ofstream*> tracing_files; // TI specific
-double prefix = 0.0;                                 // TI specific
 
 constexpr char OPT_TRACING_BASIC[]             = "tracing/basic";
 constexpr char OPT_TRACING_COMMENT_FILE[]      = "tracing/comment-file";
@@ -228,14 +227,14 @@ xbt::signal<void(EntityValue const&)> EntityValue::on_creation;
 
 static void on_container_creation_paje(const Container& c)
 {
-  double timestamp = SIMIX_get_clock();
+  double timestamp = simgrid_get_clock();
   std::stringstream stream;
 
   XBT_DEBUG("%s: event_type=%u, timestamp=%f", __func__, static_cast<unsigned>(PajeEventType::CreateContainer),
             timestamp);
 
   stream << std::fixed << std::setprecision(trace_precision) << PajeEventType::CreateContainer << " ";
-  stream << timestamp << " " << c.get_id() << " " << c.type_->get_id() << " " << c.father_->get_id() << " \"";
+  stream << timestamp << " " << c.get_id() << " " << c.get_type()->get_id() << " " << c.get_parent()->get_id() << " \"";
   if (c.get_name().find("rank-") != 0)
     stream << c.get_name() << "\"";
   else
@@ -251,13 +250,13 @@ static void on_container_destruction_paje(const Container& c)
   // trace my destruction, but not if user requests so or if the container is root
   if (not trace_disable_destroy && &c != Container::get_root()) {
     std::stringstream stream;
-    double timestamp = SIMIX_get_clock();
+    double timestamp = simgrid_get_clock();
 
     XBT_DEBUG("%s: event_type=%u, timestamp=%f", __func__, static_cast<unsigned>(PajeEventType::DestroyContainer),
               timestamp);
 
     stream << std::fixed << std::setprecision(trace_precision) << PajeEventType::DestroyContainer << " ";
-    stream << timestamp << " " << c.type_->get_id() << " " << c.get_id();
+    stream << timestamp << " " << c.get_type()->get_id() << " " << c.get_id();
     XBT_DEBUG("Dump %s", stream.str().c_str());
     tracing_file << stream.str() << std::endl;
   }
@@ -266,9 +265,10 @@ static void on_container_destruction_paje(const Container& c)
 static void on_container_creation_ti(const Container& c)
 {
   XBT_DEBUG("%s: event_type=%u, timestamp=%f", __func__, static_cast<unsigned>(PajeEventType::CreateContainer),
-            SIMIX_get_clock());
+            simgrid_get_clock());
   // if we are in the mode with only one file
   static std::ofstream* ti_unique_file = nullptr;
+  static double prefix                 = 0.0;
 
   if (tracing_files.empty()) {
     // generate unique run id with time
@@ -306,7 +306,7 @@ static void on_entity_value_creation(const EntityValue& value)
   std::stringstream stream;
   XBT_DEBUG("%s: event_type=%u", __func__, static_cast<unsigned>(PajeEventType::DefineEntityValue));
   stream << std::fixed << std::setprecision(trace_precision) << PajeEventType::DefineEntityValue;
-  stream << " " << value.get_id() << " " << value.get_father()->get_id() << " " << value.get_name();
+  stream << " " << value.get_id() << " " << value.get_parent()->get_id() << " " << value.get_name();
   if (not value.get_color().empty())
     stream << " \"" << value.get_color() << "\"";
   XBT_DEBUG("Dump %s", stream.str().c_str());
@@ -342,7 +342,7 @@ static void on_type_creation(const Type& type, PajeEventType event_type)
   std::stringstream stream;
   stream << std::fixed << std::setprecision(trace_precision);
   XBT_DEBUG("%s: event_type=%u, timestamp=%.*f", __func__, static_cast<unsigned>(event_type), trace_precision, 0.);
-  stream << event_type << " " << type.get_id() << " " << type.get_father()->get_id() << " " << type.get_name();
+  stream << event_type << " " << type.get_id() << " " << type.get_parent()->get_id() << " " << type.get_name();
   if (type.is_colored())
     stream << " \"" << type.get_color() << "\"";
   XBT_DEBUG("Dump %s", stream.str().c_str());
@@ -354,7 +354,7 @@ static void on_link_type_creation(const Type& type, const Type& source, const Ty
   std::stringstream stream;
   XBT_DEBUG("%s: event_type=%u, timestamp=%.*f", __func__, static_cast<unsigned>(PajeEventType::DefineLinkType),
             trace_precision, 0.);
-  stream << PajeEventType::DefineLinkType << " " << type.get_id() << " " << type.get_father()->get_id();
+  stream << PajeEventType::DefineLinkType << " " << type.get_id() << " " << type.get_parent()->get_id();
   stream << " " << source.get_id() << " " << dest.get_id() << " " << type.get_name();
   XBT_DEBUG("Dump %s", stream.str().c_str());
   tracing_file << stream.str() << std::endl;
@@ -420,10 +420,10 @@ static void on_simulation_end()
     return;
 
   /* dump trace buffer */
-  last_timestamp_to_dump = surf_get_clock();
+  last_timestamp_to_dump = simgrid_get_clock();
   dump_buffer(true);
 
-  const Type* root_type = Container::get_root()->type_;
+  const Type* root_type = Container::get_root()->get_type();
   /* destroy all data structures of tracing (and free) */
   delete Container::get_root();
   delete root_type;