-/* 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/mc/mc_ignore.h"
+#include "src/instr/instr_private.hpp"
+#include "src/msg/msg_private.hpp"
+
+#include <atomic>
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_msg, instr, "MSG instrumentation");
/* 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 = nullptr;
-
+
if(MC_is_active())
MC_ignore_heap(&(task->counter), sizeof(task->counter));
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 ("task_execute", type);
- new PushStateEvent (MSG_get_clock(), process_container, type, value);
+ container_t process_container = simgrid::instr::Container::byName(instr_process_id(MSG_process_self(), str, len));
+ simgrid::instr::Type* type = process_container->type_->byName("MSG_PROCESS_STATE");
+ simgrid::instr::Value* val = simgrid::instr::Value::byName("task_execute", type);
+ new simgrid::instr::PushStateEvent(MSG_get_clock(), process_container, type, val);
}
}
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);
+ container_t process_container = simgrid::instr::Container::byName(instr_process_id(MSG_process_self(), str, len));
+ simgrid::instr::Type* type = process_container->type_->byName("MSG_PROCESS_STATE");
+ new simgrid::instr::PopStateEvent(MSG_get_clock(), process_container, type);
}
}
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 ("receive", type);
- new PushStateEvent (MSG_get_clock(), process_container, type, value);
+ container_t process_container = simgrid::instr::Container::byName(instr_process_id(MSG_process_self(), str, len));
+ simgrid::instr::Type* type = process_container->type_->byName("MSG_PROCESS_STATE");
+ simgrid::instr::Value* val = simgrid::instr::Value::byName("receive", type);
+ new simgrid::instr::PushStateEvent(MSG_get_clock(), process_container, type, val);
}
}
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);
+ container_t process_container = simgrid::instr::Container::byName(instr_process_id(MSG_process_self(), str, len));
+ simgrid::instr::Type* type = process_container->type_->byName("MSG_PROCESS_STATE");
+ new simgrid::instr::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);
+ type = simgrid::instr::Type::getRootType()->byName("MSG_PROCESS_TASK_LINK");
+ new simgrid::instr::EndLinkEvent(MSG_get_clock(), PJ_container_get_root(), type, process_container, "SR", key);
}
}
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);
+ container_t process_container = simgrid::instr::Container::byName(instr_process_id(MSG_process_self(), str, len));
+ simgrid::instr::Type* type = process_container->type_->byName("MSG_PROCESS_STATE");
+ simgrid::instr::Value* val = simgrid::instr::Value::byName("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 ("MSG_PROCESS_TASK_LINK", PJ_type_get_root());
- new StartLinkEvent(MSG_get_clock(), PJ_container_get_root(), type, process_container, "SR", key);
+ type = simgrid::instr::Type::getRootType()->byName("MSG_PROCESS_TASK_LINK");
+ new simgrid::instr::StartLinkEvent(MSG_get_clock(), PJ_container_get_root(), type, process_container, "SR", key);
}
return 1;
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);
+ container_t process_container = simgrid::instr::Container::byName(instr_process_id(MSG_process_self(), str, len));
+ simgrid::instr::Type* type = process_container->type_->byName("MSG_PROCESS_STATE");
+ new simgrid::instr::PopStateEvent(MSG_get_clock(), process_container, type);
}
}