- 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));
- simgrid::instr::Type* type = process_container->type_->getChild("MSG_PROCESS_STATE");
- simgrid::instr::Value* val = simgrid::instr::Value::get("send", type);
- new simgrid::instr::PushStateEvent(MSG_get_clock(), process_container, type, val);
-
- char key[INSTR_DEFAULT_STR_SIZE];
- snprintf (key, INSTR_DEFAULT_STR_SIZE, "p%lld", task->counter);
- type = PJ_type_get_root()->getChild("MSG_PROCESS_TASK_LINK");
- new simgrid::instr::StartLinkEvent(MSG_get_clock(), PJ_container_get_root(), type, process_container, "SR", key);
+ container_t process_container = simgrid::instr::Container::byName(instr_pid(MSG_process_self()));
+ process_container->getState("MSG_PROCESS_STATE")->pushEvent("send");
+
+ std::string key = std::string("p") + std::to_string(task->counter);
+ container_t root = simgrid::instr::Container::getRootContainer();
+ simgrid::instr::LinkType* link = root->getLink("MSG_PROCESS_TASK_LINK");
+ link->startEvent(root, process_container, "SR", key);