code simplification in the VM tracing code

diff --git a/src/msg/instr_msg_vm.cpp b/src/msg/instr_msg_vm.cpp
index c4f2242..1ddf437 100644 (file)
--- a/src/msg/instr_msg_vm.cpp
+++ b/src/msg/instr_msg_vm.cpp
@@ -5,22 +5,10 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "msg_private.h"
-
+#include "simgrid/s4u/VirtualMachine.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_msg_vm, instr, "MSG VM");
 
-
-char *instr_vm_id (msg_vm_t vm, char *str, int len)
-{
-  return instr_vm_id_2(MSG_host_get_name(vm), str, len);
-}
-
-char *instr_vm_id_2 (const char *vm_name, char *str, int len)
-{
-  snprintf (str, len, "%s", vm_name);
-  return str;
-}
-
 /*
  * Instrumentation functions to trace MSG VMs (msg_vm_t)
  */
@@ -31,24 +19,21 @@ void TRACE_msg_vm_change_host(msg_vm_t vm, msg_host_t old_host, msg_host_t new_h
     char key[INSTR_DEFAULT_STR_SIZE];
     snprintf (key, INSTR_DEFAULT_STR_SIZE, "%lld", counter++);
 
-    int len = INSTR_DEFAULT_STR_SIZE;
-    char str[INSTR_DEFAULT_STR_SIZE];
-
     //start link
-    container_t msg = PJ_container_get (instr_vm_id(vm, str, len));
+    container_t msg = PJ_container_get(vm->name().c_str());
     type_t type = PJ_type_get ("MSG_VM_LINK", PJ_type_get_root());
     new_pajeStartLink (MSG_get_clock(), PJ_container_get_root(), type, msg, "M", key);
 
     //destroy existing container of this vm
-    container_t existing_container = PJ_container_get(instr_vm_id(vm, str, len));
+    container_t existing_container = PJ_container_get(vm->name().c_str());
     PJ_container_remove_from_parent (existing_container);
     PJ_container_free(existing_container);
 
     //create new container on the new_host location
-    PJ_container_new(instr_vm_id(vm, str, len), INSTR_MSG_VM, PJ_container_get(sg_host_get_name(new_host)));
+    PJ_container_new(vm->name().c_str(), INSTR_MSG_VM, PJ_container_get(sg_host_get_name(new_host)));
 
     //end link
-    msg = PJ_container_get(instr_vm_id(vm, str, len));
+    msg  = PJ_container_get(vm->name().c_str());
     type = PJ_type_get ("MSG_VM_LINK", PJ_type_get_root());
     new_pajeEndLink (MSG_get_clock(), PJ_container_get_root(), type, msg, "M", key);
   }
@@ -57,10 +42,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_start(msg_vm_t vm)
 {
   if (TRACE_msg_vm_is_enabled()){
-    int len = INSTR_DEFAULT_STR_SIZE;
-    char str[INSTR_DEFAULT_STR_SIZE];
-
-    container_t vm_container = PJ_container_get (instr_vm_id(vm, str, len));
+    container_t vm_container = PJ_container_get(vm->name().c_str());
     type_t type = PJ_type_get ("MSG_VM_STATE", vm_container->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);
@@ -70,11 +52,8 @@ void TRACE_msg_vm_start(msg_vm_t vm)
 
 void TRACE_msg_vm_kill(msg_vm_t vm) {
   if (TRACE_msg_vm_is_enabled()) {
-    int len = INSTR_DEFAULT_STR_SIZE;
-    char str[INSTR_DEFAULT_STR_SIZE];
-
     //kill means that this vm no longer exists, let's destroy it
-    container_t process = PJ_container_get (instr_vm_id(vm, str, len));
+    container_t process = PJ_container_get(vm->name().c_str());
     PJ_container_remove_from_parent (process);
     PJ_container_free (process);
   }
@@ -83,10 +62,7 @@ void TRACE_msg_vm_kill(msg_vm_t vm) {
 void TRACE_msg_vm_suspend(msg_vm_t vm)
 {
   if (TRACE_msg_vm_is_enabled()){
-    int len = INSTR_DEFAULT_STR_SIZE;
-    char str[INSTR_DEFAULT_STR_SIZE];
-
-    container_t vm_container = PJ_container_get (instr_vm_id(vm, str, len));
+    container_t vm_container = PJ_container_get(vm->name().c_str());
     type_t type = PJ_type_get ("MSG_VM_STATE", vm_container->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);
@@ -96,10 +72,7 @@ void TRACE_msg_vm_suspend(msg_vm_t vm)
 void TRACE_msg_vm_resume(msg_vm_t vm)
 {
   if (TRACE_msg_vm_is_enabled()){
-    int len = INSTR_DEFAULT_STR_SIZE;
-    char str[INSTR_DEFAULT_STR_SIZE];
-
-    container_t vm_container = PJ_container_get (instr_vm_id(vm, str, len));
+    container_t vm_container = PJ_container_get(vm->name().c_str());
     type_t type = PJ_type_get ("MSG_VM_STATE", vm_container->type);
     new_pajePopState (MSG_get_clock(), vm_container, type);
   }
@@ -108,10 +81,7 @@ void TRACE_msg_vm_resume(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;
-    char str[INSTR_DEFAULT_STR_SIZE];
-
-    container_t vm_container = PJ_container_get (instr_vm_id(vm, str, len));
+    container_t vm_container = PJ_container_get(vm->name().c_str());
     type_t type = PJ_type_get ("MSG_VM_STATE", vm_container->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);
@@ -121,23 +91,17 @@ void TRACE_msg_vm_save(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;
-    char str[INSTR_DEFAULT_STR_SIZE];
-
-    container_t vm_container = PJ_container_get (instr_vm_id(vm, str, len));
+    container_t vm_container = PJ_container_get(vm->name().c_str());
     type_t type = PJ_type_get ("MSG_VM_STATE", vm_container->type);
     new_pajePopState (MSG_get_clock(), vm_container, type);
   }
 }
 
+// that's the end, let's destroy it
 void TRACE_msg_vm_end(msg_vm_t vm)
 {
   if (TRACE_msg_vm_is_enabled()) {
-    int len = INSTR_DEFAULT_STR_SIZE;
-    char str[INSTR_DEFAULT_STR_SIZE];
-
-    //that's the end, let's destroy it
-    container_t container = PJ_container_get (instr_vm_id(vm, str, len));
+    container_t container = PJ_container_get(vm->name().c_str());
     PJ_container_remove_from_parent (container);
     PJ_container_free (container);
   }

diff --git a/src/msg/msg_private.h b/src/msg/msg_private.h
index d02abc7..b094543 100644 (file)
--- a/src/msg/msg_private.h
+++ b/src/msg/msg_private.h
@@ -171,8 +171,6 @@ XBT_PRIVATE void TRACE_msg_process_sleep_in(msg_process_t process);   //called f
 XBT_PRIVATE void TRACE_msg_process_sleep_out(msg_process_t process);
 
 /* declaration of instrumentation functions from instr_msg_vm.c */
-XBT_PRIVATE char *instr_vm_id(msg_vm_t vm, char *str, int len);
-XBT_PRIVATE char *instr_vm_id_2(const char *vm_name, char *str, int len);
 XBT_PRIVATE void TRACE_msg_vm_change_host(msg_vm_t vm, msg_host_t old_host, msg_host_t new_host);
 XBT_PRIVATE void TRACE_msg_vm_start(msg_vm_t vm);
 XBT_PRIVATE void TRACE_msg_vm_kill(msg_vm_t process);