X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fe304706848f0a64477d4687b3ea97d5b9a0c35c..5ce2cc84f1f1154453e9534505c394fbd2b89e05:/src/instr/instr_interface.cpp 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,