X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/99677e68549e840ea8d896c4ce292040b1db614c..680d3333804979cca617afe9bef76ab1b1eb9f0e:/src/simix/smx_vm.c

diff --git a/src/simix/smx_vm.c b/src/simix/smx_vm.c
index 194d658c0f..d2eab043aa 100644
--- a/src/simix/smx_vm.c
+++ b/src/simix/smx_vm.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2012. The SimGrid Team.
+/* Copyright (c) 2007-2014. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_vm, simix, "Logging specific to SIMIX (vms
 smx_host_t SIMIX_vm_create(const char *name, smx_host_t ind_phys_host)
 {
   /* Create surf associated resource */
-  surf_vm_workstation_model->extension.vm_workstation.create(name, ind_phys_host);
+  surf_vm_workstation_model_create(name, ind_phys_host);
 
   smx_host_t smx_host = SIMIX_host_create(name, ind_phys_host, NULL);
 
@@ -34,121 +34,130 @@ smx_host_t SIMIX_vm_create(const char *name, smx_host_t ind_phys_host)
 }
 
 
-smx_host_t SIMIX_pre_vm_create(smx_simcall_t simcall, const char *name, smx_host_t ind_phys_host)
+/* works for VMs and PMs */
+static long host_get_ramsize(smx_host_t vm, int *overcommit)
 {
-  return SIMIX_vm_create(name, ind_phys_host);
-}
-
+  s_ws_params_t params;
+  surf_workstation_get_params(vm, &params);
 
-static int get_host_property_as_integer(smx_host_t host, const char *name)
-{
-  xbt_dict_t dict = SIMIX_host_get_properties(host);
+  if (overcommit)
+    *overcommit = params.overcommit;
 
-  char *value = xbt_dict_get_or_null(dict, name);
-  return atoi(value);
+  return params.ramsize;
 }
 
-
-
 /* **** start a VM **** */
 static int __can_be_started(smx_host_t vm)
 {
-	// TODO add checking code related to overcommitment or not.
+  smx_host_t pm = surf_vm_workstation_get_pm(vm);
+
+  int pm_overcommit = 0;
+  long pm_ramsize = host_get_ramsize(pm, &pm_overcommit);
+  long vm_ramsize = host_get_ramsize(vm, NULL);
 
-#if 0
-  int overcommit = get_host_property_as_integer(vm, "OverCommit");
-  int core_nb = get_host_property_as_integer(vm, "CORE_NB");
-  int mem_cap = get_host_property_as_integer(vm, "MEM_CAP");
-  int net_cap = get_host_property_as_integer(vm, "NET_CAP");
-#endif
+  if (!pm_ramsize) {
+    /* We assume users do not want to care about ramsize. */
+    return 1;
+  }
 
-  /* we need to get other VM objects on this physical host. */
+  if (pm_overcommit) {
+    XBT_INFO("%s allows memory overcommit.", pm->key);
+    return 1;
+  }
 
+  long total_ramsize_of_vms = 0;
+  xbt_dynar_t dyn_vms = surf_workstation_get_vms(pm);
+  {
+    unsigned int cursor = 0;
+    smx_host_t another_vm;
+    xbt_dynar_foreach(dyn_vms, cursor, another_vm) {
+      long another_vm_ramsize = host_get_ramsize(vm, NULL);
+      total_ramsize_of_vms += another_vm_ramsize;
+    }
+  }
 
+  if (vm_ramsize > pm_ramsize - total_ramsize_of_vms) {
+    XBT_WARN("cannnot start %s@%s due to memory shortage: vm_ramsize %ld, free %ld, pm_ramsize %ld (bytes).",
+        vm->key, pm->key, vm_ramsize, pm_ramsize - total_ramsize_of_vms, pm_ramsize);
+    xbt_dynar_free(&dyn_vms);
+    return 0;
+  }
 
+  xbt_dynar_free(&dyn_vms);
 	return 1;
 }
 
 void SIMIX_vm_start(smx_host_t ind_vm)
 {
-  //TODO only start the VM if you can
   if (__can_be_started(ind_vm))
-    SIMIX_vm_set_state(ind_vm, SURF_VM_STATE_RUNNING);
+    surf_resource_set_state(surf_workstation_resource_priv(ind_vm),
+                            (int)SURF_VM_STATE_RUNNING);
   else
     THROWF(vm_error, 0, "The VM %s cannot be started", SIMIX_host_get_name(ind_vm));
 }
 
