* 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,
static xbt_dynar_t instr_dict_to_dynar (xbt_dict_t filter)
{
- if (!TRACE_is_enabled())
- return nullptr;
- if (!TRACE_needs_platform())
+ if (!TRACE_is_enabled() || !TRACE_needs_platform())
return nullptr;
xbt_dynar_t ret = xbt_dynar_new (sizeof(char*), &xbt_free_ref);
*/
void TRACE_category_with_color (const char *category, const char *color)
{
- /* safe switch */
- if (!TRACE_is_enabled())
+ /* 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())
return;
if (!(TRACE_categorized() && category != nullptr))
return;
- /* if platform is not traced, we can't deal with categories */
- if (!TRACE_needs_platform())
- return;
-
//check if category is already created
- char *created = static_cast<char*>(xbt_dict_get_or_null(created_categories, category));
- if (created)
+ if (xbt_dict_get_or_null(created_categories, category) != nullptr)
return;
+
xbt_dict_set (created_categories, category, xbt_strdup("1"), nullptr);
//define final_color
*/
xbt_dynar_t TRACE_get_categories ()
{
- if (!TRACE_is_enabled())
- return nullptr;
- if (!TRACE_categorized())
+ if (!TRACE_is_enabled() || !TRACE_categorized())
return nullptr;
return instr_dict_to_dynar (created_categories);
*/
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())
+ /* 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())
return;
if (!mark_type)
THROWF (tracing_error, 1, "mark_type is nullptr");
//check if mark_type is already declared
- char *created = static_cast<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);
}
*/
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())
+ /* 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())
return;
if (!mark_type)
*/
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())
+ /* 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())
return;
if (!mark_type)
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())
+ /* 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())
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 (!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);
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);
+ sg_netpoint_t src_elm = sg_netpoint_by_name_or_null(src);
if(!src_elm)
xbt_die("Element '%s' not found!",src);
- sg_netcard_t dst_elm = sg_netcard_by_name_or_null(dst);
+ sg_netpoint_t dst_elm = sg_netpoint_by_name_or_null(dst);
if(!dst_elm)
xbt_die("Element '%s' not found!",dst);
- std::vector<Link*> *route = new std::vector<Link*>();
- routing_platf->getRouteAndLatency (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);
- delete 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->cname(), variable, father_type, value, what, nullptr, user_link_variables);
}
/** \ingroup TRACE_API
