From: Takishipp Date: Wed, 16 Aug 2017 11:51:58 +0000 (+0200) Subject: Add s_type_get_or_null to s_type class as a method X-Git-Tag: v3_17~203^2^2~8 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/32eeb3976a16c5e5d2b2a9c00f4386cebbb75550?hp=2d0e2d7e6947278ab1bafd1cad44ecd78416c79c Add s_type_get_or_null to s_type class as a method --- diff --git a/src/instr/instr_paje_containers.cpp b/src/instr/instr_paje_containers.cpp index d65e46cba9..d6df4a0f7a 100644 --- a/src/instr/instr_paje_containers.cpp +++ b/src/instr/instr_paje_containers.cpp @@ -88,7 +88,7 @@ container_t PJ_container_new (const char *name, e_container_types kind, containe char as_typename[INSTR_DEFAULT_STR_SIZE]; snprintf (as_typename, INSTR_DEFAULT_STR_SIZE, "L%d", newContainer->level); if (newContainer->father){ - newContainer->type = PJ_type_get_or_null (as_typename, newContainer->father->type); + newContainer->type = s_type::s_type_get_or_null (as_typename, newContainer->father->type); if (newContainer->type == nullptr){ newContainer->type = PJ_type_container_new (as_typename, newContainer->father->type); } @@ -124,7 +124,7 @@ container_t PJ_container_new (const char *name, e_container_types kind, containe THROWF (tracing_error, 0, "new container kind is unknown."); break; } - type_t type = PJ_type_get_or_null (typeNameBuff, newContainer->father->type); + type_t type = s_type::s_type_get_or_null (typeNameBuff, newContainer->father->type); if (type == nullptr){ newContainer->type = PJ_type_container_new (typeNameBuff, newContainer->father->type); }else{ diff --git a/src/instr/instr_paje_types.cpp b/src/instr/instr_paje_types.cpp index a4df7a2b3d..12b7eeb46c 100644 --- a/src/instr/instr_paje_types.cpp +++ b/src/instr/instr_paje_types.cpp @@ -75,14 +75,14 @@ void recursiveDestroyType (type_t type) type_t PJ_type_get (const char *name, type_t father) { - type_t ret = PJ_type_get_or_null (name, father); + type_t ret = s_type::s_type_get_or_null (name, father); if (ret == nullptr){ THROWF (tracing_error, 2, "type with name (%s) not found in father type (%s)", name, father->name); } return ret; } -type_t PJ_type_get_or_null (const char *name, type_t father) +type_t s_type::s_type_get_or_null (const char *name, type_t father) { if (name == nullptr || father == nullptr){ THROWF (tracing_error, 0, "can't get type with a nullptr name or from a nullptr father"); diff --git a/src/instr/instr_private.h b/src/instr/instr_private.h index bedae27a32..be4255d52f 100644 --- a/src/instr/instr_private.h +++ b/src/instr/instr_private.h @@ -74,6 +74,7 @@ class s_type : public ess_type { xbt_dict_t children; xbt_dict_t values; //valid for all types except variable and container s_type (const char *typeNameBuff, const char *key, const char *color, e_entity_types kind, type_t father); + static type_t s_type_get_or_null (const char *name, type_t father); }; //-------------------------------------------------- @@ -349,7 +350,6 @@ type_t PJ_type_link_new (const char *name, type_t father, type_t source, type_t XBT_PRIVATE XBT_PRIVATE type_t PJ_type_variable_new (const char *name, const char *color, type_t father); XBT_PRIVATE type_t PJ_type_state_new (const char *name, type_t father); XBT_PUBLIC(type_t) PJ_type_get (const char *name, const type_t father); -XBT_PUBLIC(type_t) PJ_type_get_or_null (const char *name, type_t father); XBT_PRIVATE XBT_PRIVATE void PJ_type_free (type_t type); /* instr_config.c */ diff --git a/src/smpi/colls/smpi_automatic_selector.cpp b/src/smpi/colls/smpi_automatic_selector.cpp index 3ffffa0278..31d70d5089 100644 --- a/src/smpi/colls/smpi_automatic_selector.cpp +++ b/src/smpi/colls/smpi_automatic_selector.cpp @@ -16,7 +16,7 @@ #define TRACE_AUTO_COLL(cat) \ if (TRACE_is_enabled()) { \ - type_t type = PJ_type_get_or_null(#cat, PJ_type_get_root()); \ + type_t type = s_type::s_type_get_or_null(#cat, PJ_type_get_root()); \ if (not type) { \ type = PJ_type_event_new(#cat, PJ_type_get_root()); \ } \ diff --git a/src/smpi/internals/instr_smpi.cpp b/src/smpi/internals/instr_smpi.cpp index 9318b356fc..731a4dcd8a 100644 --- a/src/smpi/internals/instr_smpi.cpp +++ b/src/smpi/internals/instr_smpi.cpp @@ -208,7 +208,7 @@ void TRACE_smpi_init(int rank) * Check whether this variable already exists or not. Otherwise, it will be created * multiple times but only the last one would be used... */ - if (PJ_type_get_or_null(it.first.c_str(), container->type) == nullptr) { + if (s_type::s_type_get_or_null(it.first.c_str(), container->type) == nullptr) { PJ_type_variable_new(it.first.c_str(), nullptr, container->type); } } diff --git a/src/surf/instr_routing.cpp b/src/surf/instr_routing.cpp index c69b4d85e2..28e55d928d 100644 --- a/src/surf/instr_routing.cpp +++ b/src/surf/instr_routing.cpp @@ -105,7 +105,7 @@ static void linkContainers (container_t src, container_t dst, xbt_dict_t filter) father->type->name, src->type->name, src->type->id, dst->type->name, dst->type->id); - type_t link_type = PJ_type_get_or_null (link_typename, father->type); + type_t link_type = s_type::s_type_get_or_null (link_typename, father->type); if (link_type == nullptr){ link_type = PJ_type_link_new (link_typename, father->type, src->type, dst->type); } @@ -173,7 +173,7 @@ static void sg_instr_AS_begin(simgrid::s4u::NetZone& netzone) PJ_container_set_root (root); if (TRACE_smpi_is_enabled()) { - type_t mpi = PJ_type_get_or_null ("MPI", root->type); + type_t mpi = s_type::s_type_get_or_null ("MPI", root->type); if (mpi == nullptr){ mpi = PJ_type_container_new("MPI", root->type); if (not TRACE_smpi_is_grouped()) @@ -214,11 +214,11 @@ static void instr_routing_parse_start_link(simgrid::s4u::Link& link) container_t container = PJ_container_new(link.name(), INSTR_LINK, father); if ((TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) && (not TRACE_disable_link())) { - type_t bandwidth = PJ_type_get_or_null("bandwidth", container->type); + type_t bandwidth = s_type::s_type_get_or_null("bandwidth", container->type); if (bandwidth == nullptr) { bandwidth = PJ_type_variable_new("bandwidth", nullptr, container->type); } - type_t latency = PJ_type_get_or_null("latency", container->type); + type_t latency = s_type::s_type_get_or_null("latency", container->type); if (latency == nullptr) { latency = PJ_type_variable_new("latency", nullptr, container->type); } @@ -226,7 +226,7 @@ static void instr_routing_parse_start_link(simgrid::s4u::Link& link) new SetVariableEvent(0, container, latency, latency_value); } if (TRACE_uncategorized()) { - type_t bandwidth_used = PJ_type_get_or_null("bandwidth_used", container->type); + type_t bandwidth_used = s_type::s_type_get_or_null("bandwidth_used", container->type); if (bandwidth_used == nullptr) { PJ_type_variable_new("bandwidth_used", "0.5 0.5 0.5", container->type); } @@ -239,7 +239,7 @@ static void sg_instr_new_host(simgrid::s4u::Host& host) container_t container = PJ_container_new(host.getCname(), INSTR_HOST, father); if ((TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) && (not TRACE_disable_speed())) { - type_t speed = PJ_type_get_or_null ("power", container->type); + type_t speed = s_type::s_type_get_or_null ("power", container->type); if (speed == nullptr){ speed = PJ_type_variable_new ("power", nullptr, container->type); } @@ -248,14 +248,14 @@ static void sg_instr_new_host(simgrid::s4u::Host& host) new SetVariableEvent (0, container, speed, current_speed_state); } if (TRACE_uncategorized()){ - type_t speed_used = PJ_type_get_or_null ("power_used", container->type); + type_t speed_used = s_type::s_type_get_or_null ("power_used", container->type); if (speed_used == nullptr){ PJ_type_variable_new ("power_used", "0.5 0.5 0.5", container->type); } } if (TRACE_smpi_is_enabled() && TRACE_smpi_is_grouped()){ - type_t mpi = PJ_type_get_or_null ("MPI", container->type); + type_t mpi = s_type::s_type_get_or_null ("MPI", container->type); if (mpi == nullptr){ mpi = PJ_type_container_new("MPI", container->type); PJ_type_state_new ("MPI_STATE", mpi); @@ -263,7 +263,7 @@ static void sg_instr_new_host(simgrid::s4u::Host& host) } if (TRACE_msg_process_is_enabled()) { - type_t msg_process = PJ_type_get_or_null ("MSG_PROCESS", container->type); + type_t msg_process = s_type::s_type_get_or_null ("MSG_PROCESS", container->type); if (msg_process == nullptr){ msg_process = PJ_type_container_new("MSG_PROCESS", container->type); type_t state = PJ_type_state_new ("MSG_PROCESS_STATE", msg_process); @@ -278,7 +278,7 @@ static void sg_instr_new_host(simgrid::s4u::Host& host) } if (TRACE_msg_vm_is_enabled()) { - type_t msg_vm = PJ_type_get_or_null ("MSG_VM", container->type); + type_t msg_vm = s_type::s_type_get_or_null ("MSG_VM", container->type); if (msg_vm == nullptr){ msg_vm = PJ_type_container_new("MSG_VM", container->type); type_t state = PJ_type_state_new ("MSG_VM_STATE", msg_vm);