X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8de7a90b044d2c8cf008e498f533cd7131c9f106..1366b293e8c700b12567e45076cf0e6b7a25478f:/src/instr/instr_interface.cpp diff --git a/src/instr/instr_interface.cpp b/src/instr/instr_interface.cpp index 3b7ec27783..dfe6eb196e 100644 --- a/src/instr/instr_interface.cpp +++ b/src/instr/instr_interface.cpp @@ -5,10 +5,11 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "simgrid_config.h" -#include "src/surf/network_interface.hpp" #include "src/instr/instr_private.h" -#include "surf/surf.h" +#include "src/kernel/routing/NetPoint.hpp" +#include "src/surf/network_interface.hpp" #include "src/surf/surf_private.h" +#include "surf/surf.h" typedef enum { INSTR_US_DECLARE, @@ -19,22 +20,23 @@ typedef enum { XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_api, instr, "API"); -xbt_dict_t created_categories = NULL; -xbt_dict_t declared_marks = NULL; -xbt_dict_t user_host_variables = NULL; -xbt_dict_t user_vm_variables = NULL; -xbt_dict_t user_link_variables = NULL; +xbt_dict_t created_categories = nullptr; +xbt_dict_t declared_marks = nullptr; +xbt_dict_t user_host_variables = nullptr; +xbt_dict_t user_vm_variables = nullptr; +xbt_dict_t user_link_variables = nullptr; extern xbt_dict_t trivaNodeTypes; extern xbt_dict_t trivaEdgeTypes; static xbt_dynar_t instr_dict_to_dynar (xbt_dict_t filter) { - if (!TRACE_is_enabled()) return NULL; - if (!TRACE_needs_platform()) return NULL; + if (not TRACE_is_enabled() || not TRACE_needs_platform()) + return nullptr; xbt_dynar_t ret = xbt_dynar_new (sizeof(char*), &xbt_free_ref); - xbt_dict_cursor_t cursor = NULL; - char *name, *value; + xbt_dict_cursor_t cursor = nullptr; + char *name; + char *value; xbt_dict_foreach(filter, cursor, name, value) { xbt_dynar_push_as (ret, char*, xbt_strdup(name)); } @@ -58,7 +60,7 @@ static xbt_dynar_t instr_dict_to_dynar (xbt_dict_t filter) */ void TRACE_category(const char *category) { - TRACE_category_with_color (category, NULL); + TRACE_category_with_color (category, nullptr); } /** \ingroup TRACE_category @@ -78,22 +80,22 @@ void TRACE_category(const char *category) */ void TRACE_category_with_color (const char *category, const char *color) { - /* safe switch */ - if (!TRACE_is_enabled()) return; + /* safe switches. tracing has to be activated and if platform is not traced, we can't deal with categories */ + if (not TRACE_is_enabled() || not TRACE_needs_platform()) + return; - if (!(TRACE_categorized() && category != NULL)) return; - - /* if platform is not traced, we can't deal with categories */ - if (!TRACE_needs_platform()) return; + if (not(TRACE_categorized() && category != nullptr)) + return; //check if category is already created - char *created = (char*)xbt_dict_get_or_null(created_categories, category); - if (created) return; - xbt_dict_set (created_categories, category, xbt_strdup("1"), NULL); + if (xbt_dict_get_or_null(created_categories, category) != nullptr) + return; + + xbt_dict_set (created_categories, category, xbt_strdup("1"), nullptr); //define final_color char final_color[INSTR_DEFAULT_STR_SIZE]; - if (!color){ + if (not color) { //generate a random color double red = drand48(); double green = drand48(); @@ -121,10 +123,10 @@ void TRACE_category_with_color (const char *category, const char *color) * * \see MSG_task_set_category, SD_task_set_category */ -xbt_dynar_t TRACE_get_categories (void) +xbt_dynar_t TRACE_get_categories () { - if (!TRACE_is_enabled()) return NULL; - if (!TRACE_categorized()) return NULL; + if (not TRACE_is_enabled() || not TRACE_categorized()) + return nullptr; return instr_dict_to_dynar (created_categories); } @@ -141,23 +143,21 @@ xbt_dynar_t TRACE_get_categories (void) */ void TRACE_declare_mark(const char *mark_type) { - /* safe switch */ - if (!TRACE_is_enabled()) return; - - /* if platform is not traced, we don't allow marks */ - if (!TRACE_needs_platform()) return; + /* safe switchs. tracing has to be activated and if platform is not traced, we can't deal with marks */ + if (not TRACE_is_enabled() || not TRACE_needs_platform()) + return; - if (!mark_type) THROWF (tracing_error, 1, "mark_type is NULL"); + if (not mark_type) + THROWF (tracing_error, 1, "mark_type is nullptr"); //check if mark_type is already declared - char *created = (char*)xbt_dict_get_or_null(declared_marks, mark_type); - if (created) { + if (xbt_dict_get_or_null(declared_marks, mark_type) != nullptr) { THROWF (tracing_error, 1, "mark_type with name (%s) is already declared", mark_type); } XBT_DEBUG("MARK,declare %s", mark_type); PJ_type_event_new(mark_type, PJ_type_get_root()); - xbt_dict_set (declared_marks, mark_type, xbt_strdup("1"), NULL); + xbt_dict_set (declared_marks, mark_type, xbt_strdup("1"), nullptr); } /** \ingroup TRACE_mark @@ -166,7 +166,7 @@ void TRACE_declare_mark(const char *mark_type) * This function declares a new colored value for a Paje event type in the trace file that can be used by simulators to * declare application-level marks. This function is independent of which API is used in SimGrid. The color needs to be * a string with three numbers separated by spaces in the range [0,1]. - * A light-gray color can be specified using "0.7 0.7 0.7" as color. If a NULL color is provided, the color used will + * A light-gray color can be specified using "0.7 0.7 0.7" as color. If a nullptr color is provided, the color used will * be white ("1 1 1"). * * \param mark_type The name of the new type. @@ -176,26 +176,27 @@ void TRACE_declare_mark(const char *mark_type) * \see TRACE_mark */ void TRACE_declare_mark_value_with_color (const char *mark_type, const char *mark_value, const char *mark_color) -{ - /* safe switch */ - if (!TRACE_is_enabled()) return; - - /* if platform is not traced, we don't allow marks */ - if (!TRACE_needs_platform()) return; +{ paje_value pj_value; + /* safe switches. tracing has to be activated and if platform is not traced, we can't deal with marks */ + if (not TRACE_is_enabled() || not TRACE_needs_platform()) + return; - if (!mark_type) THROWF (tracing_error, 1, "mark_type is NULL"); - if (!mark_value) THROWF (tracing_error, 1, "mark_value is NULL"); + if (not mark_type) + THROWF (tracing_error, 1, "mark_type is nullptr"); + if (not mark_value) + THROWF (tracing_error, 1, "mark_value is nullptr"); type_t type = PJ_type_get (mark_type, PJ_type_get_root()); - if (!type){ + if (not type) { THROWF (tracing_error, 1, "mark_type with name (%s) is not declared", mark_type); } char white[INSTR_DEFAULT_STR_SIZE] = "1.0 1.0 1.0"; - if (!mark_color) mark_color = white; + if (not mark_color) + mark_color = white; XBT_DEBUG("MARK,declare_value %s %s %s", mark_type, mark_value, mark_color); - PJ_value_new (mark_value, mark_color, type); + s_val rett(mark_value, mark_color, type); } /** \ingroup TRACE_mark @@ -203,7 +204,7 @@ void TRACE_declare_mark_value_with_color (const char *mark_type, const char *mar * * This function declares a new value for a Paje event type in the trace file that can be used by simulators to declare * application-level marks. This function is independent of which API is used in SimGrid. Calling this function is the - * same as calling \ref TRACE_declare_mark_value_with_color with a NULL color. + * same as calling \ref TRACE_declare_mark_value_with_color with a nullptr color. * * \param mark_type The name of the new type. * \param mark_value The name of the new value for this type. @@ -212,7 +213,7 @@ void TRACE_declare_mark_value_with_color (const char *mark_type, const char *mar */ void TRACE_declare_mark_value (const char *mark_type, const char *mark_value) { - TRACE_declare_mark_value_with_color (mark_type, mark_value, NULL); + TRACE_declare_mark_value_with_color (mark_type, mark_value, nullptr); } /** @@ -230,25 +231,25 @@ void TRACE_declare_mark_value (const char *mark_type, const char *mark_value) * \see TRACE_declare_mark */ void TRACE_mark(const char *mark_type, const char *mark_value) -{ - /* safe switch */ - if (!TRACE_is_enabled()) return; - - /* if platform is not traced, we don't allow marks */ - if (!TRACE_needs_platform()) return; +{ paje_value pj_value; + /* safe switches. tracing has to be activated and if platform is not traced, we can't deal with marks */ + if (not TRACE_is_enabled() || not TRACE_needs_platform()) + return; - if (!mark_type) THROWF (tracing_error, 1, "mark_type is NULL"); - if (!mark_value) THROWF (tracing_error, 1, "mark_value is NULL"); + if (not mark_type) + THROWF (tracing_error, 1, "mark_type is nullptr"); + if (not mark_value) + THROWF (tracing_error, 1, "mark_value is nullptr"); //check if mark_type is already declared type_t type = PJ_type_get (mark_type, PJ_type_get_root()); - if (!type){ + if (not type) { THROWF (tracing_error, 1, "mark_type with name (%s) is not declared", mark_type); } - val_t value = PJ_value_get (mark_value, type); + val_t value = pj_value.PJ_value_get (mark_value, type); XBT_DEBUG("MARK %s %s", mark_type, mark_value); - new_pajeNewEvent (MSG_get_clock(), PJ_container_get_root(), type, value); + new NewEvent (MSG_get_clock(), PJ_container_get_root(), type, value); } /** \ingroup TRACE_mark @@ -258,9 +259,10 @@ void TRACE_mark(const char *mark_type, const char *mark_value) * * \return A dynar with the declared marks, must be freed with xbt_dynar_free. */ -xbt_dynar_t TRACE_get_marks (void) +xbt_dynar_t TRACE_get_marks () { - if (!TRACE_is_enabled()) return NULL; + if (not TRACE_is_enabled()) + return nullptr; return instr_dict_to_dynar (declared_marks); } @@ -268,74 +270,56 @@ xbt_dynar_t TRACE_get_marks (void) static void instr_user_variable(double time, const char *resource, const char *variable, const char *father_type, double value, InstrUserVariable what, const char *color, xbt_dict_t filter) { - /* safe switch */ - if (!TRACE_is_enabled()) return; - - /* if platform is not traced, we don't allow user variables */ - if (!TRACE_needs_platform()) return; + /* safe switches. tracing has to be activated and if platform is not traced, we don't allow user variables */ + if (not TRACE_is_enabled() || not TRACE_needs_platform()) + return; //check if variable is already declared char *created = (char*)xbt_dict_get_or_null(filter, variable); if (what == INSTR_US_DECLARE){ - if (created){//already declared - return; - }else{ - xbt_dict_set (filter, variable, xbt_strdup("1"), NULL); + if (not created) { // not declared yet + xbt_dict_set (filter, variable, xbt_strdup("1"), nullptr); + instr_new_user_variable_type (father_type, variable, color); } }else{ - if (!created){//not declared, ignore - return; - } - } - - char valuestr[100]; - snprintf(valuestr, 100, "%g", value); - - switch (what){ - case INSTR_US_DECLARE: - instr_new_user_variable_type (father_type, variable, color); - break; - case INSTR_US_SET: - { + if (created) { // declared, let's work + char valuestr[100]; + snprintf(valuestr, 100, "%g", value); container_t container = PJ_container_get(resource); type_t type = PJ_type_get (variable, container->type); - new_pajeSetVariable(time, container, type, value); + switch (what){ + case INSTR_US_SET: + new SetVariableEvent(time, container, type, value); + break; + case INSTR_US_ADD: + new AddVariableEvent(time, container, type, value); + break; + case INSTR_US_SUB: + new SubVariableEvent(time, container, type, value); + break; + default: + THROW_IMPOSSIBLE; + break; + } } - break; - case INSTR_US_ADD: - { - container_t container = PJ_container_get(resource); - type_t type = PJ_type_get (variable, container->type); - new_pajeAddVariable(time, container, type, value); - } - break; - case INSTR_US_SUB: - { - container_t container = PJ_container_get(resource); - type_t type = PJ_type_get (variable, container->type); - new_pajeSubVariable(time, container, type, value); - } - break; - default: - //TODO: launch exception - break; } } static void instr_user_srcdst_variable(double time, const char *src, const char *dst, const char *variable, const char *father_type, double value, InstrUserVariable what) { - sg_netcard_t src_elm = sg_netcard_by_name_or_null(src); - if(!src_elm) xbt_die("Element '%s' not found!",src); + sg_netpoint_t src_elm = sg_netpoint_by_name_or_null(src); + if (not src_elm) + xbt_die("Element '%s' not found!",src); - sg_netcard_t dst_elm = sg_netcard_by_name_or_null(dst); - if(!dst_elm) xbt_die("Element '%s' not found!",dst); + sg_netpoint_t dst_elm = sg_netpoint_by_name_or_null(dst); + if (not dst_elm) + xbt_die("Element '%s' not found!",dst); - std::vector *route = new std::vector(); - routing_platf->getRouteAndLatency (src_elm, dst_elm, route,NULL); - for (auto link : *route) - instr_user_variable (time, link->getName(), variable, father_type, value, what, NULL, user_link_variables); - delete route; + std::vector route; + simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(src_elm, dst_elm, &route, nullptr); + for (auto link : route) + instr_user_variable(time, link->cname(), variable, father_type, value, what, nullptr, user_link_variables); } /** \ingroup TRACE_API @@ -352,11 +336,13 @@ static void instr_user_srcdst_variable(double time, const char *src, const char int TRACE_platform_graph_export_graphviz (const char *filename) { /* returns 1 if successful, 0 otherwise */ - if (!TRACE_is_enabled()) return 0; + if (not TRACE_is_enabled()) + return 0; xbt_graph_t g = instr_routing_platform_graph(); - if (g == NULL) return 0; + if (g == nullptr) + return 0; instr_routing_platform_graph_export_graphviz (g, filename); - xbt_graph_free_graph(g, xbt_free_f, xbt_free_f, NULL); + xbt_graph_free_graph(g, xbt_free_f, xbt_free_f, nullptr); return 1; } @@ -379,7 +365,7 @@ int TRACE_platform_graph_export_graphviz (const char *filename) */ void TRACE_vm_variable_declare (const char *variable) { - instr_user_variable(0, NULL, variable, "MSG_VM", 0, INSTR_US_DECLARE, NULL, user_vm_variables); + instr_user_variable(0, nullptr, variable, "MSG_VM", 0, INSTR_US_DECLARE, nullptr, user_vm_variables); } /** \ingroup TRACE_user_variables @@ -394,7 +380,7 @@ void TRACE_vm_variable_declare (const char *variable) */ void TRACE_vm_variable_declare_with_color (const char *variable, const char *color) { - instr_user_variable(0, NULL, variable, "MSG_VM", 0, INSTR_US_DECLARE, color, user_vm_variables); + instr_user_variable(0, nullptr, variable, "MSG_VM", 0, INSTR_US_DECLARE, color, user_vm_variables); } /** \ingroup TRACE_user_variables @@ -456,7 +442,7 @@ void TRACE_vm_variable_sub (const char *vm, const char *variable, double value) */ void TRACE_vm_variable_set_with_time (double time, const char *vm, const char *variable, double value) { - instr_user_variable(time, vm, variable, "MSG_VM", value, INSTR_US_SET, NULL, user_vm_variables); + instr_user_variable(time, vm, variable, "MSG_VM", value, INSTR_US_SET, nullptr, user_vm_variables); } /** \ingroup TRACE_user_variables @@ -476,7 +462,7 @@ void TRACE_vm_variable_set_with_time (double time, const char *vm, const char *v */ void TRACE_vm_variable_add_with_time (double time, const char *vm, const char *variable, double value) { - instr_user_variable(time, vm, variable, "MSG_VM", value, INSTR_US_ADD, NULL, user_vm_variables); + instr_user_variable(time, vm, variable, "MSG_VM", value, INSTR_US_ADD, nullptr, user_vm_variables); } /** \ingroup TRACE_user_variables @@ -496,20 +482,7 @@ void TRACE_vm_variable_add_with_time (double time, const char *vm, const char *v */ void TRACE_vm_variable_sub_with_time (double time, const char *vm, const char *variable, double value) { - instr_user_variable(time, vm, variable, "MSG_VM", value, INSTR_US_SUB, NULL, user_vm_variables); -} - -/** \ingroup TRACE_user_variables - * \brief Get declared user vm variables - * - * This function should be used to get VM variables that were already declared with #TRACE_vm_variable_declare or with - * #TRACE_vm_variable_declare_with_color. - * - * \return A dynar with the declared host variables, must be freed with xbt_dynar_free. - */ -xbt_dynar_t TRACE_get_vm_variables (void) -{ - return instr_dict_to_dynar (user_vm_variables); + instr_user_variable(time, vm, variable, "MSG_VM", value, INSTR_US_SUB, nullptr, user_vm_variables); } /* for host variables */ @@ -526,7 +499,7 @@ xbt_dynar_t TRACE_get_vm_variables (void) */ void TRACE_host_variable_declare (const char *variable) { - instr_user_variable(0, NULL, variable, "HOST", 0, INSTR_US_DECLARE, NULL, user_host_variables); + instr_user_variable(0, nullptr, variable, "HOST", 0, INSTR_US_DECLARE, nullptr, user_host_variables); } /** \ingroup TRACE_user_variables @@ -541,7 +514,7 @@ void TRACE_host_variable_declare (const char *variable) */ void TRACE_host_variable_declare_with_color (const char *variable, const char *color) { - instr_user_variable(0, NULL, variable, "HOST", 0, INSTR_US_DECLARE, color, user_host_variables); + instr_user_variable(0, nullptr, variable, "HOST", 0, INSTR_US_DECLARE, color, user_host_variables); } /** \ingroup TRACE_user_variables @@ -603,7 +576,7 @@ void TRACE_host_variable_sub (const char *host, const char *variable, double val */ void TRACE_host_variable_set_with_time (double time, const char *host, const char *variable, double value) { - instr_user_variable(time, host, variable, "HOST", value, INSTR_US_SET, NULL, user_host_variables); + instr_user_variable(time, host, variable, "HOST", value, INSTR_US_SET, nullptr, user_host_variables); } /** \ingroup TRACE_user_variables @@ -623,7 +596,7 @@ void TRACE_host_variable_set_with_time (double time, const char *host, const cha */ void TRACE_host_variable_add_with_time (double time, const char *host, const char *variable, double value) { - instr_user_variable(time, host, variable, "HOST", value, INSTR_US_ADD, NULL, user_host_variables); + instr_user_variable(time, host, variable, "HOST", value, INSTR_US_ADD, nullptr, user_host_variables); } /** \ingroup TRACE_user_variables @@ -643,7 +616,7 @@ void TRACE_host_variable_add_with_time (double time, const char *host, const cha */ void TRACE_host_variable_sub_with_time (double time, const char *host, const char *variable, double value) { - instr_user_variable(time, host, variable, "HOST", value, INSTR_US_SUB, NULL, user_host_variables); + instr_user_variable(time, host, variable, "HOST", value, INSTR_US_SUB, nullptr, user_host_variables); } /** \ingroup TRACE_user_variables @@ -654,7 +627,7 @@ void TRACE_host_variable_sub_with_time (double time, const char *host, const cha * * \return A dynar with the declared host variables, must be freed with xbt_dynar_free. */ -xbt_dynar_t TRACE_get_host_variables (void) +xbt_dynar_t TRACE_get_host_variables () { return instr_dict_to_dynar (user_host_variables); } @@ -673,7 +646,7 @@ xbt_dynar_t TRACE_get_host_variables (void) */ void TRACE_link_variable_declare (const char *variable) { - instr_user_variable (0, NULL, variable, "LINK", 0, INSTR_US_DECLARE, NULL, user_link_variables); + instr_user_variable (0, nullptr, variable, "LINK", 0, INSTR_US_DECLARE, nullptr, user_link_variables); } /** \ingroup TRACE_user_variables @@ -688,7 +661,7 @@ void TRACE_link_variable_declare (const char *variable) */ void TRACE_link_variable_declare_with_color (const char *variable, const char *color) { - instr_user_variable (0, NULL, variable, "LINK", 0, INSTR_US_DECLARE, color, user_link_variables); + instr_user_variable (0, nullptr, variable, "LINK", 0, INSTR_US_DECLARE, color, user_link_variables); } /** \ingroup TRACE_user_variables @@ -750,7 +723,7 @@ void TRACE_link_variable_sub (const char *link, const char *variable, double val */ void TRACE_link_variable_set_with_time (double time, const char *link, const char *variable, double value) { - instr_user_variable (time, link, variable, "LINK", value, INSTR_US_SET, NULL, user_link_variables); + instr_user_variable (time, link, variable, "LINK", value, INSTR_US_SET, nullptr, user_link_variables); } /** \ingroup TRACE_user_variables @@ -770,7 +743,7 @@ void TRACE_link_variable_set_with_time (double time, const char *link, const cha */ void TRACE_link_variable_add_with_time (double time, const char *link, const char *variable, double value) { - instr_user_variable (time, link, variable, "LINK", value, INSTR_US_ADD, NULL, user_link_variables); + instr_user_variable (time, link, variable, "LINK", value, INSTR_US_ADD, nullptr, user_link_variables); } /** \ingroup TRACE_user_variables @@ -790,7 +763,7 @@ void TRACE_link_variable_add_with_time (double time, const char *link, const cha */ void TRACE_link_variable_sub_with_time (double time, const char *link, const char *variable, double value) { - instr_user_variable (time, link, variable, "LINK", value, INSTR_US_SUB, NULL, user_link_variables); + instr_user_variable (time, link, variable, "LINK", value, INSTR_US_SUB, nullptr, user_link_variables); } /* for link variables, but with src and dst used for get_route */ @@ -925,7 +898,7 @@ void TRACE_link_srcdst_variable_sub_with_time (double time, const char *src, con * * \return A dynar with the declared link variables, must be freed with xbt_dynar_free. */ -xbt_dynar_t TRACE_get_link_variables (void) +xbt_dynar_t TRACE_get_link_variables () { return instr_dict_to_dynar (user_link_variables); } @@ -974,11 +947,11 @@ void TRACE_host_state_declare_value (const char *state, const char *value, const * \see TRACE_host_state_declare, TRACE_host_push_state, TRACE_host_pop_state, TRACE_host_reset_state */ void TRACE_host_set_state (const char *host, const char *state, const char *value) -{ +{ paje_value pj_value; container_t container = PJ_container_get(host); type_t type = PJ_type_get (state, container->type); - val_t val = PJ_value_get_or_new (value, NULL, type); /* if user didn't declare a value with a color, use NULL color */ - new_pajeSetState(MSG_get_clock(), container, type, val); + val_t val = pj_value.PJ_value_get_or_new (value, nullptr, type); /* if user didn't declare a value with a color, use nullptr color */ + new SetStateEvent(MSG_get_clock(), container, type, val); } /** \ingroup TRACE_user_variables @@ -993,11 +966,11 @@ void TRACE_host_set_state (const char *host, const char *state, const char *valu * \see TRACE_host_state_declare, TRACE_host_set_state, TRACE_host_pop_state, TRACE_host_reset_state */ void TRACE_host_push_state (const char *host, const char *state, const char *value) -{ +{ paje_value pj_value; container_t container = PJ_container_get(host); type_t type = PJ_type_get (state, container->type); - val_t val = PJ_value_get_or_new (value, NULL, type); /* if user didn't declare a value with a color, use NULL color */ - new_pajePushState(MSG_get_clock(), container, type, val); + val_t val = pj_value.PJ_value_get_or_new (value, nullptr, type); /* if user didn't declare a value with a color, use nullptr color */ + new PushStateEvent(MSG_get_clock(), container, type, val); } /** \ingroup TRACE_user_variables @@ -1014,24 +987,7 @@ void TRACE_host_pop_state (const char *host, const char *state) { container_t container = PJ_container_get(host); type_t type = PJ_type_get (state, container->type); - new_pajePopState(MSG_get_clock(), container, type); -} - -/** \ingroup TRACE_user_variables - * \brief Reset the state of a given host. - * - * Clear all previous values of a user state. - * - * \param host The name of the host to be considered. - * \param state The name of the state to be cleared. - * - * \see TRACE_host_state_declare, TRACE_host_set_state, TRACE_host_push_state, TRACE_host_pop_state - */ -void TRACE_host_reset_state (const char *host, const char *state) -{ - container_t container = PJ_container_get(host); - type_t type = PJ_type_get (state, container->type); - new_pajeResetState(MSG_get_clock(), container, type); + new PopStateEvent(MSG_get_clock(), container, type); } /** \ingroup TRACE_API @@ -1042,7 +998,7 @@ void TRACE_host_reset_state (const char *host, const char *state) * * \return A dynar with the types, must be freed with xbt_dynar_free. */ -xbt_dynar_t TRACE_get_node_types (void) +xbt_dynar_t TRACE_get_node_types () { return instr_dict_to_dynar (trivaNodeTypes); } @@ -1055,25 +1011,7 @@ xbt_dynar_t TRACE_get_node_types (void) * * \return A dynar with the types, must be freed with xbt_dynar_free. */ -xbt_dynar_t TRACE_get_edge_types (void) +xbt_dynar_t TRACE_get_edge_types () { return instr_dict_to_dynar (trivaEdgeTypes); } - -/** \ingroup TRACE_API - * \brief Pauses all tracing activities. - * \see TRACE_resume - */ -void TRACE_pause (void) -{ - instr_pause_tracing(); -} - -/** \ingroup TRACE_API - * \brief Resumes all tracing activities. - * \see TRACE_pause - */ -void TRACE_resume (void) -{ - instr_resume_tracing(); -}