Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

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

diff --git a/src/msg/msg_vm.c b/src/msg/msg_vm.c
index 948c8de..bda366c 100644 (file)
--- a/src/msg/msg_vm.c
+++ b/src/msg/msg_vm.c
@@ -149,12 +149,27 @@ void MSG_vm_resume(msg_vm_t vm) {
  * No extra delay occurs. If you want to simulate this too, you want to
  * use a #MSG_process_sleep() or something. I'm not quite sure.
  */
-void MSG_vm_shutdown(msg_vm_t vm) {
-  unsigned int cpt;
+void MSG_vm_shutdown(msg_vm_t vm)
+{
   m_process_t process;
-  XBT_DEBUG("%d processes in the VM",xbt_dynar_length(vm->processes));
+  XBT_DEBUG("%lu processes in the VM", xbt_dynar_length(vm->processes));
   while (xbt_dynar_length(vm->processes) > 0) {
        process = xbt_dynar_get_as(vm->processes,0,m_process_t);
        MSG_process_kill(process);
   }
 }
+
+/** @brief Destroy a msg_vm_t.
+ *  @ingroup msg_VMs
+ */
+void MSG_vm_destroy(msg_vm_t vm) {
+       unsigned int cpt;
+       m_process_t process;
+       xbt_dynar_foreach(vm->processes,cpt,process) {
+         //FIXME: Slow ?
+         simdata_process_t simdata = simcall_process_get_data(process);
+         simdata->vm = NULL;
+       }
+       xbt_dynar_free(&vm->processes);
+       xbt_free(vm);
+}