- int len = INSTR_DEFAULT_STR_SIZE;
- char str[INSTR_DEFAULT_STR_SIZE];
-
- container_t process_container = PJ_container_get (instr_process_id(MSG_process_self(), str, len));
- type_t type = PJ_type_get ("MSG_PROCESS_STATE", process_container->type);
- val_t value = PJ_value_get ("send", type);
- new PushStateEvent (MSG_get_clock(), process_container, type, value);
-
- char key[INSTR_DEFAULT_STR_SIZE];
- snprintf (key, INSTR_DEFAULT_STR_SIZE, "p%lld", task->counter);
- type = PJ_type_get ("MSG_PROCESS_TASK_LINK", PJ_type_get_root());
- new StartLinkEvent(MSG_get_clock(), PJ_container_get_root(), type, process_container, "SR", key);
+ container_t process_container = simgrid::instr::Container::byName(instr_process_id(MSG_process_self()));
+ simgrid::instr::Type* type = process_container->type_->byName("MSG_PROCESS_STATE");
+ simgrid::instr::Value* val = type->getEntityValue("send");
+ new simgrid::instr::PushStateEvent(MSG_get_clock(), process_container, type, val);
+
+ std::string key = std::string("p") + std::to_string(task->counter);
+ type = simgrid::instr::Type::getRootType()->byName("MSG_PROCESS_TASK_LINK");
+ new simgrid::instr::StartLinkEvent(MSG_get_clock(), simgrid::instr::Container::getRootContainer(), type,
+ process_container, "SR", key);