-/* Copyright (c) 2015-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2015-2018. 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. */
/* Make a process container */
extension_set<simgrid::simix::Host>(new simgrid::simix::Host());
- if (TRACE_msg_vm_is_enabled()) {
+ if (TRACE_vm_is_enabled()) {
container_t host_container = instr::Container::byName(pm->getName());
new instr::Container(name, "MSG_VM", host_container);
instr::Container::byName(getName())->getState("MSG_VM_STATE")->addEntityValue("start", "0 0 1"); // start is blue
/* Don't free these things twice: they are the ones of my physical host */
pimpl_netpoint = nullptr;
- if (TRACE_msg_vm_is_enabled()) {
- container_t container = simgrid::instr::Container::byName(getName());
- container->removeFromParent();
- delete container;
- }
+ if (TRACE_vm_is_enabled())
+ simgrid::instr::Container::byName(getName())->removeFromParent();
}
void VirtualMachine::start()
{
- if (TRACE_msg_vm_is_enabled())
+ if (TRACE_vm_is_enabled())
simgrid::instr::Container::byName(getName())->getState("MSG_VM_STATE")->pushEvent("start");
simgrid::simix::kernelImmediate([this]() {
this->pimpl_vm_->setState(SURF_VM_STATE_RUNNING);
});
- if (TRACE_msg_vm_is_enabled())
+ if (TRACE_vm_is_enabled())
simgrid::instr::Container::byName(getName())->getState("MSG_VM_STATE")->popEvent();
}
{
smx_actor_t issuer = SIMIX_process_self();
simgrid::simix::kernelImmediate([this, issuer]() { pimpl_vm_->suspend(issuer); });
- if (TRACE_msg_vm_is_enabled())
+ if (TRACE_vm_is_enabled())
simgrid::instr::Container::byName(getName())->getState("MSG_VM_STATE")->pushEvent("suspend");
XBT_DEBUG("vm_suspend done");
}
void VirtualMachine::resume()
{
pimpl_vm_->resume();
- if (TRACE_msg_vm_is_enabled())
+ if (TRACE_vm_is_enabled())
simgrid::instr::Container::byName(getName())->getState("MSG_VM_STATE")->popEvent();
}
{
vm->destroy();
}
-/* ************************** Backward ABI compatibility *************************** */
-sg_vm_t MSG_vm_create_core(sg_host_t pm, const char* name) __attribute__((alias("sg_vm_create_core")));
-sg_vm_t MSG_vm_create_multicore(sg_host_t pm, const char* name, int coreAmount)
- __attribute__((alias("sg_vm_create_multicore")));
-
-int MSG_vm_is_created(sg_vm_t vm) __attribute__((alias("sg_vm_is_created")));
-int MSG_vm_is_running(sg_vm_t vm) __attribute__((alias("sg_vm_is_running")));
-int MSG_vm_is_suspended(sg_vm_t vm) __attribute__((alias("sg_vm_is_suspended")));
-
-const char* MSG_vm_get_name(sg_vm_t vm) __attribute__((alias("sg_vm_get_name")));
-void MSG_vm_set_ramsize(sg_vm_t vm, size_t size) __attribute__((alias("sg_vm_set_ramsize")));
-size_t MSG_vm_get_ramsize(sg_vm_t vm) __attribute__((alias("sg_vm_get_ramsize")));
-sg_host_t MSG_vm_get_pm(sg_vm_t vm) __attribute__((alias("sg_vm_get_pm")));
-void MSG_vm_set_bound(sg_vm_t vm, double bound) __attribute__((alias("sg_vm_set_bound")));
-
-void MSG_vm_start(sg_vm_t vm) __attribute__((alias("sg_vm_start")));
-void MSG_vm_suspend(sg_vm_t vm) __attribute__((alias("sg_vm_suspend")));
-void MSG_vm_resume(sg_vm_t vm) __attribute__((alias("sg_vm_resume")));
-void MSG_vm_shutdown(sg_vm_t vm) __attribute__((alias("sg_vm_shutdown")));
-void MSG_vm_destroy(sg_vm_t vm) __attribute__((alias("sg_vm_destroy")));
SG_END_DECL()