//to check if variables were previously set to 0, otherwise paje won't simulate them
static std::unordered_map<std::string, std::string> platform_variables;
-//used by all methods
-static void __TRACE_surf_check_variable_set_to_zero(double now, const char* variable, std::string resource)
+static void instr_event(double now, double delta, simgrid::instr::Type* variable, container_t resource, double value)
{
- /* To trace resource utilization, we use pajeAddVariable and pajeSubVariable only.
- * The Paje simulator needs a pajeSetVariable in the first place so it knows the initial value of all variables for
- * subsequent adds/subs. If we don't do so, the first pajeAddVariable is added to a non-determined value within
- * the Paje simulator, causing analysis problems.
+ /* To trace resource utilization, we use AddVariableEvent and SubVariableEvent only. This implies to add a
+ * SetVariableEvent first to set the initial value of all variables for subsequent adds/subs. If we don't do so,
+ * the first AddVariableEvent would be added to a non-determined value, hence causing analysis problems.
*/
// create a key considering the resource and variable
- std::string key = resource + variable;
+ std::string key = resource->getName() + variable->getName();
- // check if key exists: if it doesn't, set the variable to zero and mark this in the dict
+ // check if key exists: if it doesn't, set the variable to zero and mark this in the global map.
if (platform_variables.find(key) == platform_variables.end()) {
- container_t container = simgrid::instr::Container::byName(resource);
- simgrid::instr::Type* type = container->type_->byName(variable);
- new simgrid::instr::SetVariableEvent(now, container, type, 0);
+ new simgrid::instr::SetVariableEvent(now, resource, variable, 0);
platform_variables[key] = std::string("");
}
-}
-static void instr_event(double now, double delta, simgrid::instr::Type* variable, container_t resource, double value)
-{
- __TRACE_surf_check_variable_set_to_zero(now, variable->getCname(), resource->name_);
new simgrid::instr::AddVariableEvent(now, resource, variable, value);
new simgrid::instr::SubVariableEvent(now + delta, resource, variable, value);
}
void TRACE_surf_link_set_utilization(const char *resource, const char *category, double value, double now, double delta)
{
//only trace link utilization if link is known by tracing mechanism
- if (not simgrid::instr::Container::byNameOrNull(resource))
- return;
- if (not value)
+ container_t container = simgrid::instr::Container::byNameOrNull(resource);
+ if (not container || not value)
return;
//trace uncategorized link utilization
if (TRACE_uncategorized()){
- XBT_DEBUG("UNCAT LINK [%f - %f] %s bandwidth_used %f", now, now+delta, resource, value);
- container_t container = simgrid::instr::Container::byName(resource);
+ XBT_DEBUG("UNCAT LINK [%f - %f] %s bandwidth_used %f", now, now + delta, resource, value);
simgrid::instr::Type* type = container->type_->byName("bandwidth_used");
instr_event (now, delta, type, container, value);
}
if (not category)
return;
//variable of this category starts by 'b', because we have a link here
- char category_type[INSTR_DEFAULT_STR_SIZE];
- snprintf (category_type, INSTR_DEFAULT_STR_SIZE, "b%s", category);
- XBT_DEBUG("CAT LINK [%f - %f] %s %s %f", now, now+delta, resource, category_type, value);
- container_t container = simgrid::instr::Container::byName(resource);
+ std::string category_type = std::string("b") + category;
+ XBT_DEBUG("CAT LINK [%f - %f] %s %s %f", now, now + delta, resource, category_type.c_str(), value);
simgrid::instr::Type* type = container->type_->byName(category_type);
instr_event (now, delta, type, container, value);
}
if (not category)
return;
//variable of this category starts by 'p', because we have a host here
- char category_type[INSTR_DEFAULT_STR_SIZE];
- snprintf (category_type, INSTR_DEFAULT_STR_SIZE, "p%s", category);
- XBT_DEBUG("CAT HOST [%f - %f] %s %s %f", now, now+delta, resource, category_type, value);
+ std::string category_type = std::string("p") + category;
+ XBT_DEBUG("CAT HOST [%f - %f] %s %s %f", now, now + delta, resource, category_type.c_str(), value);
simgrid::instr::Type* type = container->type_->byName(category_type);
instr_event (now, delta, type, container, value);
}