#include "simgrid_config.h"
#include "src/instr/instr_private.h"
-#include "src/kernel/routing/NetCard.hpp"
+#include "src/kernel/routing/NetPoint.hpp"
#include "src/surf/network_interface.hpp"
#include "src/surf/surf_private.h"
#include "surf/surf.h"
static xbt_dynar_t instr_dict_to_dynar (xbt_dict_t filter)
{
- if (!TRACE_is_enabled() || !TRACE_needs_platform())
+ if (not TRACE_is_enabled() || not TRACE_needs_platform())
return nullptr;
xbt_dynar_t ret = xbt_dynar_new (sizeof(char*), &xbt_free_ref);
*
* \param category The name of the new tracing category to be created.
*
- * \see TRACE_category_with_color, MSG_task_set_category
+ * \see TRACE_category_with_color, MSG_task_set_category, SD_task_set_category
*/
void TRACE_category(const char *category)
{
* \param color The color of the category (see \ref outcomes_vizu to
* know how to correctly specify the color)
*
- * \see MSG_task_set_category
+ * \see MSG_task_set_category, SD_task_set_category
*/
void TRACE_category_with_color (const char *category, const char *color)
{
/* safe switches. tracing has to be activated and if platform is not traced, we can't deal with categories */
- if (!TRACE_is_enabled() || !TRACE_needs_platform())
+ if (not TRACE_is_enabled() || not TRACE_needs_platform())
return;
- if (!(TRACE_categorized() && category != nullptr))
+ if (not(TRACE_categorized() && category != nullptr))
return;
//check if category is already created
//define final_color
char final_color[INSTR_DEFAULT_STR_SIZE];
- if (!color){
+ if (not color) {
//generate a random color
- snprintf (final_color, INSTR_DEFAULT_STR_SIZE, "%f %f %f", /*red*/drand48(), /*green*/drand48(), /*blue*/drand48());
+ double red = drand48();
+ double green = drand48();
+ double blue = drand48();
+ snprintf (final_color, INSTR_DEFAULT_STR_SIZE, "%f %f %f", red, green, blue);
}else{
snprintf (final_color, INSTR_DEFAULT_STR_SIZE, "%s", color);
}
/** \ingroup TRACE_category
* \brief Get declared categories
*
- * This function should be used to get categories declared with #TRACE_category or with #TRACE_category_with_color.
+ * This function should be used to get categories that were already declared with #TRACE_category or with
+ * #TRACE_category_with_color.
*
* See \ref outcomes_vizu for details on how to trace the (categorized) resource utilization.
*
* \return A dynar with the declared categories, must be freed with xbt_dynar_free.
*
- * \see MSG_task_set_category
+ * \see MSG_task_set_category, SD_task_set_category
*/
xbt_dynar_t TRACE_get_categories ()
{
- if (!TRACE_is_enabled() || !TRACE_categorized())
+ if (not TRACE_is_enabled() || not TRACE_categorized())
return nullptr;
return instr_dict_to_dynar (created_categories);
void TRACE_declare_mark(const char *mark_type)
{
/* safe switchs. tracing has to be activated and if platform is not traced, we can't deal with marks */
- if (!TRACE_is_enabled() || !TRACE_needs_platform())
+ if (not TRACE_is_enabled() || not TRACE_needs_platform())
return;
- if (!mark_type)
+ if (not mark_type)
THROWF (tracing_error, 1, "mark_type is nullptr");
//check if mark_type is already declared
- if (xbt_dict_get_or_null(declared_marks, mark_type) != nullptr)
+ 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());
*
* 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 nullptr color is provided, the color used will be white ("1 1 1").
+ * 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 nullptr color is provided, the color used will
+ * be white ("1 1 1").
*
* \param mark_type The name of the new type.
* \param mark_value The name of the new value for this type.
void TRACE_declare_mark_value_with_color (const char *mark_type, const char *mark_value, const char *mark_color)
{
/* safe switches. tracing has to be activated and if platform is not traced, we can't deal with marks */
- if (!TRACE_is_enabled() || !TRACE_needs_platform())
+ if (not TRACE_is_enabled() || not TRACE_needs_platform())
return;
- if (!mark_type)
+ if (not mark_type)
THROWF (tracing_error, 1, "mark_type is nullptr");
- if (!mark_value)
+ 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)
+ 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);
+ value rett(mark_value, mark_color, type);
}
/** \ingroup TRACE_mark
* \brief Declare a new value for a previously declared mark type.
*
* 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.
+ * 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 nullptr color.
*
* \param mark_type The name of the new type.
* \param mark_value The name of the new value for this type.
void TRACE_mark(const char *mark_type, const char *mark_value)
{
/* safe switches. tracing has to be activated and if platform is not traced, we can't deal with marks */
- if (!TRACE_is_enabled() || !TRACE_needs_platform())
+ if (not TRACE_is_enabled() || not TRACE_needs_platform())
return;
- if (!mark_type)
+ if (not mark_type)
THROWF (tracing_error, 1, "mark_type is nullptr");
- if (!mark_value)
+ 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);
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::get(mark_value, type));
}
/** \ingroup TRACE_mark
*/
xbt_dynar_t TRACE_get_marks ()
{
- if (!TRACE_is_enabled())
+ if (not TRACE_is_enabled())
return nullptr;
return instr_dict_to_dynar (declared_marks);
double value, InstrUserVariable what, const char *color, xbt_dict_t filter)
{
/* safe switches. tracing has to be activated and if platform is not traced, we don't allow user variables */
- if (!TRACE_is_enabled() || !TRACE_needs_platform())
+ 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{
+ 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;
- } else {
+ 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);
switch (what){
case INSTR_US_SET:
- new_pajeSetVariable(time, container, type, value);
+ new SetVariableEvent(time, container, type, value);
break;
case INSTR_US_ADD:
- new_pajeAddVariable(time, container, type, value);
+ new AddVariableEvent(time, container, type, value);
break;
case INSTR_US_SUB:
- new_pajeSubVariable(time, container, type, value);
+ new SubVariableEvent(time, container, type, value);
break;
default:
THROW_IMPOSSIBLE;
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)
+ 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)
+ 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<Link*> route;
+ std::vector<simgrid::surf::LinkImpl*> route;
simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(src_elm, dst_elm, &route, nullptr);
for (auto link : route)
- instr_user_variable (time, link->getName(), variable, father_type, value, what, nullptr, user_link_variables);
+ instr_user_variable(time, link->cname(), variable, father_type, value, what, nullptr, user_link_variables);
}
/** \ingroup TRACE_API
int TRACE_platform_graph_export_graphviz (const char *filename)
{
/* returns 1 if successful, 0 otherwise */
- if (!TRACE_is_enabled())
+ if (not TRACE_is_enabled())
return 0;
xbt_graph_t g = instr_routing_platform_graph();
if (g == nullptr)
instr_user_variable(time, vm, variable, "MSG_VM", value, INSTR_US_SUB, nullptr, 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 ()
-{
- return instr_dict_to_dynar (user_vm_variables);
-}
-
/* for host variables */
/** \ingroup TRACE_user_variables
* \brief Declare a new user variable associated to hosts.
*
* \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)
+void TRACE_host_set_state(const char* host, const char* state, const char* value_str)
{
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, nullptr, type); /* if user didn't declare a value with a color, use nullptr color */
- new_pajeSetState(MSG_get_clock(), container, type, val);
+ value* val =
+ value::get_or_new(value_str, 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
*
* \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)
+void TRACE_host_push_state(const char* host, const char* state, const char* value_str)
{
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, nullptr, type); /* if user didn't declare a value with a color, use nullptr color */
- new_pajePushState(MSG_get_clock(), container, type, val);
+ value* val =
+ value::get_or_new(value_str, 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
{
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
{
return instr_dict_to_dynar (trivaEdgeTypes);
}
-
-/** \ingroup TRACE_API
- * \brief Pauses all tracing activities.
- * \see TRACE_resume
- */
-void TRACE_pause ()
-{
- instr_pause_tracing();
-}
-
-/** \ingroup TRACE_API
- * \brief Resumes all tracing activities.
- * \see TRACE_pause
- */
-void TRACE_resume ()
-{
- instr_resume_tracing();
-}
