X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/620004c2a9db271a47d5c4df9b02633703afcb76..002c591623abdaa8c94a3b434a2f179c35d29cb9:/src/instr/instr_private.hpp diff --git a/src/instr/instr_private.hpp b/src/instr/instr_private.hpp index f4dff23810..e34187ce6d 100644 --- a/src/instr/instr_private.hpp +++ b/src/instr/instr_private.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2010-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2010-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. */ @@ -10,12 +10,10 @@ #include "simgrid/instr.h" #include "simgrid/s4u/Actor.hpp" -#include "simgrid_config.h" #include "src/instr/instr_paje_containers.hpp" #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 @@ -61,39 +59,39 @@ public: std::string recv_type = ""; // NoOpTI: init, finalize, test, wait, barrier - explicit TIData(std::string name) : name_(name){}; - // CPuTI: compute, sleep (+ waitAny and waitAll out of laziness) - explicit TIData(std::string name, double amount) : name_(name), amount_(amount){}; + explicit TIData(std::string name) : name_(std::move(name)){}; + // CPuTI: compute, sleep (+ waitAny and waitall out of laziness) + explicit TIData(std::string name, double amount) : name_(std::move(name)), amount_(amount){}; // Pt2PtTI: send, isend, sssend, issend, recv, irecv explicit TIData(std::string name, int endpoint, int size, std::string datatype) - : name_(name), endpoint(endpoint), send_size(size), send_type(datatype){}; - // CollTI: bcast, reduce, allReduce, gather, scatter, allGather, allToAll + : name_(std::move(name)), endpoint(endpoint), send_size(size), send_type(std::move(datatype)){}; + // CollTI: bcast, reduce, allreduce, gather, scatter, allgather, alltoall explicit TIData(std::string name, int root, double amount, int send_size, int recv_size, std::string send_type, std::string recv_type) - : name_(name) + : name_(std::move(name)) , amount_(amount) , endpoint(root) , send_size(send_size) , recv_size(recv_size) - , send_type(send_type) - , recv_type(recv_type){}; - // VarCollTI: gatherV, scatterV, allGatherV, allToAllV (+ reduceScatter out of laziness) + , send_type(std::move(send_type)) + , recv_type(std::move(recv_type)){}; + // VarCollTI: gatherv, scatterv, allgatherv, alltoallv (+ reducescatter out of laziness) explicit TIData(std::string name, int root, int send_size, std::vector* sendcounts, int recv_size, std::vector* recvcounts, std::string send_type, std::string recv_type) - : TIData(name, root, send_size, std::shared_ptr>(sendcounts), recv_size, - std::shared_ptr>(recvcounts), send_type, recv_type){}; + : TIData(std::move(name), root, send_size, std::shared_ptr>(sendcounts), recv_size, + std::shared_ptr>(recvcounts), std::move(send_type), std::move(recv_type)){}; explicit TIData(std::string name, int root, int send_size, std::shared_ptr> sendcounts, int recv_size, std::shared_ptr> recvcounts, std::string send_type, std::string recv_type) - : name_(name) + : name_(std::move(name)) , endpoint(root) , send_size(send_size) , sendcounts(sendcounts) , recv_size(recv_size) , recvcounts(recvcounts) - , send_type(send_type) - , recv_type(recv_type){}; + , send_type(std::move(send_type)) + , recv_type(std::move(recv_type)){}; virtual ~TIData() {} @@ -105,14 +103,14 @@ public: class NoOpTIData : public TIData { public: - explicit NoOpTIData(std::string name) : TIData(name){}; + explicit NoOpTIData(std::string name) : TIData(std::move(name)){}; std::string print() override { return getName(); } - std::string display_size() override { return ""; } + std::string display_size() override { return "NA"; } }; class CpuTIData : public TIData { public: - explicit CpuTIData(std::string name, double amount) : TIData(name, amount){}; + explicit CpuTIData(std::string name, double amount) : TIData(std::move(name), amount){}; std::string print() override { std::stringstream stream; @@ -126,16 +124,14 @@ class Pt2PtTIData : public TIData { int tag; public: explicit Pt2PtTIData(std::string name, int endpoint, int size, int tag, std::string datatype) - : TIData(name, endpoint, size, datatype), tag(tag) {}; + : TIData(std::move(name), endpoint, size, std::move(datatype)), tag(tag){}; explicit Pt2PtTIData(std::string name, int endpoint, int size, std::string datatype) - : TIData(name, endpoint, size, datatype), tag(0) {}; + : TIData(std::move(name), endpoint, size, std::move(datatype)), tag(0){}; 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(); } @@ -146,7 +142,7 @@ class CollTIData : public TIData { public: explicit CollTIData(std::string name, int root, double amount, int send_size, int recv_size, std::string send_type, std::string recv_type) - : TIData(name, root, amount, send_size, recv_size, send_type, recv_type){}; + : TIData(std::move(name), root, amount, send_size, recv_size, std::move(send_type), std::move(recv_type)){}; std::string print() override { std::stringstream stream; @@ -168,12 +164,14 @@ class VarCollTIData : public TIData { public: explicit VarCollTIData(std::string name, int root, int send_size, std::vector* sendcounts, int recv_size, std::vector* recvcounts, std::string send_type, std::string recv_type) - : TIData(name, root, send_size, sendcounts, recv_size, recvcounts, send_type, recv_type){}; + : TIData(std::move(name), root, send_size, sendcounts, recv_size, recvcounts, std::move(send_type), + std::move(recv_type)){}; explicit VarCollTIData(std::string name, int root, int send_size, std::shared_ptr> sendcounts, int recv_size, std::shared_ptr> recvcounts, std::string send_type, std::string recv_type) - : TIData(name, root, send_size, sendcounts, recv_size, recvcounts, send_type, recv_type){}; + : TIData(std::move(name), root, send_size, sendcounts, recv_size, recvcounts, std::move(send_type), + std::move(recv_type)){}; std::string print() override { @@ -197,6 +195,45 @@ public: } std::string display_size() override { return std::to_string(send_size > 0 ? send_size : recv_size); } }; + +/** + * If we want to wait for a request of asynchronous communication, we need to be able + * to identify this request. We do this by searching for a request identified by (src, dest, tag). + */ +class WaitTIData : public TIData { + int src; + int dest; + int tag; + +public: + explicit WaitTIData(int src, int dest, int tag) : TIData("wait"), src(src), dest(dest), tag(tag){}; + + std::string print() override + { + std::stringstream stream; + stream << getName() << " " << src << " " << dest << " " << tag; + + return stream.str(); + } + + std::string display_size() override { return "NA"; } +}; + +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 "NA"; } +}; } } @@ -221,7 +258,6 @@ XBT_PRIVATE bool TRACE_categorized(); XBT_PRIVATE bool TRACE_uncategorized(); XBT_PRIVATE bool TRACE_actor_is_enabled(); XBT_PRIVATE bool TRACE_vm_is_enabled(); -XBT_PRIVATE bool TRACE_buffer(); XBT_PRIVATE bool TRACE_disable_link(); XBT_PRIVATE bool TRACE_disable_speed(); XBT_PRIVATE bool TRACE_disable_destroy(); @@ -237,25 +273,31 @@ 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); + const std::string& category, double value, double now, + double delta); /* instr_paje.c */ extern XBT_PRIVATE std::set trivaNodeTypes; extern XBT_PRIVATE std::set trivaEdgeTypes; XBT_PRIVATE long long int instr_new_paje_id(); XBT_PRIVATE void instr_define_callbacks(); -void instr_new_variable_type(std::string new_typename, std::string color); -void instr_new_user_variable_type(std::string father_type, std::string new_typename, std::string color); -void instr_new_user_state_type(std::string father_type, std::string new_typename); -void instr_new_value_for_user_state_type(std::string new_typename, const char* value, std::string color); +void instr_new_variable_type(const std::string& new_typename, const std::string& color); +void instr_new_user_variable_type(const std::string& father_type, const std::string& new_typename, + const std::string& color); +void instr_new_user_state_type(const std::string& father_type, const std::string& new_typename); +void instr_new_value_for_user_state_type(const std::string& new_typename, const char* value, const std::string& color); XBT_PRIVATE void TRACE_global_init(); XBT_PRIVATE void TRACE_help(); XBT_PRIVATE void TRACE_paje_dump_buffer(bool force); -XBT_PRIVATE void dump_comment_file(std::string filename); -XBT_PRIVATE void dump_comment(std::string comment); +XBT_PRIVATE void dump_comment_file(const std::string& filename); +XBT_PRIVATE void dump_comment(const 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