X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/68bf973c759c6eef597da8349276be4b60a6d124..51c23076e2b42ff07dc167dea1cb0e3a4ab3cf68:/src/instr/instr_private.hpp diff --git a/src/instr/instr_private.hpp b/src/instr/instr_private.hpp index 9f2041ede3..52c6aaa8f2 100644 --- a/src/instr/instr_private.hpp +++ b/src/instr/instr_private.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2010-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2010-2018. 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. */ @@ -8,8 +8,8 @@ #include -#include "instr/instr_interface.h" #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" @@ -17,8 +17,12 @@ #include "src/instr/instr_paje_values.hpp" #include "src/internal_config.h" #include "xbt/graph.h" + +#include #include /** std::setprecision **/ +#include #include +#include #include #include #include @@ -26,7 +30,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 @@ -35,6 +38,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; @@ -42,9 +54,9 @@ class TIData { public: int endpoint = 0; int send_size = 0; - std::vector* sendcounts = nullptr; + std::shared_ptr> sendcounts = nullptr; int recv_size = 0; - std::vector* recvcounts = nullptr; + std::shared_ptr> recvcounts = nullptr; std::string send_type = ""; std::string recv_type = ""; @@ -68,6 +80,12 @@ public: // 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) : name_(name) , endpoint(root) , send_size(send_size) @@ -77,11 +95,7 @@ public: , send_type(send_type) , recv_type(recv_type){}; - virtual ~TIData() - { - delete sendcounts; - delete recvcounts; - } + virtual ~TIData() {} std::string getName() { return name_; } double getAmount() { return amount_; } @@ -109,16 +123,20 @@ 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 << tag << " " << send_size << " " << send_type; return stream.str(); } std::string display_size() override { return std::to_string(send_size); } @@ -151,6 +169,12 @@ 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) + : TIData(name, root, send_size, sendcounts, recv_size, recvcounts, send_type, recv_type){}; + std::string print() override { std::stringstream stream; @@ -178,8 +202,6 @@ public: 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; @@ -188,74 +210,51 @@ 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_msg_vm_is_enabled(); -XBT_PRIVATE bool TRACE_buffer(); +XBT_PRIVATE bool TRACE_vm_is_enabled(); XBT_PRIVATE bool TRACE_disable_link(); XBT_PRIVATE bool TRACE_disable_speed(); -XBT_PRIVATE bool TRACE_onelink_only(); XBT_PRIVATE bool TRACE_disable_destroy(); XBT_PRIVATE bool TRACE_basic(); XBT_PRIVATE bool TRACE_display_sizes(); XBT_PRIVATE int TRACE_precision(); -XBT_PRIVATE void instr_pause_tracing(); -XBT_PRIVATE void instr_resume_tracing(); /* Public functions used in SMPI */ -XBT_PUBLIC(bool) TRACE_smpi_is_enabled(); -XBT_PUBLIC(bool) TRACE_smpi_is_grouped(); -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_PUBLIC bool TRACE_smpi_is_enabled(); +XBT_PUBLIC bool TRACE_smpi_is_grouped(); +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); -/* 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(); #endif