* under the terms of the license (GNU LGPL) which comes with this package. */
#include "simgrid/s4u/Host.hpp"
-#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 "src/simix/ActorImpl.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_msg_process, instr, "MSG process");
/*
* Instrumentation functions to trace MSG processes (msg_process_t)
*/
-void TRACE_msg_process_change_host(msg_process_t process, msg_host_t old_host, msg_host_t new_host)
+void TRACE_msg_process_change_host(msg_process_t process, msg_host_t new_host)
{
if (TRACE_msg_process_is_enabled()){
static long long int counter = 0;
char str[INSTR_DEFAULT_STR_SIZE];
//start link
- container_t msg = PJ_container_get (instr_process_id(process, str, len));
- type_t type = PJ_type_get ("MSG_PROCESS_LINK", PJ_type_get_root());
- new StartLinkEvent (MSG_get_clock(), PJ_container_get_root(), type, msg, "M", key);
+ container_t msg = simgrid::instr::Container::byName(instr_process_id(process, str, len));
+ simgrid::instr::Type* type = simgrid::instr::Type::getRootType()->byName("MSG_PROCESS_LINK");
+ new simgrid::instr::StartLinkEvent(MSG_get_clock(), PJ_container_get_root(), type, msg, "M", key);
//destroy existing container of this process
TRACE_msg_process_destroy (MSG_process_get_name (process), MSG_process_get_PID (process));
TRACE_msg_process_create (MSG_process_get_name (process), MSG_process_get_PID (process), new_host);
//end link
- msg = PJ_container_get(instr_process_id(process, str, len));
- type = PJ_type_get ("MSG_PROCESS_LINK", PJ_type_get_root());
- new EndLinkEvent (MSG_get_clock(), PJ_container_get_root(), type, msg, "M", key);
+ msg = simgrid::instr::Container::byName(instr_process_id(process, str, len));
+ type = simgrid::instr::Type::getRootType()->byName("MSG_PROCESS_LINK");
+ new simgrid::instr::EndLinkEvent(MSG_get_clock(), PJ_container_get_root(), type, msg, "M", key);
}
}
int len = INSTR_DEFAULT_STR_SIZE;
char str[INSTR_DEFAULT_STR_SIZE];
- container_t host_container = PJ_container_get(host->getCname());
- PJ_container_new(instr_process_id_2(process_name, process_pid, str, len), INSTR_MSG_PROCESS, host_container);
+ container_t host_container = simgrid::instr::Container::byName(host->getName());
+ new simgrid::instr::Container(instr_process_id_2(process_name, process_pid, str, len),
+ simgrid::instr::INSTR_MSG_PROCESS, host_container);
}
}
int len = INSTR_DEFAULT_STR_SIZE;
char str[INSTR_DEFAULT_STR_SIZE];
- container_t process = PJ_container_get_or_null(instr_process_id_2(process_name, process_pid, str, len));
+ container_t process =
+ simgrid::instr::Container::byNameOrNull(instr_process_id_2(process_name, process_pid, str, len));
if (process) {
- PJ_container_remove_from_parent (process);
- PJ_container_free (process);
+ process->removeFromParent();
+ delete process;
}
}
}
}
void TRACE_msg_process_suspend(msg_process_t process)
-{ paje_value pj_value;
+{
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(process, str, len));
- type_t type = PJ_type_get ("MSG_PROCESS_STATE", process_container->type);
- val_t value = pj_value.PJ_value_get ("suspend", type);
- new PushStateEvent (MSG_get_clock(), process_container, type, value);
+ container_t process_container = simgrid::instr::Container::byName(instr_process_id(process, str, len));
+ simgrid::instr::Type* type = process_container->type_->byName("MSG_PROCESS_STATE");
+ simgrid::instr::Value* val = simgrid::instr::Value::byName("suspend", 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(process, 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(process, str, len));
+ simgrid::instr::Type* type = process_container->type_->byName("MSG_PROCESS_STATE");
+ new simgrid::instr::PopStateEvent(MSG_get_clock(), process_container, type);
}
}
void TRACE_msg_process_sleep_in(msg_process_t process)
-{ paje_value pj_value;
+{
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(process, str, len));
- type_t type = PJ_type_get ("MSG_PROCESS_STATE", process_container->type);
- val_t value = pj_value.PJ_value_get ("sleep", type);
- new PushStateEvent (MSG_get_clock(), process_container, type, value);
+ container_t process_container = simgrid::instr::Container::byName(instr_process_id(process, str, len));
+ simgrid::instr::Type* type = process_container->type_->byName("MSG_PROCESS_STATE");
+ simgrid::instr::Value* val = simgrid::instr::Value::byName("sleep", 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(process, 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(process, str, len));
+ simgrid::instr::Type* type = process_container->type_->byName("MSG_PROCESS_STATE");
+ new simgrid::instr::PopStateEvent(MSG_get_clock(), process_container, type);
}
}