Adrien Fix conflict

diff --git a/include/xbt/lib.h b/include/xbt/lib.h
index cdc9fc7..e08802b 100644 (file)
--- a/include/xbt/lib.h
+++ b/include/xbt/lib.h
@@ -30,6 +30,7 @@ XBT_PUBLIC(void *) xbt_lib_get_or_null(xbt_lib_t lib, const char *name,
                                        int level);
 XBT_PUBLIC(xbt_dictelm_t) xbt_lib_get_elm_or_null(xbt_lib_t lib, const char *key);
 XBT_PUBLIC(void *) xbt_lib_get_level(xbt_dictelm_t elm, int level);
+XBT_PUBLIC(void) xbt_lib_remove(xbt_lib_t lib, const char *key);
 
 #define xbt_lib_length(lib) xbt_dict_length((lib)->dict)
 

diff --git a/src/msg/msg_vm.c b/src/msg/msg_vm.c
index 568fc00..429accd 100644 (file)
--- a/src/msg/msg_vm.c
+++ b/src/msg/msg_vm.c
@@ -306,7 +306,11 @@ void MSG_vm_reboot(msg_vm_t vm)
 /** @brief Destroy a msg_vm_t.
  *  @ingroup msg_VMs
  */
-void MSG_vm_destroy(msg_vm_t vm) {
+void MSG_vm_destroy(msg_vm_t vm)
+{
+  simcall_vm_destroy(vm);
+
+#if 0
   unsigned int cpt;
   msg_process_t process;
   xbt_dynar_foreach(vm->processes,cpt,process) {
@@ -322,4 +326,5 @@ void MSG_vm_destroy(msg_vm_t vm) {
 
   xbt_dynar_free(&vm->processes);
   xbt_free(vm);
+#endif
 }

diff --git a/src/simix/smx_user.c b/src/simix/smx_user.c
index 0b292a1..5c1394f 100644 (file)
--- a/src/simix/smx_user.c
+++ b/src/simix/smx_user.c
@@ -293,6 +293,11 @@ void simcall_vm_start(smx_host_t vm){
        simcall_BODY_set_vm_state(vm, msg_vm_state_running);
 }
 
+void simcall_vm_destroy(smx_host_t vm)
+{
+  return simcall_BODY_vm_destroy(vm);
+}
+
 /**
  * \ingroup simix_process_management
  * \brief Creates and runs a new SIMIX process.

diff --git a/src/surf/vm_workstation.c b/src/surf/vm_workstation.c
index 1db863c..3bd63c3 100644 (file)
--- a/src/surf/vm_workstation.c
+++ b/src/surf/vm_workstation.c
@@ -45,7 +45,8 @@ static void vm_ws_destroy(const char *name)
        xbt_free(workstation->generic_resource.name);
 
        /* not defined yet, but we should have  */
-       // xbt_lib_unset(host_lib, name, SURF_WKS_LEVEL);
+       /* this will call surf_resource_free() */
+       xbt_lib_unset(host_lib, name, SURF_WKS_LEVEL);
 
        xbt_free(workstation);
 }

diff --git a/src/xbt/lib.c b/src/xbt/lib.c
index ccb1e0e..9353769 100644 (file)
--- a/src/xbt/lib.c
+++ b/src/xbt/lib.c
@@ -85,3 +85,7 @@ void *xbt_lib_get_level(xbt_dictelm_t elm, int level){
   void **elts = elm->content;
   return elts ? elts[level] : NULL;
 }
+
+void xbt_lib_remove(xbt_lib_t lib, const char *key){
+  xbt_dict_remove(lib->dict, key);
+}