Merge branch 'master' into actor-priority

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

diff --git a/src/instr/instr_interface.cpp b/src/instr/instr_interface.cpp
index fa1917b..6263fcd 100644 (file)
--- a/src/instr/instr_interface.cpp
+++ b/src/instr/instr_interface.cpp
@@ -148,7 +148,7 @@ void TRACE_declare_mark(const char *mark_type)
   }
 
   XBT_DEBUG("MARK,declare %s", mark_type);
-  simgrid::instr::Type::eventNew(mark_type, PJ_type_get_root());
+  simgrid::instr::Type::getRootType()->getOrCreateEventType(mark_type);
   declared_marks.insert(mark_type);
 }
 
@@ -178,14 +178,13 @@ void TRACE_declare_mark_value_with_color (const char *mark_type, const char *mar
   if (not mark_value)
     THROWF (tracing_error, 1, "mark_value is nullptr");
 
-  simgrid::instr::Type* type = PJ_type_get_root()->byName(mark_type);
+  simgrid::instr::Type* type = simgrid::instr::Type::getRootType()->byName(mark_type);
   if (not type) {
     THROWF (tracing_error, 1, "mark_type with name (%s) is not declared", mark_type);
   }
 
-  char white[INSTR_DEFAULT_STR_SIZE] = "1.0 1.0 1.0";
   if (not mark_color)
-    mark_color = white;
+    mark_color = "1.0 1.0 1.0" /*white*/;
 
   XBT_DEBUG("MARK,declare_value %s %s %s", mark_type, mark_value, mark_color);
   simgrid::instr::Value::byNameOrCreate(mark_value, mark_color, type);
@@ -234,7 +233,7 @@ void TRACE_mark(const char *mark_type, const char *mark_value)
     THROWF (tracing_error, 1, "mark_value is nullptr");
 
   //check if mark_type is already declared
-  simgrid::instr::Type* type = PJ_type_get_root()->byName(mark_type);
+  simgrid::instr::Type* type = simgrid::instr::Type::getRootType()->byName(mark_type);
   if (not type) {
     THROWF (tracing_error, 1, "mark_type with name (%s) is not declared", mark_type);
   }
@@ -311,7 +310,7 @@ static void instr_user_srcdst_variable(double time, const char *src, const char
   std::vector<simgrid::surf::LinkImpl*> route;
   simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(src_elm, dst_elm, &route, nullptr);
   for (auto const& link : route)
-    instr_user_variable(time, link->cname(), variable, father_type, value, what, nullptr, &user_link_variables);
+    instr_user_variable(time, link->getCname(), variable, father_type, value, what, nullptr, &user_link_variables);
 }
 
 /** \ingroup TRACE_API
@@ -942,8 +941,7 @@ void TRACE_host_set_state(const char* host, const char* state, const char* value
 {
   container_t container      = simgrid::instr::Container::byName(host);
   simgrid::instr::Type* type = container->type_->byName(state);
-  simgrid::instr::Value* val = simgrid::instr::Value::byNameOrCreate(
-      value_str, "", type); /* if user didn't declare a value with a color, use no color */
+  simgrid::instr::Value* val = simgrid::instr::Value::byNameOrCreate(value_str, "", type);
   new simgrid::instr::SetStateEvent(MSG_get_clock(), container, type, val);
 }
 
@@ -962,8 +960,7 @@ void TRACE_host_push_state(const char* host, const char* state, const char* valu
 {
   container_t container      = simgrid::instr::Container::byName(host);
   simgrid::instr::Type* type = container->type_->byName(state);
-  simgrid::instr::Value* val = simgrid::instr::Value::byNameOrCreate(
-      value_str, "", type); /* if user didn't declare a value with a color, use no color */
+  simgrid::instr::Value* val = simgrid::instr::Value::byNameOrCreate(value_str, "", type);
   new simgrid::instr::PushStateEvent(MSG_get_clock(), container, type, val);
 }