-void SIMIX_pre_vm_start(smx_simcall_t simcall, smx_host_t ind_vm)
-{
-  SIMIX_vm_start(ind_vm);
-  SIMIX_simcall_answer(simcall);
-}
-
-/* ***** set/get state of a VM ***** */
-void SIMIX_vm_set_state(smx_host_t ind_vm, int state)
-{
-  /* jump to vm_ws_set_state */
-  surf_vm_workstation_model->extension.vm_workstation.set_state(ind_vm, state);
-}
-
-void SIMIX_pre_vm_set_state(smx_simcall_t simcall, smx_host_t ind_vm, int state)
-{
-  SIMIX_vm_set_state(ind_vm, state);
-}
 
 int SIMIX_vm_get_state(smx_host_t ind_vm)
 {
-  return surf_vm_workstation_model->extension.vm_workstation.get_state(ind_vm);
+  return surf_resource_get_state(surf_workstation_resource_priv(ind_vm));
 }
 
-int SIMIX_pre_vm_get_state(smx_simcall_t simcall, smx_host_t ind_vm)
-{
-  return SIMIX_vm_get_state(ind_vm);
-}
-
-
 /**
- * \brief Function to migrate a SIMIX VM host. 
+ * \brief Function to migrate a SIMIX VM host.
  *
  * \param host the vm host to migrate (a smx_host_t)
  */
 void SIMIX_vm_migrate(smx_host_t ind_vm, smx_host_t ind_dst_pm)
 {
-  const char *name = SIMIX_host_get_name(ind_vm);
+  /* precopy migration makes the VM temporally paused */
+  xbt_assert(SIMIX_vm_get_state(ind_vm) == SURF_VM_STATE_SUSPENDED);
 
-  if (SIMIX_vm_get_state(ind_vm) != SURF_VM_STATE_RUNNING)
-    THROWF(vm_error, 0, "VM(%s) is not running", name);
-
-  /* jump to vm_ws_migrate(). this will update the vm location. */
-  surf_vm_workstation_model->extension.vm_workstation.migrate(ind_vm, ind_dst_pm);
-}
-
-void SIMIX_pre_vm_migrate(smx_simcall_t simcall, smx_host_t ind_vm, smx_host_t ind_dst_pm)
-{
-  SIMIX_vm_migrate(ind_vm, ind_dst_pm);
-  SIMIX_simcall_answer(simcall);
+  /* jump to vm_ws_xigrate(). this will update the vm location. */
+  surf_vm_workstation_migrate(ind_vm, ind_dst_pm);
 }
 
-
 /**
- * \brief Function to get the physical host of the given the SIMIX VM host.
+ * \brief Function to get the physical host of the given SIMIX VM host.
  *
  * \param host the vm host to get_phys_host (a smx_host_t)
  */
 void *SIMIX_vm_get_pm(smx_host_t ind_vm)
 {
   /* jump to vm_ws_get_pm(). this will return the vm name. */
-  return surf_vm_workstation_model->extension.vm_workstation.get_pm(ind_vm);
+  return surf_vm_workstation_get_pm(ind_vm);
+}
+
+/**
+ * \brief Function to set the CPU bound of the given SIMIX VM host.
+ *
+ * \param host the vm host (a smx_host_t)
+ * \param bound bound (a double)
+ */
+void SIMIX_vm_set_bound(smx_host_t ind_vm, double bound)
+{
+  /* jump to vm_ws_set_vm_bound(). */
+  surf_vm_workstation_set_bound(ind_vm, bound);
 }
 
-void *SIMIX_pre_vm_get_pm(smx_simcall_t simcall, smx_host_t ind_vm)
+/**
+ * \brief Function to set the CPU affinity of the given SIMIX VM host.
+ *
+ * \param host the vm host (a smx_host_t)
+ * \param host the pm host (a smx_host_t)
+ * \param mask affinity mask (a unsigned long)
+ */
+void SIMIX_vm_set_affinity(smx_host_t ind_vm, smx_host_t ind_pm, unsigned long mask)
 {
-  return SIMIX_vm_get_pm(ind_vm);
+  /* make sure this at the MSG layer. */
+  xbt_assert(SIMIX_vm_get_pm(ind_vm) == ind_pm);
+
+  /* jump to vm_ws_set_vm_affinity(). */
+  surf_vm_workstation_set_affinity(ind_vm, ind_pm, mask);
 }
 
 
 /**
- * \brief Function to suspend a SIMIX VM host. This function stops the exection of the
+ * \brief Function to suspend a SIMIX VM host. This function stops the execution of the
  * VM. All the processes on this VM will pause. The state of the VM is
  * preserved on memory. We can later resume it again.
  *
@@ -164,7 +173,7 @@ void SIMIX_vm_suspend(smx_host_t ind_vm, smx_process_t issuer)
   XBT_DEBUG("suspend VM(%s), where %d processes exist", name, xbt_swag_size(SIMIX_host_priv(ind_vm)->process_list));
 
   /* jump to vm_ws_suspend. The state will be set. */
