X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1340b2bc2a098a7e87fa45ff31591d32c864dc7a..c619e9d16e3061f1d05b187d80bc65eb578fb868:/src/instr/instr_private.hpp diff --git a/src/instr/instr_private.hpp b/src/instr/instr_private.hpp index 0004fa948b..153996b73d 100644 --- a/src/instr/instr_private.hpp +++ b/src/instr/instr_private.hpp @@ -8,16 +8,17 @@ #include -#include "instr/instr_interface.h" #include "simgrid/instr.h" -#include "simgrid_config.h" +#include "simgrid/s4u/Actor.hpp" #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 #include /** std::setprecision **/ +#include #include #include #include @@ -27,7 +28,6 @@ #ifdef WIN32 #include // _mkdir /* Need to define function drand48 for Windows */ -/* FIXME: use _drand48() defined in src/surf/random_mgr.c instead */ #define drand48() (rand() / (RAND_MAX + 1.0)) #endif @@ -36,6 +36,15 @@ typedef simgrid::instr::Container* container_t; namespace simgrid { namespace instr { +/* Format of TRACING output. + * - paje is the regular format, that we all know + * - TI is a trick to reuse the tracing functions to generate a time independent trace during the execution. Such + * trace can easily be replayed with smpi_replay afterward. This trick should be removed and replaced by some code + * using the signal that we will create to cleanup the TRACING + */ +enum class TraceFormat { Paje, /*TimeIndependent*/ Ti }; +extern TraceFormat trace_format; + class TIData { std::string name_; double amount_ = 0; @@ -51,12 +60,12 @@ public: // NoOpTI: init, finalize, test, wait, barrier explicit TIData(std::string name) : name_(name){}; - // CPuTI: compute, sleep (+ waitAny and waitAll out of laziness) + // 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) : name_(name), endpoint(endpoint), send_size(size), send_type(datatype){}; - // CollTI: bcast, reduce, allReduce, gather, scatter, allGather, allToAll + // 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) @@ -66,7 +75,7 @@ public: , recv_size(recv_size) , send_type(send_type) , recv_type(recv_type){}; - // VarCollTI: gatherV, scatterV, allGatherV, allToAllV (+ reduceScatter out of laziness) + // 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, @@ -112,16 +121,18 @@ public: }; 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) {}; + explicit Pt2PtTIData(std::string name, int endpoint, int size, std::string datatype) - : TIData(name, endpoint, size, datatype){}; + : TIData(name, endpoint, size, datatype), tag(0) {}; std::string print() override { std::stringstream stream; - stream << getName() << " "; - if (endpoint >= 0) - stream << endpoint << " "; - stream << send_size << " " << send_type; + stream << getName() << " " << endpoint << " "; + stream << tag << " " << send_size << " " << send_type; return stream.str(); } std::string display_size() override { return std::to_string(send_size); } @@ -182,13 +193,50 @@ 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 ""; } +}; + +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 ""; } +}; } } XBT_PRIVATE std::string instr_pid(s4u_Actor* proc); -extern "C" { - extern XBT_PRIVATE std::set created_categories; extern XBT_PRIVATE std::set declared_marks; extern XBT_PRIVATE std::set user_host_variables; @@ -197,23 +245,17 @@ extern XBT_PRIVATE std::set user_link_variables; extern XBT_PRIVATE double TRACE_last_timestamp_to_dump; /* instr_paje_header.c */ -XBT_PRIVATE void TRACE_header(bool basic, int size); - -/* from paje.c */ -XBT_PRIVATE void TRACE_paje_start(); -XBT_PRIVATE void TRACE_paje_end(); +XBT_PRIVATE void TRACE_header(bool basic, bool size); /* from instr_config.c */ XBT_PRIVATE bool TRACE_needs_platform(); XBT_PRIVATE bool TRACE_is_enabled(); XBT_PRIVATE bool TRACE_platform(); XBT_PRIVATE bool TRACE_platform_topology(); -XBT_PRIVATE bool TRACE_is_configured(); 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(); @@ -228,40 +270,30 @@ XBT_PUBLIC bool TRACE_smpi_is_computing(); XBT_PUBLIC bool TRACE_smpi_is_sleeping(); XBT_PUBLIC bool TRACE_smpi_view_internals(); -/* from resource_utilization.c */ -XBT_PRIVATE void TRACE_surf_host_set_utilization(const char* resource, const char* category, double value, double now, - double delta); -XBT_PRIVATE void TRACE_surf_link_set_utilization(const char* resource, const char* category, double value, double now, - double delta); +XBT_PRIVATE void TRACE_surf_resource_set_utilization(const char* type, const char* name, const char* resource, + 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); -/* instr_config.c */ -XBT_PRIVATE void TRACE_TI_start(); -XBT_PRIVATE void TRACE_TI_end(); +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); -/* Format of TRACING output. - * - paje is the regular format, that we all know - * - TI is a trick to reuse the tracing functions to generate a time independent trace during the execution. Such - * trace can easily be replayed with smpi_replay afterward. This trick should be removed and replaced by some code - * using the signal that we will create to cleanup the TRACING - */ -enum instr_fmt_type_t { instr_fmt_paje, instr_fmt_TI }; -extern instr_fmt_type_t instr_fmt_type; -} -XBT_PRIVATE std::string TRACE_get_comment(); -XBT_PRIVATE std::string TRACE_get_comment_file(); 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