#include <exception>
-#include "colls_private.h"
+#include "colls_private.hpp"
#include "smpi_process.hpp"
#define TRACE_AUTO_COLL(cat) \
if (TRACE_is_enabled()) { \
- type_t type = PJ_type_get_or_null(#cat, PJ_type_get_root()); \
- if (not type) { \
- type = PJ_type_event_new(#cat, PJ_type_get_root()); \
- } \
+ simgrid::instr::EventType* type = \
+ static_cast<simgrid::instr::EventType*>(simgrid::instr::Type::getRootType()->getOrCreateEventType(#cat)); \
+ \
char cont_name[25]; \
snprintf(cont_name, 25, "rank-%d", smpi_process()->index()); \
- value* val = value::get_or_new(Colls::mpi_coll_##cat##_description[i].name, "1.0 1.0 1.0", type); \
- new NewEvent(SIMIX_get_clock(), PJ_container_get(cont_name), type, val); \
+ type->addEntityValue(Colls::mpi_coll_##cat##_description[i].name, "1.0 1.0 1.0"); \
+ new simgrid::instr::NewEvent(SIMIX_get_clock(), simgrid::instr::Container::byName(cont_name), type, \
+ type->getEntityValue(Colls::mpi_coll_##cat##_description[i].name)); \
}
#define AUTOMATIC_COLL_BENCH(cat, ret, args, args2) \