X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/231fedb1f0211c7c11f91e284a97485ac3bc6649..4078fd06852ccf32fff89e3c7a8774fe41727240:/src/msg/instr_msg_vm.c diff --git a/src/msg/instr_msg_vm.c b/src/msg/instr_msg_vm.c index cc91b32c6c..3171f4d5b1 100644 --- a/src/msg/instr_msg_vm.c +++ b/src/msg/instr_msg_vm.c @@ -1,8 +1,8 @@ -/* Copyright (c) 2012. The SimGrid Team. +/* Copyright (c) 2012-2014. 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. */ + * under the terms of the license (GNU LGPL) which comes with this package. */ #include "msg_private.h" @@ -46,7 +46,7 @@ void TRACE_msg_vm_change_host(msg_vm_t vm, msg_host_t old_host, msg_host_t new_h PJ_container_free(existing_container); //create new container on the new_host location - msg = PJ_container_new(instr_vm_id(vm, str, len), INSTR_MSG_VM, PJ_container_get(SIMIX_host_get_name(new_host))); + PJ_container_new(instr_vm_id(vm, str, len), INSTR_MSG_VM, PJ_container_get(SIMIX_host_get_name(new_host))); //end link msg = PJ_container_get(instr_vm_id(vm, str, len)); @@ -55,7 +55,7 @@ void TRACE_msg_vm_change_host(msg_vm_t vm, msg_host_t old_host, msg_host_t new_h } } -void TRACE_msg_vm_create (const char *vm_name, msg_host_t host) +void TRACE_msg_vm_create(const char *vm_name, msg_host_t host) { if (TRACE_msg_vm_is_enabled()){ int len = INSTR_DEFAULT_STR_SIZE; @@ -66,7 +66,7 @@ void TRACE_msg_vm_create (const char *vm_name, msg_host_t host) } } -void TRACE_msg_vm_start (msg_vm_t vm) +void TRACE_msg_vm_start(msg_vm_t vm) { if (TRACE_msg_vm_is_enabled()){ int len = INSTR_DEFAULT_STR_SIZE; @@ -117,7 +117,7 @@ void TRACE_msg_vm_resume(msg_vm_t vm) } } -void TRACE_msg_vm_sleep_in(msg_vm_t vm) +void TRACE_msg_vm_save(msg_vm_t vm) { if (TRACE_msg_vm_is_enabled()){ int len = INSTR_DEFAULT_STR_SIZE; @@ -125,12 +125,12 @@ void TRACE_msg_vm_sleep_in(msg_vm_t vm) container_t vm_container = PJ_container_get (instr_vm_id(vm, str, len)); type_t type = PJ_type_get ("MSG_VM_STATE", vm_container->type); - val_t value = PJ_value_get ("sleep", type); + val_t value = PJ_value_get ("save", type); new_pajePushState (MSG_get_clock(), vm_container, type, value); } } -void TRACE_msg_vm_sleep_out(msg_vm_t vm) +void TRACE_msg_vm_restore(msg_vm_t vm) { if (TRACE_msg_vm_is_enabled()){ int len = INSTR_DEFAULT_STR_SIZE;