X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/895710d49f77179d9893bc76b3e31b69fae638af..c619e9d16e3061f1d05b187d80bc65eb578fb868:/src/instr/instr_private.hpp diff --git a/src/instr/instr_private.hpp b/src/instr/instr_private.hpp index 4bdfd3ea64..153996b73d 100644 --- a/src/instr/instr_private.hpp +++ b/src/instr/instr_private.hpp @@ -14,7 +14,6 @@ #include "src/instr/instr_paje_events.hpp" #include "src/instr/instr_paje_types.hpp" #include "src/instr/instr_paje_values.hpp" -#include "src/internal_config.h" #include "xbt/graph.h" #include @@ -132,9 +131,7 @@ public: std::string print() override { std::stringstream stream; - stream << getName() << " "; - if (endpoint >= 0) - stream << endpoint << " "; + stream << getName() << " " << endpoint << " "; stream << tag << " " << send_size << " " << send_type; return stream.str(); } @@ -219,6 +216,22 @@ public: std::string display_size() override { return ""; } }; + +class AmpiMigrateTIData : public TIData { + size_t memory_consumption; +public: + explicit AmpiMigrateTIData(size_t memory_conso) : TIData("migrate"), memory_consumption(memory_conso) { }; + + std::string print() override + { + std::stringstream stream; + stream << getName() << " " << memory_consumption; + + return stream.str(); + } + + std::string display_size() override { return ""; } +}; } } @@ -258,7 +271,7 @@ XBT_PUBLIC bool TRACE_smpi_is_sleeping(); XBT_PUBLIC bool TRACE_smpi_view_internals(); XBT_PRIVATE void TRACE_surf_resource_set_utilization(const char* type, const char* name, const char* resource, - const char* category, double value, double now, double delta); + std::string category, double value, double now, double delta); /* instr_paje.c */ extern XBT_PRIVATE std::set trivaNodeTypes; @@ -279,4 +292,8 @@ XBT_PRIVATE void dump_comment(std::string comment); XBT_PRIVATE std::string TRACE_get_filename(); +/* instr_platform */ +xbt_graph_t instr_routing_platform_graph(); +void instr_routing_platform_graph_export_graphviz(xbt_graph_t g, const char* filename); + #endif