-  surf_vm_workstation_model->extension.vm_workstation.suspend(ind_vm);
+  surf_vm_workstation_suspend(ind_vm);
 
   smx_process_t smx_process, smx_process_safe;
   xbt_swag_foreach_safe(smx_process, smx_process_safe, SIMIX_host_priv(ind_vm)->process_list) {
@@ -175,7 +184,7 @@ void SIMIX_vm_suspend(smx_host_t ind_vm, smx_process_t issuer)
   XBT_DEBUG("suspend all processes on the VM done done");
 }
 
-void SIMIX_pre_vm_suspend(smx_simcall_t simcall, smx_host_t ind_vm)
+void simcall_HANDLER_vm_suspend(smx_simcall_t simcall, smx_host_t ind_vm)
 {
   if (simcall->issuer->smx_host == ind_vm) {
     XBT_ERROR("cannot suspend the VM where I run");
@@ -184,16 +193,13 @@ void SIMIX_pre_vm_suspend(smx_simcall_t simcall, smx_host_t ind_vm)
 
   SIMIX_vm_suspend(ind_vm, simcall->issuer);
 
-  /* without this, simcall_vm_suspend() does not return to the userland. why? */
-  SIMIX_simcall_answer(simcall);
-
-  XBT_DEBUG("SIMIX_pre_vm_suspend done");
+  XBT_DEBUG("simcall_HANDLER_vm_suspend done");
 }
 
 
 /**
  * \brief Function to resume a SIMIX VM host. This function restart the execution of the
- * VM. All the processes on this VM will run again. 
+ * VM. All the processes on this VM will run again.
  *
  * \param host the vm host to resume (a smx_host_t)
  */
@@ -207,7 +213,7 @@ void SIMIX_vm_resume(smx_host_t ind_vm, smx_process_t issuer)
   XBT_DEBUG("resume VM(%s), where %d processes exist", name, xbt_swag_size(SIMIX_host_priv(ind_vm)->process_list));
 
   /* jump to vm_ws_resume() */
-  surf_vm_workstation_model->extension.vm_workstation.resume(ind_vm);
+  surf_vm_workstation_resume(ind_vm);
 
   smx_process_t smx_process, smx_process_safe;
   xbt_swag_foreach_safe(smx_process, smx_process_safe, SIMIX_host_priv(ind_vm)->process_list) {
@@ -216,10 +222,9 @@ void SIMIX_vm_resume(smx_host_t ind_vm, smx_process_t issuer)
   }
 }
 
-void SIMIX_pre_vm_resume(smx_simcall_t simcall, smx_host_t ind_vm)
+void simcall_HANDLER_vm_resume(smx_simcall_t simcall, smx_host_t ind_vm)
 {
   SIMIX_vm_resume(ind_vm, simcall->issuer);
-  SIMIX_simcall_answer(simcall);
 }
 
 
@@ -241,7 +246,7 @@ void SIMIX_vm_save(smx_host_t ind_vm, smx_process_t issuer)
   XBT_DEBUG("save VM(%s), where %d processes exist", name, xbt_swag_size(SIMIX_host_priv(ind_vm)->process_list));
 
   /* jump to vm_ws_save() */
-  surf_vm_workstation_model->extension.vm_workstation.save(ind_vm);
+  surf_vm_workstation_save(ind_vm);
 
   smx_process_t smx_process, smx_process_safe;
   xbt_swag_foreach_safe(smx_process, smx_process_safe, SIMIX_host_priv(ind_vm)->process_list) {
@@ -250,18 +255,15 @@ void SIMIX_vm_save(smx_host_t ind_vm, smx_process_t issuer)
   }
 }
 
