X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/272ccad1b68b6d9c17069f3c934886925bb15b5d..1ee0ed6b44e3639fcfcbb37a43e8709aa95a2db5:/src/msg/msg_vm.c

diff --git a/src/msg/msg_vm.c b/src/msg/msg_vm.c
index f337ec0a88..c025372f06 100644
--- a/src/msg/msg_vm.c
+++ b/src/msg/msg_vm.c
@@ -17,17 +17,23 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_vm, msg,
  *  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, const char *name, 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->name = xbt_strdup(name);
+  res->processes = xbt_dynar_new(sizeof(msg_process_t),NULL);
 
   xbt_swag_insert(res,msg_global->vms);
-  xbt_swag_insert(res,location->vms);
+  xbt_swag_insert(res, MSG_host_priv(location)->vms);
+
+  #ifdef HAVE_TRACING
+  TRACE_msg_vm_create(name, location);
+  #endif
+
 
   return res;
 }
@@ -63,7 +69,7 @@ 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.
  *
  */
-void MSG_vm_bind(msg_vm_t vm, 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) {
@@ -79,14 +85,14 @@ void MSG_vm_bind(msg_vm_t vm, m_process_t process) {
 
   XBT_DEBUG("binding Process %s to %p",MSG_process_get_name(process),vm);
 
-  xbt_dynar_push_as(vm->processes,m_process_t,process);
+  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);
@@ -99,14 +105,19 @@ void MSG_vm_unbind(msg_vm_t vm, m_process_t process) {
  * 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);
   }
-  xbt_swag_remove(vm,vm->location->vms);
-  xbt_swag_insert_at_tail(vm,destination->vms);
+  xbt_swag_remove(vm, MSG_host_priv(vm->location)->vms);
+  xbt_swag_insert_at_tail(vm, MSG_host_priv(destination)->vms);
+  
+  #ifdef HAVE_TRACING
+  TRACE_msg_vm_change_host(vm,vm->location,destination);
+  #endif
+
   vm->location = destination;
 }
 
@@ -119,11 +130,15 @@ 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);
   }
+
+  #ifdef HAVE_TRACING
+  TRACE_msg_vm_suspend(vm);
+  #endif
 }
 
 /** @brief Immediately resumes the execution of all processes within the given VM.
@@ -135,11 +150,15 @@ 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)));
     MSG_process_resume(process);
   }
+
+  #ifdef HAVE_TRACING
+  TRACE_msg_vm_resume(vm);
+  #endif
 }
 
 /** @brief Immediately kills all processes within the given VM. Any memory that they allocated will be leaked.
@@ -150,25 +169,58 @@ void MSG_vm_resume(msg_vm_t vm) {
  */
 void MSG_vm_shutdown(msg_vm_t vm)
 {
-  m_process_t process;
+  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,m_process_t);
+    process = xbt_dynar_get_as(vm->processes,0,msg_process_t);
     MSG_process_kill(process);
   }
+
+  #ifdef HAVE_TRACING
+  TRACE_msg_vm_kill(vm);
+  #endif
+
 }
+/**
+ * \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) {
     //FIXME: Slow ?
     simdata_process_t simdata = simcall_process_get_data(process);
     simdata->vm = NULL;
   }
+
+  #ifdef HAVE_TRACING
+  TRACE_msg_vm_end(vm);
+  #endif
+
+
   xbt_dynar_free(&vm->processes);
   xbt_free(vm);
 }