From 510c97d4c651c63ef9851a7e1d9c328f62b5b00b Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Tue, 2 Jul 2019 15:47:05 +0200 Subject: [PATCH] Define and throw simgrid::TracingError. --- include/simgrid/Exception.hpp | 10 ++++++++++ src/instr/instr_config.cpp | 5 ++++- src/instr/instr_interface.cpp | 10 +++++++--- src/instr/instr_paje_containers.cpp | 5 ++++- src/instr/instr_paje_trace.cpp | 5 ++++- src/instr/instr_paje_types.cpp | 15 ++++++++++----- 6 files changed, 39 insertions(+), 11 deletions(-) diff --git a/include/simgrid/Exception.hpp b/include/simgrid/Exception.hpp index 39002a85ff..a6d40e8bae 100644 --- a/include/simgrid/Exception.hpp +++ b/include/simgrid/Exception.hpp @@ -189,6 +189,16 @@ public: } }; +/** Exception raised when something is going wrong during the simulation tracing */ +class TracingError : public xbt_ex { +public: + TracingError(simgrid::xbt::ThrowPoint&& throwpoint, std::string&& message) + : xbt_ex(std::move(throwpoint), std::move(message)) + { + category = tracing_error; + } +}; + class XBT_PUBLIC ForcefulKillException { /** @brief Exception launched to kill an actor; DO NOT BLOCK IT! * diff --git a/src/instr/instr_config.cpp b/src/instr/instr_config.cpp index 773b0ce502..415e3baa95 100644 --- a/src/instr/instr_config.cpp +++ b/src/instr/instr_config.cpp @@ -4,6 +4,7 @@ * 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 "src/instr/instr_private.hpp" #include "surf/surf.hpp" @@ -103,7 +104,9 @@ static void TRACE_start() std::string filename = TRACE_get_filename(); tracing_file.open(filename.c_str(), std::ofstream::out); if (tracing_file.fail()) { - THROWF(system_error, 1, "Tracefile %s could not be opened for writing.", filename.c_str()); + throw simgrid::TracingError( + XBT_THROW_POINT, + simgrid::xbt::string_printf("Tracefile %s could not be opened for writing.", filename.c_str())); } XBT_DEBUG("Filename %s is open for writing", filename.c_str()); diff --git a/src/instr/instr_interface.cpp b/src/instr/instr_interface.cpp index b859b8d020..83a1112a35 100644 --- a/src/instr/instr_interface.cpp +++ b/src/instr/instr_interface.cpp @@ -3,6 +3,7 @@ /* 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 "simgrid/kernel/routing/NetPoint.hpp" #include "src/instr/instr_private.hpp" #include "src/surf/network_interface.hpp" @@ -145,7 +146,8 @@ void TRACE_declare_mark(const char *mark_type) //check if mark_type is already declared if (declared_marks.find(mark_type) != declared_marks.end()) { - THROWF (tracing_error, 1, "mark_type with name (%s) is already declared", mark_type); + throw simgrid::TracingError(XBT_THROW_POINT, + simgrid::xbt::string_printf("mark_type with name (%s) is already declared", mark_type)); } XBT_DEBUG("MARK,declare %s", mark_type); @@ -180,7 +182,8 @@ void TRACE_declare_mark_value_with_color (const char *mark_type, const char *mar simgrid::instr::EventType* type = static_cast(simgrid::instr::Container::get_root()->type_->by_name(mark_type)); if (not type) { - THROWF (tracing_error, 1, "mark_type with name (%s) is not declared", mark_type); + throw simgrid::TracingError(XBT_THROW_POINT, + simgrid::xbt::string_printf("mark_type with name (%s) is not declared", mark_type)); } else { if (not mark_color) mark_color = "1.0 1.0 1.0" /*white*/; @@ -234,7 +237,8 @@ void TRACE_mark(const char *mark_type, const char *mark_value) simgrid::instr::EventType* type = static_cast(simgrid::instr::Container::get_root()->type_->by_name(mark_type)); if (not type) { - THROWF (tracing_error, 1, "mark_type with name (%s) is not declared", mark_type); + throw simgrid::TracingError(XBT_THROW_POINT, + simgrid::xbt::string_printf("mark_type with name (%s) is not declared", mark_type)); } else { XBT_DEBUG("MARK %s %s", mark_type, mark_value); new simgrid::instr::NewEvent(MSG_get_clock(), simgrid::instr::Container::get_root(), type, diff --git a/src/instr/instr_paje_containers.cpp b/src/instr/instr_paje_containers.cpp index 63b9a03a3e..95bf51d7ee 100644 --- a/src/instr/instr_paje_containers.cpp +++ b/src/instr/instr_paje_containers.cpp @@ -3,6 +3,7 @@ /* 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 "simgrid/s4u/Engine.hpp" #include "simgrid/s4u/Host.hpp" #include "src/instr/instr_private.hpp" @@ -93,7 +94,9 @@ Container::Container(const std::string& name, const std::string& type_name, Cont //register all kinds by name if (not allContainers.emplace(name_, this).second) - THROWF(tracing_error, 1, "container %s already present in allContainers data structure", get_cname()); + throw simgrid::TracingError( + XBT_THROW_POINT, + simgrid::xbt::string_printf("container %s already present in allContainers data structure", get_cname())); XBT_DEBUG("Add container name '%s'", get_cname()); diff --git a/src/instr/instr_paje_trace.cpp b/src/instr/instr_paje_trace.cpp index 601517d19c..927a8dbfe8 100644 --- a/src/instr/instr_paje_trace.cpp +++ b/src/instr/instr_paje_trace.cpp @@ -4,6 +4,7 @@ /* 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 "simgrid/sg_config.hpp" #include "src/instr/instr_private.hpp" #include "src/instr/instr_smpi.hpp" @@ -30,7 +31,9 @@ void dump_comment_file(const std::string& filename) std::ifstream fs(filename.c_str(), std::ifstream::in); if (fs.fail()) - THROWF(system_error, 1, "Comment file %s could not be opened for reading.", filename.c_str()); + throw simgrid::TracingError( + XBT_THROW_POINT, + simgrid::xbt::string_printf("Comment file %s could not be opened for reading.", filename.c_str())); while (not fs.eof()) { std::string line; diff --git a/src/instr/instr_paje_types.cpp b/src/instr/instr_paje_types.cpp index ff0c4b5b72..bc9f521d88 100644 --- a/src/instr/instr_paje_types.cpp +++ b/src/instr/instr_paje_types.cpp @@ -4,6 +4,7 @@ /* 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)"); @@ -19,7 +20,7 @@ Type::Type(const std::string& name, const std::string& alias, const std::string& : 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"); + throw simgrid::TracingError(XBT_THROW_POINT, "can't create a new type with no name or alias"); if (father != nullptr){ father->children_[alias].reset(this); @@ -162,14 +163,16 @@ Type* Type::by_name(const std::string& name) 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.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; } @@ -181,7 +184,7 @@ void ValueType::add_entity_value(const std::string& name) 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()) { @@ -195,7 +198,9 @@ 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; } -- 2.20.1