-/* Copyright (c) 2010, 2012-2015. The SimGrid Team.
+/* 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 "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_free (task->category);
task->category = nullptr;
XBT_DEBUG("MSG task %p(%s), category removed", task, task->name);
- return;
- }
-
- //set task category
- task->category = xbt_strdup (category);
- XBT_DEBUG("MSG task %p(%s), category %s", task, task->name, task->category);
-}
-
-/* MSG_task_create related function*/
-void TRACE_msg_task_create(msg_task_t task)
-{
- static std::atomic_ullong counter{0};
- task->counter = counter++;
- task->category = nullptr;
-
- if(MC_is_active())
- MC_ignore_heap(&(task->counter), sizeof(task->counter));
-
- XBT_DEBUG("CREATE %p, %lld", task, task->counter);
-}
-
-/* MSG_task_execute related functions */
-void TRACE_msg_task_execute_start(msg_task_t task)
-{ paje_value pj_value;
- 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_t type = PJ_type_get ("MSG_PROCESS_STATE", process_container->type);
- val_t value = pj_value.PJ_value_get ("task_execute", type);
- new PushStateEvent (MSG_get_clock(), process_container, type, value);
+ } else {
+ // set task category
+ task->category = xbt_strdup(category);
+ XBT_DEBUG("MSG task %p(%s), category %s", task, task->name, task->category);
}
}
-void TRACE_msg_task_execute_end(msg_task_t task)
-{
- 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_t type = PJ_type_get ("MSG_PROCESS_STATE", process_container->type);
- new PopStateEvent (MSG_get_clock(), process_container, type);
- }
-}
-
-/* MSG_task_destroy related functions */
-void TRACE_msg_task_destroy(msg_task_t task)
-{
- XBT_DEBUG("DESTROY %p, %lld, %s", task, task->counter, task->category);
-
- //free category
- xbt_free(task->category);
- task->category = nullptr;
-}
-
-/* MSG_task_get related functions */
void TRACE_msg_task_get_start()
-{ paje_value pj_value;
+{
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_t type = PJ_type_get ("MSG_PROCESS_STATE", process_container->type);
- val_t value = pj_value.PJ_value_get ("receive", type);
- new PushStateEvent (MSG_get_clock(), process_container, type, value);
- }
+ if (TRACE_actor_is_enabled())
+ simgrid::instr::Container::by_name(instr_pid(MSG_process_self()))->get_state("ACTOR_STATE")->push_event("receive");
}
-void TRACE_msg_task_get_end(double start_time, msg_task_t task)
+void TRACE_msg_task_get_end(msg_task_t task)
{
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];
+ if (TRACE_actor_is_enabled()) {
+ container_t process_container = simgrid::instr::Container::by_name(instr_pid(MSG_process_self()));
+ process_container->get_state("ACTOR_STATE")->pop_event();
- 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);
- 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);
+ std::string key = std::string("p") + std::to_string(task->counter);
+ simgrid::instr::Container::get_root()->get_link("ACTOR_TASK_LINK")->end_event(process_container, "SR", key);
}
}
/* MSG_task_put related functions */
-int TRACE_msg_task_put_start(msg_task_t task)
-{ paje_value pj_value;
+void TRACE_msg_task_put_start(msg_task_t task)
+{
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_t type = PJ_type_get ("MSG_PROCESS_STATE", process_container->type);
- val_t value = pj_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);
+ if (TRACE_actor_is_enabled()) {
+ container_t process_container = simgrid::instr::Container::by_name(instr_pid(MSG_process_self()));
+ std::string key = std::string("p") + std::to_string(task->counter);
+ simgrid::instr::Container::get_root()->get_link("ACTOR_TASK_LINK")->start_event(process_container, "SR", key);
}
-
- return 1;
}
void TRACE_msg_task_put_end()
{
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_t type = PJ_type_get ("MSG_PROCESS_STATE", process_container->type);
- new PopStateEvent (MSG_get_clock(), process_container, type);
- }
+ if (TRACE_actor_is_enabled())
+ simgrid::instr::Container::by_name(instr_pid(MSG_process_self()))->get_state("ACTOR_STATE")->pop_event();
}
