Merge pull request #218 from Takishipp/MSG2S4U

[simgrid.git] / src / msg / msg_vm.cpp

diff --git a/src/msg/msg_vm.cpp b/src/msg/msg_vm.cpp
index 0085d14..be46bab 100644 (file)
--- a/src/msg/msg_vm.cpp
+++ b/src/msg/msg_vm.cpp
@@ -173,7 +173,7 @@ void MSG_vm_destroy(msg_vm_t vm)
   if (TRACE_msg_vm_is_enabled()) {
     container_t container = PJ_container_get(vm->getCname());
     PJ_container_remove_from_parent(container);
-    PJ_container_free(container);
+    delete container;
   }
 }
 
@@ -187,7 +187,7 @@ void MSG_vm_start(msg_vm_t vm)
   vm->start();
   if (TRACE_msg_vm_is_enabled()) {
     container_t vm_container = PJ_container_get(vm->getCname());
-    simgrid::instr::Type* type = PJ_type_get("MSG_VM_STATE", vm_container->type);
+    simgrid::instr::Type* type = PJ_type_get("MSG_VM_STATE", vm_container->type_);
     simgrid::instr::Value* val = simgrid::instr::Value::get_or_new("start", "0 0 1", type); // start is blue
     new simgrid::instr::PushStateEvent(MSG_get_clock(), vm_container, type, val);
   }
@@ -302,10 +302,11 @@ static int migration_rx_fun(int argc, char *argv[])
     // destroy existing container of this vm
     container_t existing_container = PJ_container_get(vm->getCname());
     PJ_container_remove_from_parent(existing_container);
-    PJ_container_free(existing_container);
+    delete existing_container;
 
     // create new container on the new_host location
-    PJ_container_new(vm->getCname(), simgrid::instr::INSTR_MSG_VM, PJ_container_get(ms->dst_pm->getCname()));
+    new simgrid::instr::Container(vm->getCname(), simgrid::instr::INSTR_MSG_VM,
+                                  PJ_container_get(ms->dst_pm->getCname()));
 
     // end link
     msg  = PJ_container_get(vm->getCname());
@@ -774,7 +775,7 @@ void MSG_vm_suspend(msg_vm_t vm)
 
   if (TRACE_msg_vm_is_enabled()) {
     container_t vm_container = PJ_container_get(vm->getCname());
-    simgrid::instr::Type* type = PJ_type_get("MSG_VM_STATE", vm_container->type);
+    simgrid::instr::Type* type = PJ_type_get("MSG_VM_STATE", vm_container->type_);
     simgrid::instr::Value* val = simgrid::instr::Value::get_or_new("suspend", "1 0 0", type); // suspend is red
     new simgrid::instr::PushStateEvent(MSG_get_clock(), vm_container, type, val);
   }
@@ -791,7 +792,7 @@ void MSG_vm_resume(msg_vm_t vm)
 
   if (TRACE_msg_vm_is_enabled()) {
     container_t vm_container = PJ_container_get(vm->getCname());
-    simgrid::instr::Type* type = PJ_type_get("MSG_VM_STATE", vm_container->type);
+    simgrid::instr::Type* type = PJ_type_get("MSG_VM_STATE", vm_container->type_);
     new simgrid::instr::PopStateEvent(MSG_get_clock(), vm_container, type);
   }
 }