X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dabc974c900a0e86479655752a6c915385d670e7..3965b45784421b5cdf6069e048dad3e184ae7d72:/src/instr/instr_private.hpp diff --git a/src/instr/instr_private.hpp b/src/instr/instr_private.hpp index 48fc023878..a9c3598c65 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-2021. 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. */ @@ -14,8 +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 #include /** std::setprecision **/ @@ -25,17 +23,15 @@ #include #include #include -#include -#ifdef WIN32 -#include // _mkdir -/* Need to define function drand48 for Windows */ -#define drand48() (rand() / (RAND_MAX + 1.0)) -#endif - -typedef simgrid::instr::Container* container_t; namespace simgrid { namespace instr { +namespace paje { + +void dump_generator_version(); +void dump_comment_file(const std::string& filename); +void dump_header(bool basic, bool display_sizes); +} // namespace paje /* Format of TRACING output. * - paje is the regular format, that we all know @@ -45,6 +41,17 @@ namespace instr { */ enum class TraceFormat { Paje, /*TimeIndependent*/ Ti }; extern TraceFormat trace_format; +extern int trace_precision; +extern double last_timestamp_to_dump; + +void init(); +void define_callbacks(); + +void platform_graph_export_graphviz(const std::string& output_filename); + +void resource_set_utilization(const char* type, const char* name, const char* resource, const std::string& category, + double value, double now, double delta); +void dump_buffer(bool force); class TIData { std::string name_; @@ -60,15 +67,15 @@ public: std::string recv_type = ""; // NoOpTI: init, finalize, test, wait, barrier - explicit TIData(std::string name) : name_(name){}; + explicit TIData(const 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){}; - // Pt2PtTI: send, isend, sssend, issend, recv, irecv - explicit TIData(std::string name, int endpoint, int size, std::string datatype) + explicit TIData(const std::string& name, double amount) : name_(name), amount_(amount){}; + // Pt2PtTI: send, isend, ssend, issend, recv, irecv + explicit TIData(const std::string& name, int endpoint, int size, const std::string& datatype) : name_(name), endpoint(endpoint), send_size(size), send_type(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) + // CollTI: bcast, reduce, allreduce, gather, scatter, allgather, alltoall + explicit TIData(const std::string& name, int root, double amount, int send_size, int recv_size, + const std::string& send_type, const std::string& recv_type) : name_(name) , amount_(amount) , endpoint(root) @@ -76,15 +83,10 @@ public: , recv_size(recv_size) , send_type(send_type) , recv_type(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){}; - - 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) + // VarCollTI: gatherv, scatterv, allgatherv, alltoallv (+ reducescatter out of laziness) + explicit TIData(const std::string& name, int root, int send_size, std::shared_ptr> sendcounts, + int recv_size, std::shared_ptr> recvcounts, const std::string& send_type, + const std::string& recv_type) : name_(name) , endpoint(root) , send_size(send_size) @@ -94,47 +96,46 @@ public: , send_type(send_type) , recv_type(recv_type){}; - virtual ~TIData() {} + virtual ~TIData() = default; - std::string getName() { return name_; } - double getAmount() { return amount_; } + const std::string& get_name() const { return name_; } + double get_amount() const { return amount_; } virtual std::string print() = 0; virtual std::string display_size() = 0; }; class NoOpTIData : public TIData { public: - explicit NoOpTIData(std::string name) : TIData(name){}; - std::string print() override { return getName(); } - std::string display_size() override { return ""; } + explicit NoOpTIData(const std::string& name) : TIData(name){}; + std::string print() override { return get_name(); } + std::string display_size() override { return "NA"; } }; class CpuTIData : public TIData { public: - explicit CpuTIData(std::string name, double amount) : TIData(name, amount){}; + explicit CpuTIData(const std::string& name, double amount) : TIData(name, amount){}; std::string print() override { std::stringstream stream; - stream << getName() << " " << getAmount(); + stream << get_name() << " " << get_amount(); return stream.str(); } - std::string display_size() override { return std::to_string(getAmount()); } + std::string display_size() override { return std::to_string(get_amount()); } }; class Pt2PtTIData : public TIData { - int tag; + int tag = 0; + public: - explicit Pt2PtTIData(std::string name, int endpoint, int size, int tag, std::string datatype) - : TIData(name, endpoint, size, datatype), tag(tag) {}; + explicit Pt2PtTIData(const std::string& name, int endpoint, int size, int tag, const std::string& datatype) + : TIData(name, endpoint, size, datatype), tag(tag){}; - explicit Pt2PtTIData(std::string name, int endpoint, int size, std::string datatype) - : TIData(name, endpoint, size, datatype), tag(0) {}; + explicit Pt2PtTIData(const std::string& name, int endpoint, int size, const std::string& datatype) + : TIData(name, endpoint, size, datatype){}; std::string print() override { std::stringstream stream; - stream << getName() << " "; - if (endpoint >= 0) - stream << endpoint << " "; + stream << get_name() << " " << endpoint << " "; stream << tag << " " << send_size << " " << send_type; return stream.str(); } @@ -143,17 +144,17 @@ public: 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) + explicit CollTIData(const std::string& name, int root, double amount, int send_size, int recv_size, + const std::string& send_type, const std::string& recv_type) : TIData(name, root, amount, send_size, recv_size, send_type, recv_type){}; std::string print() override { std::stringstream stream; - stream << getName() << " " << send_size << " "; + stream << get_name() << " " << send_size << " "; if (recv_size >= 0) stream << recv_size << " "; - if (getAmount() >= 0.0) - stream << getAmount() << " "; + if (get_amount() >= 0.0) + stream << get_amount() << " "; if (endpoint > 0 || (endpoint == 0 && not send_type.empty())) stream << endpoint << " "; stream << send_type << " " << recv_type; @@ -165,19 +166,15 @@ public: 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){}; - - 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) + explicit VarCollTIData(const std::string& name, int root, int send_size, std::shared_ptr> sendcounts, + int recv_size, std::shared_ptr> recvcounts, const std::string& send_type, + const std::string& recv_type) : TIData(name, root, send_size, sendcounts, recv_size, recvcounts, send_type, recv_type){}; std::string print() override { std::stringstream stream; - stream << getName() << " "; + stream << get_name() << " "; if (send_size >= 0) stream << send_size << " "; if (sendcounts != nullptr) @@ -212,27 +209,39 @@ public: std::string print() override { std::stringstream stream; - stream << getName() << " " << src << " " << dest << " " << tag; + stream << get_name() << " " << src << " " << dest << " " << tag; return stream.str(); } - std::string display_size() override { return ""; } + std::string display_size() override { return "NA"; } }; -} -} -XBT_PRIVATE std::string instr_pid(s4u_Actor* proc); +class AmpiMigrateTIData : public TIData { + size_t memory_consumption; +public: + explicit AmpiMigrateTIData(size_t memory_conso) : TIData("migrate"), memory_consumption(memory_conso) { }; -extern XBT_PRIVATE std::set created_categories; -extern XBT_PRIVATE std::set declared_marks; -extern XBT_PRIVATE std::set user_host_variables; -extern XBT_PRIVATE std::set user_vm_variables; -extern XBT_PRIVATE std::set user_link_variables; -extern XBT_PRIVATE double TRACE_last_timestamp_to_dump; + std::string print() override + { + std::stringstream stream; + stream << get_name() << " " << memory_consumption; + + return stream.str(); + } + + std::string display_size() override { return "NA"; } +}; +} // namespace instr +} // namespace simgrid + +XBT_PRIVATE std::string instr_pid(simgrid::s4u::Actor const& proc); -/* instr_paje_header.c */ -XBT_PRIVATE void TRACE_header(bool basic, bool size); +extern XBT_PRIVATE std::set> created_categories; +extern XBT_PRIVATE std::set> declared_marks; +extern XBT_PRIVATE std::set> user_host_variables; +extern XBT_PRIVATE std::set> user_vm_variables; +extern XBT_PRIVATE std::set> user_link_variables; /* from instr_config.c */ XBT_PRIVATE bool TRACE_needs_platform(); @@ -245,10 +254,7 @@ XBT_PRIVATE bool TRACE_actor_is_enabled(); XBT_PRIVATE bool TRACE_vm_is_enabled(); XBT_PRIVATE bool TRACE_disable_link(); XBT_PRIVATE bool TRACE_disable_speed(); -XBT_PRIVATE bool TRACE_disable_destroy(); -XBT_PRIVATE bool TRACE_basic(); XBT_PRIVATE bool TRACE_display_sizes(); -XBT_PRIVATE int TRACE_precision(); /* Public functions used in SMPI */ XBT_PUBLIC bool TRACE_smpi_is_enabled(); @@ -257,26 +263,13 @@ XBT_PUBLIC bool TRACE_smpi_is_computing(); 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); - /* 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); - -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); +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 std::string TRACE_get_filename(); +XBT_PRIVATE void TRACE_help(); #endif