X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/520999f11d36ffc1e152ce39b98bd6a184cdf157..d947ff7466b473eeec602007934f8336a9b17f3c:/src/msg/msg_vm.c

diff --git a/src/msg/msg_vm.c b/src/msg/msg_vm.c
index 7469ef06a8..4e061966b4 100644
--- a/src/msg/msg_vm.c
+++ b/src/msg/msg_vm.c
@@ -10,28 +10,28 @@
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_vm, msg,
                                 "Cloud-oriented parts of the MSG API");
 
-/** @brief Create a new (empty) VMs
+/** @brief Create a new (empty) VMs.
  *  @ingroup msg_VMs
  *
  *  @bug it is expected that in the future, the coreAmount parameter will be used
  *  to add extra constraints on the execution, but the argument is ignored for now.
  */
 
-msg_vm_t MSG_vm_start(m_host_t location, int coreAmount) {
+msg_vm_t MSG_vm_start(msg_host_t location, int coreAmount) {
   msg_vm_t res = xbt_new0(s_msg_vm_t,1);
   res->all_vms_hookup.prev = NULL;
   res->host_vms_hookup.prev = NULL;
   res->state = msg_vm_state_running;
   res->location = location;
   res->coreAmount = coreAmount;
-  res->processes = xbt_dynar_new(sizeof(m_process_t),NULL);
+  res->processes = xbt_dynar_new(sizeof(msg_process_t),NULL);
 
   xbt_swag_insert(res,msg_global->vms);
   xbt_swag_insert(res,location->vms);
 
   return res;
 }
-/** @brief Returns a newly constructed dynar containing all existing VMs in the system
+/** @brief Returns a newly constructed dynar containing all existing VMs in the system.
  *  @ingroup msg_VMs
  *
  * Don't forget to free the dynar after use.
@@ -62,45 +62,46 @@ int MSG_vm_is_running(msg_vm_t vm) {
  *
  * Afterward, when the VM is migrated or suspended or whatever, the process will have the corresponding handling, too.
  *
- * @bug for now, if a binded process terminates, every VM functions will segfault. Baaaad.
  */
-void MSG_vm_bind(msg_vm_t vm, m_process_t process) {
-	/* check if the process is already in a VM */
-	simdata_process_t simdata = simcall_process_get_data(process);
-	if (simdata->vm) {
-		msg_vm_t old_vm = simdata->vm;
-		int pos = xbt_dynar_search(old_vm->processes,&process);
-		xbt_dynar_remove_at(old_vm->processes,pos, NULL);
-	}
-	/* check if the host is in the right host */
-	if (simdata->m_host != vm->location) {
-		MSG_process_migrate(process,vm->location);
-	}
-	simdata->vm = vm;
-
-  xbt_dynar_push_as(vm->processes,m_process_t,process);
+void MSG_vm_bind(msg_vm_t vm, msg_process_t process) {
+  /* check if the process is already in a VM */
+  simdata_process_t simdata = simcall_process_get_data(process);
+  if (simdata->vm) {
+    msg_vm_t old_vm = simdata->vm;
+    int pos = xbt_dynar_search(old_vm->processes,&process);
+    xbt_dynar_remove_at(old_vm->processes,pos, NULL);
+  }
+  /* check if the host is in the right host */
+  if (simdata->m_host != vm->location) {
+    MSG_process_migrate(process,vm->location);
+  }
+  simdata->vm = vm;
+
+  XBT_DEBUG("binding Process %s to %p",MSG_process_get_name(process),vm);
+
+  xbt_dynar_push_as(vm->processes,msg_process_t,process);
 }
 /** @brief Removes the given process from the given VM, and kill it
  *  @ingroup msg_VMs
  *
  *  Will raise a not_found exception if the process were not binded to that VM
  */
-void MSG_vm_unbind(msg_vm_t vm, m_process_t process) {
+void MSG_vm_unbind(msg_vm_t vm, msg_process_t process) {
   int pos = xbt_dynar_search(vm->processes,process);
   xbt_dynar_remove_at(vm->processes,pos, NULL);
   MSG_process_kill(process);
 }
 
-/** @brief Immediately change the host on which all processes are running
+/** @brief Immediately change the host on which all processes are running.
  *  @ingroup msg_VMs
  *
  * No migration cost occurs. If you want to simulate this too, you want to use a
  * MSG_task_send() before or after, depending on whether you want to do cold or hot
  * migration.
  */
-void MSG_vm_migrate(msg_vm_t vm, m_host_t destination) {
+void MSG_vm_migrate(msg_vm_t vm, msg_host_t destination) {
   unsigned int cpt;
-  m_process_t process;
+  msg_process_t process;
   xbt_dynar_foreach(vm->processes,cpt,process) {
     MSG_process_migrate(process,destination);
   }
@@ -109,7 +110,7 @@ void MSG_vm_migrate(msg_vm_t vm, m_host_t destination) {
   vm->location = destination;
 }
 
-/** @brief Immediately suspend the execution of all processes within the given VM
+/** @brief Immediately suspend the execution of all processes within the given VM.
  *  @ingroup msg_VMs
  *
  * No suspension cost occurs. If you want to simulate this too, you want to
@@ -118,14 +119,14 @@ void MSG_vm_migrate(msg_vm_t vm, m_host_t destination) {
  */
 void MSG_vm_suspend(msg_vm_t vm) {
   unsigned int cpt;
-  m_process_t process;
+  msg_process_t process;
   xbt_dynar_foreach(vm->processes,cpt,process) {
     XBT_DEBUG("suspend process %s of host %s",MSG_process_get_name(process),MSG_host_get_name(MSG_process_get_host(process)));
     MSG_process_suspend(process);
   }
 }
 
-/** @brief Immediately resumes the execution of all processes within the given VM
+/** @brief Immediately resumes the execution of all processes within the given VM.
  *  @ingroup msg_VMs
  *
  * No resume cost occurs. If you want to simulate this too, you want to
@@ -134,9 +135,9 @@ void MSG_vm_suspend(msg_vm_t vm) {
  */
 void MSG_vm_resume(msg_vm_t vm) {
   unsigned int cpt;
-  m_process_t process;
+  msg_process_t process;
   xbt_dynar_foreach(vm->processes,cpt,process) {
-  	XBT_DEBUG("resume process %s of host %s",MSG_process_get_name(process),MSG_host_get_name(MSG_process_get_host(process)));
+    XBT_DEBUG("resume process %s of host %s",MSG_process_get_name(process),MSG_host_get_name(MSG_process_get_host(process)));
     MSG_process_resume(process);
   }
 }
@@ -147,10 +148,49 @@ 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) {
+void MSG_vm_shutdown(msg_vm_t vm)
+{
+  msg_process_t process;
+  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,msg_process_t);
+    MSG_process_kill(process);
+  }
+}
+/**
+ * \ingroup msg_VMs
+ * \brief Reboot the VM, restarting all the processes in it.
+ */
+void MSG_vm_reboot(msg_vm_t vm)
+{
+  xbt_dynar_t new_processes = xbt_dynar_new(sizeof(msg_process_t),NULL);
+
+  msg_process_t process;
+  unsigned int cpt;
+
+  xbt_dynar_foreach(vm->processes,cpt,process) {
+    msg_process_t new_process = MSG_process_restart(process);
+    xbt_dynar_push_as(new_processes,msg_process_t,new_process);
+
+  }
+
+  xbt_dynar_foreach(new_processes, cpt, process) {
+    MSG_vm_bind(vm,process);
+  }
+
+  xbt_dynar_free(&new_processes);
+}
+/** @brief Destroy a msg_vm_t.
+ *  @ingroup msg_VMs
+ */
+void MSG_vm_destroy(msg_vm_t vm) {
   unsigned int cpt;
-  m_process_t process;
+  msg_process_t process;
   xbt_dynar_foreach(vm->processes,cpt,process) {
-  	MSG_process_kill(process);
+    //FIXME: Slow ?
+    simdata_process_t simdata = simcall_process_get_data(process);
+    simdata->vm = NULL;
   }
+  xbt_dynar_free(&vm->processes);
+  xbt_free(vm);
 }