-/* Copyright (c) 2010-2018. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2010-2019. 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 "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 <fstream>
// 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)
, 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<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,
public:
explicit NoOpTIData(std::string name) : TIData(name){};
std::string print() override { return getName(); }
- std::string display_size() override { return ""; }
+ std::string display_size() override { return "NA"; }
};
class CpuTIData : public TIData {
std::string print() override
{
std::stringstream stream;
- stream << getName() << " ";
- if (endpoint >= 0)
- stream << endpoint << " ";
+ stream << getName() << " " << endpoint << " ";
stream << tag << " " << send_size << " " << send_type;
return stream.str();
}
return stream.str();
}
- std::string display_size() override { return ""; }
+ std::string display_size() override { return "NA"; }
+};
+
+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 "NA"; }
};
}
}
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);
+ std::string category, double value, double now, double delta);
/* instr_paje.c */
extern XBT_PRIVATE std::set<std::string> trivaNodeTypes;
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