* 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");
char str[INSTR_DEFAULT_STR_SIZE];
//start link
- container_t msg = PJ_container_get (instr_process_id(process, str, len));
+ container_t msg = simgrid::instr::Container::byName(instr_process_id(process, str, len));
simgrid::instr::Type* type = PJ_type_get_root()->getChild("MSG_PROCESS_LINK");
new simgrid::instr::StartLinkEvent(MSG_get_clock(), PJ_container_get_root(), type, msg, "M", key);
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));
+ msg = simgrid::instr::Container::byName(instr_process_id(process, str, len));
type = PJ_type_get_root()->getChild("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());
+ 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);
+ process->removeFromParent();
delete process;
}
}
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));
+ container_t process_container = simgrid::instr::Container::byName(instr_process_id(process, str, len));
simgrid::instr::Type* type = process_container->type_->getChild("MSG_PROCESS_STATE");
- simgrid::instr::Value* val = simgrid::instr::Value::get("suspend", type);
+ 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));
+ container_t process_container = simgrid::instr::Container::byName(instr_process_id(process, str, len));
simgrid::instr::Type* type = process_container->type_->getChild("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(process, str, len));
+ container_t process_container = simgrid::instr::Container::byName(instr_process_id(process, str, len));
simgrid::instr::Type* type = process_container->type_->getChild("MSG_PROCESS_STATE");
- simgrid::instr::Value* val = simgrid::instr::Value::get("sleep", type);
+ 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));
+ container_t process_container = simgrid::instr::Container::byName(instr_process_id(process, str, len));
simgrid::instr::Type* type = process_container->type_->getChild("MSG_PROCESS_STATE");
new simgrid::instr::PopStateEvent(MSG_get_clock(), process_container, type);
}