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
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.
*
* 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->data) {
- simdata->data = xbt_new0(s_msg_process_data_t,1);
- }
- //If if it is already in a vm, get it out of it
- if ( ((msg_process_data_t)(simdata->data))->current_vm) {
- msg_vm_t old_vm = ((msg_process_data_t)(simdata->data))->current_vm;
+ 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);
- //If it is on the wrong host, migrate it to the new host
- if (vm->location != old_vm->location) {
- MSG_process_migrate(process,vm->location);
- }
}
+ /* check if the host is in the right host */
+ if (simdata->m_host != vm->location) {
+ MSG_process_migrate(process,vm->location);
+ }
+ simdata->vm = vm;
- ((msg_process_data_t)(simdata->data))->current_vm = vm;
+ 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,m_process_t,process);
}
/** @brief Removes the given process from the given VM, and kill it
* @ingroup msg_VMs
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
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
unsigned int cpt;
m_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)));
+ 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
* 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)
+{
+ m_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);
+ 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) {
- 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);
}