fix PJ_value class and its methods

[simgrid.git] / src / surf / instr_routing.cpp

diff --git a/src/surf/instr_routing.cpp b/src/surf/instr_routing.cpp
index 7044975..fab1c56 100644 (file)
--- a/src/surf/instr_routing.cpp
+++ b/src/surf/instr_routing.cpp
@@ -234,7 +234,7 @@ static void instr_routing_parse_start_link(simgrid::s4u::Link& link)
 }
 
 static void sg_instr_new_host(simgrid::s4u::Host& host)
-{ paje_value pj_value;
+{
   container_t father = currentContainer.back();
   container_t container = PJ_container_new(host.getCname(), INSTR_HOST, father);
 
@@ -268,10 +268,10 @@ static void sg_instr_new_host(simgrid::s4u::Host& host)
       msg_process = PJ_type_container_new("MSG_PROCESS", container->type);
       type_t state = PJ_type_state_new ("MSG_PROCESS_STATE", msg_process);
       s_val PJ_value("suspend", "1 0 1", state);
-      PJ_value.PJ_value_update("sleep", "1 1 0", state);
-      PJ_value.PJ_value_update("receive", "1 0 0", state);
-      PJ_value.PJ_value_update("send", "0 0 1", state);
-      PJ_value.PJ_value_update("task_execute", "0 1 1", state);
+      s_val::PJ_value_get_or_new("sleep", "1 1 0", state);
+      s_val::PJ_value_get_or_new("receive", "1 0 0", state);
+      s_val::PJ_value_get_or_new("send", "0 0 1", state);
+      s_val::PJ_value_get_or_new("task_execute", "0 1 1", state);
       PJ_type_link_new ("MSG_PROCESS_LINK", PJ_type_get_root(), msg_process, msg_process);
       PJ_type_link_new ("MSG_PROCESS_TASK_LINK", PJ_type_get_root(), msg_process, msg_process);
     }
@@ -283,10 +283,10 @@ static void sg_instr_new_host(simgrid::s4u::Host& host)
       msg_vm = PJ_type_container_new("MSG_VM", container->type);
       type_t state = PJ_type_state_new ("MSG_VM_STATE", msg_vm);
       s_val PJ_value("suspend", "1 0 1", state);
-      PJ_value.PJ_value_update ("sleep", "1 1 0", state);
-      PJ_value.PJ_value_update ("receive", "1 0 0", state);
-      PJ_value.PJ_value_update ("send", "0 0 1", state);
-      PJ_value.PJ_value_update ("task_execute", "0 1 1", state);
+      s_val::PJ_value_get_or_new ("sleep", "1 1 0", state);
+      s_val::PJ_value_get_or_new ("receive", "1 0 0", state);
+      s_val::PJ_value_get_or_new ("send", "0 0 1", state);
+      s_val::PJ_value_get_or_new ("task_execute", "0 1 1", state);
       PJ_type_link_new ("MSG_VM_LINK", PJ_type_get_root(), msg_vm, msg_vm);
       PJ_type_link_new ("MSG_VM_PROCESS_LINK", PJ_type_get_root(), msg_vm, msg_vm);
     }
@@ -401,7 +401,7 @@ void instr_new_user_state_type (const char *father_type, const char *new_typenam
 }
 
 static void recursiveNewValueForUserStateType (const char *type_name, const char *value, const char *color, type_t root)
-{ paje_value pj_value;
+{
   if (not strcmp(root->name, type_name)) {
     s_val PJ_value (value, color, root);
   }