-void SIMIX_pre_vm_save(smx_simcall_t simcall, smx_host_t ind_vm)
+void simcall_HANDLER_vm_save(smx_simcall_t simcall, smx_host_t ind_vm)
 {
   SIMIX_vm_save(ind_vm, simcall->issuer);
-
-  /* without this, simcall_vm_suspend() does not return to the userland. why? */
-  SIMIX_simcall_answer(simcall);
 }
 
 
 /**
  * \brief Function to restore a SIMIX VM host. This function restart the execution of the
- * VM. All the processes on this VM will run again. 
+ * VM. All the processes on this VM will run again.
  *
  * \param host the vm host to restore (a smx_host_t)
  */
@@ -275,7 +277,7 @@ void SIMIX_vm_restore(smx_host_t ind_vm, smx_process_t issuer)
   XBT_DEBUG("restore VM(%s), where %d processes exist", name, xbt_swag_size(SIMIX_host_priv(ind_vm)->process_list));
 
   /* jump to vm_ws_restore() */
-  surf_vm_workstation_model->extension.vm_workstation.resume(ind_vm);
+  surf_vm_workstation_resume(ind_vm);
 
   smx_process_t smx_process, smx_process_safe;
   xbt_swag_foreach_safe(smx_process, smx_process_safe, SIMIX_host_priv(ind_vm)->process_list) {
@@ -284,10 +286,9 @@ void SIMIX_vm_restore(smx_host_t ind_vm, smx_process_t issuer)
   }
 }
 
-void SIMIX_pre_vm_restore(smx_simcall_t simcall, smx_host_t ind_vm)
+void simcall_HANDLER_vm_restore(smx_simcall_t simcall, smx_host_t ind_vm)
 {
   SIMIX_vm_restore(ind_vm, simcall->issuer);
-  SIMIX_simcall_answer(simcall);
 }
 
 
@@ -305,22 +306,23 @@ void SIMIX_vm_shutdown(smx_host_t ind_vm, smx_process_t issuer)
   if (SIMIX_vm_get_state(ind_vm) != SURF_VM_STATE_RUNNING)
     THROWF(vm_error, 0, "VM(%s) is not running", name);
 
+  XBT_DEBUG("shutdown %s", name);
   XBT_DEBUG("%d processes in the VM", xbt_swag_size(SIMIX_host_priv(ind_vm)->process_list));
 
   smx_process_t smx_process, smx_process_safe;
   xbt_swag_foreach_safe(smx_process, smx_process_safe, SIMIX_host_priv(ind_vm)->process_list) {
-    XBT_DEBUG("shutdown %s", name);
+    XBT_DEBUG("kill %s", smx_process->name);
     SIMIX_process_kill(smx_process, issuer);
   }
 
   /* FIXME: we may have to do something at the surf layer, e.g., vcpu action */
-  SIMIX_vm_set_state(ind_vm, SURF_VM_STATE_CREATED);
+  surf_resource_set_state(surf_workstation_resource_priv(ind_vm),
+                          (int)SURF_VM_STATE_CREATED);
 }
 
-void SIMIX_pre_vm_shutdown(smx_simcall_t simcall, smx_host_t ind_vm)
+void simcall_HANDLER_vm_shutdown(smx_simcall_t simcall, smx_host_t ind_vm)
 {
   SIMIX_vm_shutdown(ind_vm, simcall->issuer);
-  SIMIX_simcall_answer(simcall);
 }
 
 
@@ -336,17 +338,11 @@ void SIMIX_vm_destroy(smx_host_t ind_vm)
   xbt_assert((ind_vm != NULL), "Invalid parameters");
   const char *hostname = SIMIX_host_get_name(ind_vm);
 
-  smx_host_priv_t host_priv = SIMIX_host_priv(ind_vm);
+  XBT_DEBUG("destroy %s", hostname);
 
   /* this will call the registered callback function, i.e., SIMIX_host_destroy().  */
   xbt_lib_unset(host_lib, hostname, SIMIX_HOST_LEVEL, 1);
 
   /* jump to vm_ws_destroy(). The surf level resource will be freed. */
-  surf_vm_workstation_model->extension.vm_workstation.destroy(ind_vm);
-}
-
-void SIMIX_pre_vm_destroy(smx_simcall_t simcall, smx_host_t ind_vm)
-{
-  SIMIX_vm_destroy(ind_vm);
-  SIMIX_simcall_answer(simcall);
+  surf_vm_workstation_destroy(ind_vm);
 }