X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f36bb244f8e4874b90572ecb44ed6e2f3fa9592b..1a4f00ba0c403c20a7eae8bea566371a4f131b3e:/src/instr/instr_paje_types.cpp

diff --git a/src/instr/instr_paje_types.cpp b/src/instr/instr_paje_types.cpp
index 141c330aba..bc9f521d88 100644
--- a/src/instr/instr_paje_types.cpp
+++ b/src/instr/instr_paje_types.cpp
@@ -1,9 +1,10 @@
-/* Copyright (c) 2012-2018. The SimGrid Team.
+/* Copyright (c) 2012-2019. 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 "simgrid/Exception.hpp"
 #include "src/instr/instr_private.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_paje_types, instr, "Paje tracing event system (types)");
@@ -15,74 +16,57 @@ static std::set<std::string> platform_variables;
 namespace simgrid {
 namespace instr {
 
-Type::Type(std::string name, std::string alias, std::string color, Type* father)
+Type::Type(const std::string& name, const std::string& alias, const std::string& color, Type* father)
     : id_(instr_new_paje_id()), name_(name), color_(color), father_(father)
 {
-  if (name.empty() || alias.empty())
-    THROWF(tracing_error, 0, "can't create a new type with no name or alias");
+  if (name_.empty() || alias.empty())
+    throw simgrid::TracingError(XBT_THROW_POINT, "can't create a new type with no name or alias");
 
   if (father != nullptr){
-    father->children_.insert({alias, this});
-    XBT_DEBUG("new type %s, child of %s", name_.c_str(), father->get_cname());
+    father->children_[alias].reset(this);
+    XBT_DEBUG("new type %s, child of %s", get_cname(), father->get_cname());
   }
   if (trace_format == simgrid::instr::TraceFormat::Paje) {
     stream_ << std::fixed << std::setprecision(TRACE_precision());
   }
 }
 
-Type::~Type()
-{
-  for (auto elm : children_)
-    delete elm.second;
-}
-
-ValueType::~ValueType()
-{
-  for (auto elm : values_)
-    delete elm.second;
-}
-
-ContainerType::ContainerType(std::string name, Type* father) : Type(name, name, "", father)
+ContainerType::ContainerType(const std::string& name, Type* father) : Type(name, name, "", father)
 {
   XBT_DEBUG("ContainerType %s(%lld), child of %s(%lld)", get_cname(), get_id(), father->get_cname(), father->get_id());
   log_definition(PAJE_DefineContainerType);
 }
 
-EventType::EventType(std::string name, Type* father) : ValueType(name, father)
+EventType::EventType(const std::string& name, Type* father) : ValueType(name, father)
 {
   XBT_DEBUG("EventType %s(%lld), child of %s(%lld)", get_cname(), get_id(), father->get_cname(), father->get_id());
   log_definition(PAJE_DefineEventType);
 }
 
-StateType::StateType(std::string name, Type* father) : ValueType(name, father)
+StateType::StateType(const std::string& name, Type* father) : ValueType(name, father)
 {
   XBT_DEBUG("StateType %s(%lld), child of %s(%lld)", get_cname(), get_id(), father->get_cname(), father->get_id());
   log_definition(PAJE_DefineStateType);
 }
 
-StateType::~StateType()
-{
-  events_.clear();
-}
-
-void StateType::set_event(std::string value_name)
+void StateType::set_event(const std::string& value_name)
 {
   events_.push_back(new StateEvent(issuer_, this, PAJE_SetState, get_entity_value(value_name), nullptr));
 }
 
-void StateType::push_event(std::string value_name, TIData* extra)
+void StateType::push_event(const std::string& value_name, TIData* extra)
 {
   events_.push_back(new StateEvent(issuer_, this, PAJE_PushState, get_entity_value(value_name), extra));
 }
 
-void StateType::push_event(std::string value_name)
+void StateType::push_event(const std::string& value_name)
 {
   events_.push_back(new StateEvent(issuer_, this, PAJE_PushState, get_entity_value(value_name), nullptr));
 }
 
 void StateType::pop_event()
 {
-  events_.push_back(new StateEvent(issuer_, this, PAJE_PopState, nullptr, nullptr));
+  pop_event(nullptr);
 }
 
 void StateType::pop_event(TIData* extra)
@@ -90,17 +74,13 @@ void StateType::pop_event(TIData* extra)
   events_.push_back(new StateEvent(issuer_, this, PAJE_PopState, nullptr, extra));
 }
 
-VariableType::VariableType(std::string name, std::string color, Type* father) : Type(name, name, color, father)
+VariableType::VariableType(const std::string& name, const std::string& color, Type* father)
+    : Type(name, name, color, father)
 {
   XBT_DEBUG("VariableType %s(%lld), child of %s(%lld)", get_cname(), get_id(), father->get_cname(), father->get_id());
   log_definition(PAJE_DefineVariableType);
 }
 
-VariableType::~VariableType()
-{
-  events_.clear();
-}
-
 void VariableType::instr_event(double now, double delta, const char* resource, double value)
 {
   /* To trace resource utilization, we use AddEvent and SubEvent only. This implies to add a SetEvent first to set the
@@ -136,20 +116,20 @@ void VariableType::sub_event(double timestamp, double value)
   events_.push_back(new VariableEvent(timestamp, issuer_, this, PAJE_SubVariable, value));
 }
 
-LinkType::LinkType(std::string name, std::string alias, Type* father) : ValueType(name, alias, father)
+LinkType::LinkType(const std::string& name, const std::string& alias, Type* father) : ValueType(name, alias, father)
 {
 }
-void LinkType::start_event(Container* startContainer, std::string value, std::string key)
+void LinkType::start_event(Container* startContainer, const std::string& value, const std::string& key)
 {
   start_event(startContainer, value, key, -1);
 }
 
-void LinkType::start_event(Container* startContainer, std::string value, std::string key, int size)
+void LinkType::start_event(Container* startContainer, const std::string& value, const std::string& key, int size)
 {
   new LinkEvent(issuer_, this, PAJE_StartLink, startContainer, value, key, size);
 }
 
-void LinkType::end_event(Container* endContainer, std::string value, std::string key)
+void LinkType::end_event(Container* endContainer, const std::string& value, const std::string& key)
 {
   new LinkEvent(issuer_, this, PAJE_EndLink, endContainer, value, key, -1);
 }
@@ -177,59 +157,63 @@ void Type::log_definition(simgrid::instr::Type* source, simgrid::instr::Type* de
   tracing_file << stream_.str() << std::endl;
 }
 
-Type* Type::by_name(std::string name)
+Type* Type::by_name(const std::string& name)
 {
   Type* ret = nullptr;
-  for (auto elm : children_) {
+  for (auto const& elm : children_) {
     if (elm.second->name_ == name) {
       if (ret != nullptr) {
-        THROWF (tracing_error, 0, "there are two children types with the same name?");
+        throw simgrid::TracingError(XBT_THROW_POINT, "there are two children types with the same name?");
       } else {
-        ret = elm.second;
+        ret = elm.second.get();
       }
     }
   }
   if (ret == nullptr)
-    THROWF(tracing_error, 2, "type with name (%s) not found in father type (%s)", name.c_str(), get_cname());
+    throw simgrid::TracingError(
+        XBT_THROW_POINT,
+        simgrid::xbt::string_printf("type with name (%s) not found in father type (%s)", name.c_str(), get_cname()));
   return ret;
 }
 
-void ValueType::add_entity_value(std::string name)
+void ValueType::add_entity_value(const std::string& name)
 {
   add_entity_value(name, "");
 }
 
-void ValueType::add_entity_value(std::string name, std::string color)
+void ValueType::add_entity_value(const std::string& name, const std::string& color)
 {
   if (name.empty())
-    THROWF(tracing_error, 0, "can't get a value with no name");
+    throw simgrid::TracingError(XBT_THROW_POINT, "can't get a value with no name");
 
   auto it = values_.find(name);
   if (it == values_.end()) {
-    EntityValue* new_val = new EntityValue(name, color, this);
-    values_.insert({name, new_val});
+    auto res = values_.emplace(name, EntityValue(name, color, this));
     XBT_DEBUG("new value %s, child of %s", name.c_str(), get_cname());
-    new_val->print();
+    res.first->second.print();
   }
 }
 
-EntityValue* ValueType::get_entity_value(std::string name)
+EntityValue* ValueType::get_entity_value(const std::string& name)
 {
   auto ret = values_.find(name);
   if (ret == values_.end()) {
-    THROWF(tracing_error, 2, "value with name (%s) not found in father type (%s)", name.c_str(), get_cname());
+    throw simgrid::TracingError(
+        XBT_THROW_POINT,
+        simgrid::xbt::string_printf("value with name (%s) not found in father type (%s)", name.c_str(), get_cname()));
   }
-  return ret->second;
+  return &ret->second;
 }
 
-VariableType* Type::by_name_or_create(std::string name, std::string color)
+VariableType* Type::by_name_or_create(const std::string& name, const std::string& color)
 {
   auto cont = children_.find(name);
   std::string mycolor = color.empty() ? "1 1 1" : color;
-  return cont == children_.end() ? new VariableType(name, mycolor, this) : static_cast<VariableType*>(cont->second);
+  return cont == children_.end() ? new VariableType(name, mycolor, this)
+                                 : static_cast<VariableType*>(cont->second.get());
 }
 
-LinkType* Type::by_name_or_create(std::string name, Type* source, Type* dest)
+LinkType* Type::by_name_or_create(const std::string& name, Type* source, Type* dest)
 {
   std::string alias = name + "-" + std::to_string(source->id_) + "-" + std::to_string(dest->id_);
   auto it           = children_.find(alias);
@@ -240,7 +224,7 @@ LinkType* Type::by_name_or_create(std::string name, Type* source, Type* dest)
     ret->log_definition(source, dest);
     return ret;
   } else
-    return static_cast<LinkType*>(it->second);
+    return static_cast<LinkType*>(it->second.get());
 }
 }
 }