X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4e78565ea6b354a0e6250a87b483f909665a0ac3..6c12a132ca10eefd1d566e489e837e459db4d979:/src/msg/instr_msg_vm.c

diff --git a/src/msg/instr_msg_vm.c b/src/msg/instr_msg_vm.c
index 88761139c1..5387c10ff3 100644
--- a/src/msg/instr_msg_vm.c
+++ b/src/msg/instr_msg_vm.c
@@ -1,12 +1,11 @@
-/* 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"
 
-#ifdef HAVE_TRACING
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_msg_vm, instr, "MSG VM");
 
@@ -46,7 +45,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));
@@ -74,7 +73,7 @@ void TRACE_msg_vm_start(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 ("start", type);
+    val_t value = PJ_value_get_or_new ("start", "0 0 1", type); //start is blue
     new_pajePushState (MSG_get_clock(), vm_container, type, value);
   }
 
@@ -100,7 +99,7 @@ void TRACE_msg_vm_suspend(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 ("suspend", type);
+    val_t value = PJ_value_get_or_new ("suspend", "1 0 0", type); //suspend is red
     new_pajePushState (MSG_get_clock(), vm_container, type, value);
   }
 }
@@ -125,7 +124,7 @@ void TRACE_msg_vm_save(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 ("save", type);
+    val_t value = PJ_value_get_or_new ("save", "0 1 0", type); //save is green
     new_pajePushState (MSG_get_clock(), vm_container, type, value);
   }
 }
@@ -154,5 +153,3 @@ void TRACE_msg_vm_end(msg_vm_t vm)
     PJ_container_free (container);
   }
 }
-
-#endif /* HAVE_TRACING */