/* 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 "src/instr/instr_private.h"
-#include "msg_private.h"
#include "mc/mc.h"
+#include "src/instr/instr_private.h"
+#include "src/msg/msg_private.h"
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_msg, instr, "MSG");
+#include <atomic>
+
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_msg, instr, "MSG instrumentation");
void TRACE_msg_set_task_category(msg_task_t task, const char *category)
{
- xbt_assert(task->category == NULL, "Task %p(%s) already has a category (%s).",
+ xbt_assert(task->category == nullptr, "Task %p(%s) already has a category (%s).",
task, task->name, task->category);
- //if user provides a NULL category, task is no longer traced
- if (category == NULL) {
+ //if user provides a nullptr category, task is no longer traced
+ if (category == nullptr) {
xbt_free (task->category);
- task->category = NULL;
+ task->category = nullptr;
XBT_DEBUG("MSG task %p(%s), category removed", task, task->name);
return;
}
/* MSG_task_create related function*/
void TRACE_msg_task_create(msg_task_t task)
{
- static long long counter = 0;
+ static std::atomic_ullong counter{0};
task->counter = counter++;
- task->category = NULL;
-
+ task->category = nullptr;
+
if(MC_is_active())
MC_ignore_heap(&(task->counter), sizeof(task->counter));
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 ("task_execute", type);
- new_pajePushState (MSG_get_clock(), process_container, type, value);
+ value* val = value::get("task_execute", type);
+ new PushStateEvent(MSG_get_clock(), process_container, type, val);
}
}
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_pajePopState (MSG_get_clock(), process_container, type);
+ new PopStateEvent (MSG_get_clock(), process_container, type);
}
}
//free category
xbt_free(task->category);
- task->category = NULL;
- return;
+ task->category = nullptr;
}
/* MSG_task_get related functions */
-void TRACE_msg_task_get_start(void)
+void TRACE_msg_task_get_start()
{
XBT_DEBUG("GET,in");
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 ("receive", type);
- new_pajePushState (MSG_get_clock(), process_container, type, value);
+ value* val = value::get("receive", type);
+ new PushStateEvent(MSG_get_clock(), process_container, type, val);
}
}
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_pajePopState (MSG_get_clock(), 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_pajeEndLink(MSG_get_clock(), PJ_container_get_root(), type, process_container, "SR", key);
+ new EndLinkEvent(MSG_get_clock(), PJ_container_get_root(), type, process_container, "SR", key);
}
}
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_pajePushState (MSG_get_clock(), process_container, type, value);
+ 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_pajeStartLink(MSG_get_clock(), PJ_container_get_root(), type, process_container, "SR", key);
+ new StartLinkEvent(MSG_get_clock(), PJ_container_get_root(), type, process_container, "SR", key);
}
return 1;
}
-void TRACE_msg_task_put_end(void)
+void TRACE_msg_task_put_end()
{
XBT_DEBUG("PUT,out");
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_pajePopState (MSG_get_clock(), process_container, type);
+ new PopStateEvent (MSG_get_clock(), process_container, type);
}
}