X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1e21355c3e1b7abfd7457f8607b55162ce1819e9..922974894c47ede2b825a0dfff298a5d21898ac4:/src/msg/msg_vm.c diff --git a/src/msg/msg_vm.c b/src/msg/msg_vm.c index 9d0941f7f4..680dbe58ba 100644 --- a/src/msg/msg_vm.c +++ b/src/msg/msg_vm.c @@ -67,6 +67,16 @@ msg_vm_t MSG_vm_get_by_name(const char *name){ return MSG_get_host_by_name(name); } +/** \ingroup m_vm_management + * + * \brief Return the name of the #msg_host_t. + * + * This functions checks whether \a host is a valid pointer or not and return + its name. + */ +const char *MSG_vm_get_name(msg_vm_t vm) { + return MSG_host_get_name(vm); +} /** @brief Returns a newly constructed dynar containing all existing VMs in the system. * @ingroup msg_VMs @@ -147,65 +157,77 @@ int MSG_vm_is_running(msg_vm_t vm) { return __MSG_vm_is_state(msg_vm_state_running); } -// TODO complete the different state - -/** @brief Add the given process into the VM. - * @ingroup msg_VMs - * - * 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, 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; +// TODO Implement the functions for the different state - XBT_DEBUG("binding Process %s to %p",MSG_process_get_name(process),vm); +void MSG_vm_shutdown(msg_vm_t vm) +{ + /* msg_vm_t equals to msg_host_t */ + simcall_vm_shutdown(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, msg_process_t process) { - int pos = xbt_dynar_search(vm->processes,process); - xbt_dynar_remove_at(vm->processes,pos, NULL); - MSG_process_kill(process); + // #ifdef HAVE_TRACING + // TRACE_msg_vm_(vm); + // #endif } -/** @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, msg_host_t destination) { - unsigned int cpt; - msg_process_t process; - xbt_dynar_foreach(vm->processes,cpt,process) { - MSG_process_migrate(process,destination); - } - 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; -} +///** @brief Add the given process into the VM. +// * @ingroup msg_VMs +// * +// * 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, 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, 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. +// * @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, msg_host_t destination) { +// unsigned int cpt; +// msg_process_t process; +// xbt_dynar_foreach(vm->processes,cpt,process) { +// MSG_process_migrate(process,destination); +// } +// 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; +//} +// /** @brief Immediately suspend the execution of all processes within the given VM. * @ingroup msg_VMs @@ -214,86 +236,87 @@ void MSG_vm_migrate(msg_vm_t vm, msg_host_t destination) { * use a \ref MSG_file_write() before or after, depending on the exact semantic * of VM suspend to you. */ -void MSG_vm_suspend(msg_vm_t vm) { - unsigned int cpt; - 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); - } +void MSG_vm_suspend(msg_vm_t vm) +{ + simcall_vm_suspend(vm); #ifdef HAVE_TRACING TRACE_msg_vm_suspend(vm); #endif -} - -/** @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 - * use a \ref MSG_file_read() before or after, depending on the exact semantic - * of VM resume to you. - */ -void MSG_vm_resume(msg_vm_t vm) { +#if 0 unsigned int cpt; 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); + 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_resume(vm); - #endif +#endif } -/** @brief Immediately kills all processes within the given VM. Any memory that they allocated will be leaked. +// +// +///** @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 +// * use a \ref MSG_file_read() before or after, depending on the exact semantic +// * of VM resume to you. +// */ +//void MSG_vm_resume(msg_vm_t vm) { +// unsigned int cpt; +// 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 +//} +// +// +///** +// * \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 VM. Destroy the VM object from the simulation. * @ingroup msg_VMs - * - * 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_destroy(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); - } + /* First, terminate all processes on the VM */ + simcall_vm_shutdown(vm); + + /* Then, destroy the VM object */ + simcall_vm_destroy(vm); #ifdef HAVE_TRACING - TRACE_msg_vm_kill(vm); + TRACE_msg_vm_end(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) { +#if 0 unsigned int cpt; msg_process_t process; xbt_dynar_foreach(vm->processes,cpt,process) { @@ -302,11 +325,7 @@ void MSG_vm_destroy(msg_vm_t vm) { simdata->vm = NULL; } - #ifdef HAVE_TRACING - TRACE_msg_vm_end(vm); - #endif - - xbt_dynar_free(&vm->processes); xbt_free(vm); +#endif }