-/* Copyright (c) 2010-2019. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2010-2020. 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 <set>
#include <sstream>
#include <string>
-#include <sys/stat.h>
-#ifdef WIN32
-#include <direct.h> // _mkdir
-/* Need to define function drand48 for Windows */
-#define drand48() (rand() / (RAND_MAX + 1.0))
-#endif
typedef simgrid::instr::Container* container_t;
std::string recv_type = "";
// NoOpTI: init, finalize, test, wait, barrier
- explicit TIData(std::string name) : name_(std::move(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_(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_(std::move(name)), endpoint(endpoint), send_size(size), send_type(std::move(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)
- : name_(std::move(name))
+ 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)
, send_size(send_size)
, recv_size(recv_size)
- , send_type(std::move(send_type))
- , recv_type(std::move(recv_type)){};
+ , 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<int>* sendcounts, int recv_size,
- std::vector<int>* recvcounts, std::string send_type, std::string recv_type)
- : TIData(std::move(name), root, send_size, std::shared_ptr<std::vector<int>>(sendcounts), recv_size,
- std::shared_ptr<std::vector<int>>(recvcounts), std::move(send_type), std::move(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_(std::move(name))
+ explicit TIData(const std::string& name, int root, int send_size, std::vector<int>* sendcounts, int recv_size,
+ std::vector<int>* recvcounts, const std::string& send_type, const 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(const 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, const std::string& send_type,
+ const std::string& recv_type)
+ : name_(name)
, endpoint(root)
, send_size(send_size)
, sendcounts(sendcounts)
, recv_size(recv_size)
, recvcounts(recvcounts)
- , send_type(std::move(send_type))
- , recv_type(std::move(recv_type)){};
+ , send_type(send_type)
+ , recv_type(recv_type){};
virtual ~TIData() {}
- std::string getName() { return name_; }
+ const std::string& getName() const { return name_; }
double getAmount() { return amount_; }
virtual std::string print() = 0;
virtual std::string display_size() = 0;
class NoOpTIData : public TIData {
public:
- explicit NoOpTIData(std::string name) : TIData(std::move(name)){};
+ explicit NoOpTIData(const std::string& name) : TIData(name){};
std::string print() override { return getName(); }
std::string display_size() override { return "NA"; }
};
class CpuTIData : public TIData {
public:
- explicit CpuTIData(std::string name, double amount) : TIData(std::move(name), amount){};
+ explicit CpuTIData(const std::string& name, double amount) : TIData(name, amount){};
std::string print() override
{
std::stringstream stream;
};
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(std::move(name), endpoint, size, std::move(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(std::move(name), endpoint, size, std::move(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;
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(std::move(name), root, amount, send_size, recv_size, std::move(send_type), std::move(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;
class VarCollTIData : public TIData {
public:
- 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(std::move(name), root, send_size, sendcounts, recv_size, recvcounts, std::move(send_type),
- std::move(recv_type)){};
+ explicit VarCollTIData(const std::string& name, int root, int send_size, std::vector<int>* sendcounts, int recv_size,
+ std::vector<int>* recvcounts, const std::string& send_type, const 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(std::move(name), root, send_size, sendcounts, recv_size, recvcounts, std::move(send_type),
- std::move(recv_type)){};
+ explicit VarCollTIData(const 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, 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
{
}
}
-XBT_PRIVATE std::string instr_pid(s4u_Actor* proc);
+XBT_PRIVATE std::string instr_pid(simgrid::s4u::Actor const& proc);
extern XBT_PRIVATE std::set<std::string> created_categories;
extern XBT_PRIVATE std::set<std::string> declared_marks;
double delta);
/* instr_paje.c */
-extern XBT_PRIVATE std::set<std::string> trivaNodeTypes;
-extern XBT_PRIVATE std::set<std::string> trivaEdgeTypes;
XBT_PRIVATE long long int instr_new_paje_id();
XBT_PRIVATE void instr_define_callbacks();
void instr_new_variable_type(const std::string& new_typename, const std::string& color);
/* instr_platform */
xbt_graph_t instr_routing_platform_graph();
-void instr_routing_platform_graph_export_graphviz(xbt_graph_t g, const char* filename);
+void instr_routing_platform_graph_export_graphviz(const s_xbt_graph_t* g, const char* filename);
#endif