-/* 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. */
#include <xbt/base.h>
-#include "instr/instr_interface.h"
+#include "instr/instr_interface.hpp"
#include "simgrid/instr.h"
#include "simgrid_config.h"
#include "src/instr/instr_paje_containers.hpp"
#include "src/instr/instr_paje_values.hpp"
#include "src/internal_config.h"
#include "xbt/graph.h"
+
#include <iomanip> /** std::setprecision **/
#include <map>
+#include <memory>
#include <set>
#include <sstream>
#include <string>
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;
public:
int endpoint = 0;
int send_size = 0;
- std::vector<int>* sendcounts = nullptr;
+ std::shared_ptr<std::vector<int>> sendcounts = nullptr;
int recv_size = 0;
- std::vector<int>* recvcounts = nullptr;
+ std::shared_ptr<std::vector<int>> recvcounts = nullptr;
std::string send_type = "";
std::string recv_type = "";
- ;
// NoOpTI: init, finalize, test, wait, barrier
explicit TIData(std::string name) : name_(name){};
// VarCollTI: gatherV, scatterV, allGatherV, allToAllV (+ reduceScatter out of laziness)
explicit TIData(std::string name, int root, int send_size, std::vector<int>* sendcounts, int recv_size,
std::vector<int>* recvcounts, std::string send_type, std::string recv_type)
+ : TIData(name, root, send_size, std::shared_ptr<std::vector<int>>(sendcounts), recv_size,
+ std::shared_ptr<std::vector<int>>(recvcounts), send_type, recv_type){};
+
+ explicit TIData(std::string name, int root, int send_size, std::shared_ptr<std::vector<int>> sendcounts,
+ int recv_size, std::shared_ptr<std::vector<int>> recvcounts, std::string send_type,
+ std::string recv_type)
: name_(name)
, endpoint(root)
, send_size(send_size)
, 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_; }
};
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); }
explicit VarCollTIData(std::string name, int root, int send_size, std::vector<int>* sendcounts, int recv_size,
std::vector<int>* 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<std::vector<int>> sendcounts,
+ int recv_size, std::shared_ptr<std::vector<int>> 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;
}
}
-extern "C" {
+XBT_PRIVATE std::string instr_pid(s4u_Actor* proc);
extern XBT_PRIVATE std::set<std::string> created_categories;
extern XBT_PRIVATE std::set<std::string> declared_marks;
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_msg_process_is_enabled();
-XBT_PRIVATE bool TRACE_msg_vm_is_enabled();
+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_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 TRACE_generate_viva_uncat_conf();
-XBT_PRIVATE void TRACE_generate_viva_cat_conf();
-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();
+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(void) TRACE_surf_resource_utilization_alloc();
/* instr_paje.c */
extern XBT_PRIVATE std::set<std::string> trivaNodeTypes;
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();
-XBT_PRIVATE std::string TRACE_get_viva_uncat_conf();
-XBT_PRIVATE std::string TRACE_get_viva_cat_conf();
#endif