X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/766984362b46eee6d6ae351ccd5f1d6d38702594..f757db3e61c8c5cbcab605a1beba36b5e21dc6f9:/src/msg/msg_vm.c diff --git a/src/msg/msg_vm.c b/src/msg/msg_vm.c index 2e57fab322..d5bff3559c 100644 --- a/src/msg/msg_vm.c +++ b/src/msg/msg_vm.c @@ -1,4 +1,5 @@ -/* Copyright (c) 2012. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2012-2013. The SimGrid Team. + * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -17,17 +18,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,30 +70,30 @@ 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) { - /* 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,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 + * Will raise a not_found exception if the process were not bound 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 +106,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 +131,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 +151,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))); + 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 +170,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); - MSG_process_kill(process); + while (!xbt_dynar_is_empty(vm->processes)) { + 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 process_list = xbt_dynar_new(sizeof(msg_process_t), NULL); + msg_process_t process; + unsigned int cpt; + + xbt_dynar_foreach(vm->processes, cpt, process) { + xbt_dynar_push_as(process_list, msg_process_t, process); + } + + xbt_dynar_foreach(process_list, cpt, process) { + msg_process_t new_process = MSG_process_restart(process); + MSG_vm_bind(vm, new_process); } + + xbt_dynar_free(&process_list); } /** @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) { - //FIXME: Slow ? - simdata_process_t simdata = simcall_process_get_data(process); - simdata->vm = NULL; - } - xbt_dynar_free(&vm->processes); - xbt_free(vm); + unsigned int cpt; + 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_free(vm->name); + xbt_dynar_free(&vm->processes); + xbt_free(vm); }