-/* Copyright (c) 2010, 2012-2015. The SimGrid Team.
+/* Copyright (c) 2010, 2012-2017. 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 "mc/mc.h"
-#include "src/instr/instr_private.h"
-#include "src/msg/msg_private.h"
+#include "src/instr/instr_private.hpp"
+#include "src/msg/msg_private.hpp"
#include <atomic>
XBT_DEBUG("EXEC,in %p, %lld, %s", task, task->counter, task->category);
if (TRACE_msg_process_is_enabled()){
- 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* type = PJ_type_get ("MSG_PROCESS_STATE", process_container->type);
- value* val = value::get("task_execute", type);
- new PushStateEvent(MSG_get_clock(), process_container, type, val);
+ container_t process_container = simgrid::instr::Container::byName(instr_process_id(MSG_process_self()));
+ simgrid::instr::StateType* state =
+ static_cast<simgrid::instr::StateType*>(process_container->type_->byName("MSG_PROCESS_STATE"));
+ state->pushEvent(MSG_get_clock(), process_container, "task_execute");
}
}
XBT_DEBUG("EXEC,out %p, %lld, %s", task, task->counter, task->category);
if (TRACE_msg_process_is_enabled()){
- 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* type = PJ_type_get ("MSG_PROCESS_STATE", process_container->type);
- new PopStateEvent (MSG_get_clock(), process_container, type);
+ container_t process_container = simgrid::instr::Container::byName(instr_process_id(MSG_process_self()));
+ simgrid::instr::StateType* state =
+ static_cast<simgrid::instr::StateType*>(process_container->type_->byName("MSG_PROCESS_STATE"));
+ state->popEvent(MSG_get_clock(), process_container);
}
}
XBT_DEBUG("GET,in");
if (TRACE_msg_process_is_enabled()){
- 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* type = PJ_type_get ("MSG_PROCESS_STATE", process_container->type);
- value* val = value::get("receive", type);
- new PushStateEvent(MSG_get_clock(), process_container, type, val);
+ container_t process_container = simgrid::instr::Container::byName(instr_process_id(MSG_process_self()));
+ simgrid::instr::StateType* state =
+ static_cast<simgrid::instr::StateType*>(process_container->type_->byName("MSG_PROCESS_STATE"));
+ state->pushEvent(MSG_get_clock(), process_container, "receive");
}
}
XBT_DEBUG("GET,out %p, %lld, %s", task, task->counter, task->category);
if (TRACE_msg_process_is_enabled()){
- 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* type = PJ_type_get ("MSG_PROCESS_STATE", process_container->type);
- new PopStateEvent (MSG_get_clock(), process_container, type);
-
- 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 EndLinkEvent(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::StateType* state =
+ static_cast<simgrid::instr::StateType*>(process_container->type_->byName("MSG_PROCESS_STATE"));
+ state->popEvent(MSG_get_clock(), process_container);
+
+ std::string key = std::string("p") + std::to_string(task->counter);
+ simgrid::instr::LinkType* link =
+ static_cast<simgrid::instr::LinkType*>(simgrid::instr::Type::getRootType()->byName("MSG_PROCESS_TASK_LINK"));
+ link->endEvent(MSG_get_clock(), simgrid::instr::Container::getRootContainer(), process_container, "SR", key);
}
}
XBT_DEBUG("PUT,in %p, %lld, %s", task, task->counter, task->category);
if (TRACE_msg_process_is_enabled()){
- 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* type = PJ_type_get ("MSG_PROCESS_STATE", process_container->type);
- value* val = value::get("send", type);
- new 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 ("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::StateType* state =
+ static_cast<simgrid::instr::StateType*>(process_container->type_->byName("MSG_PROCESS_STATE"));
+ state->pushEvent(MSG_get_clock(), process_container, "send");
+
+ std::string key = std::string("p") + std::to_string(task->counter);
+ simgrid::instr::LinkType* link =
+ static_cast<simgrid::instr::LinkType*>(simgrid::instr::Type::getRootType()->byName("MSG_PROCESS_TASK_LINK"));
+ link->startEvent(MSG_get_clock(), simgrid::instr::Container::getRootContainer(), process_container, "SR", key);
}
return 1;
XBT_DEBUG("PUT,out");
if (TRACE_msg_process_is_enabled()){
- 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* type = PJ_type_get ("MSG_PROCESS_STATE", process_container->type);
- new PopStateEvent (MSG_get_clock(), process_container, type);
+ container_t process_container = simgrid::instr::Container::byName(instr_process_id(MSG_process_self()));
+ simgrid::instr::StateType* state =
+ static_cast<simgrid::instr::StateType*>(process_container->type_->byName("MSG_PROCESS_STATE"));
+ state->popEvent(MSG_get_clock(), process_container);
}
}