-/* Copyright (c) 2010, 2012-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2010-2017. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "src/instr/instr_private.h"
-#include "simgrid/s4u/engine.hpp"
-#include "simgrid/s4u/host.hpp"
-
+#include "simgrid/s4u/Engine.hpp"
+#include "simgrid/s4u/Host.hpp"
#include "src/kernel/routing/NetZoneImpl.hpp"
+#include "src/kernel/routing/NetPoint.hpp"
#include "src/surf/network_interface.hpp"
#include "src/surf/xml/platf_private.hpp"
#include "surf/surf.h"
//find common father
container_t father = lowestCommonAncestor (src, dst);
- if (!father){
+ if (not father) {
xbt_die ("common father unknown, this is a tracing problem");
}
snprintf (key, INSTR_DEFAULT_STR_SIZE, "%lld", counter);
counter++;
- new_pajeStartLink(SIMIX_get_clock(), father, link_type, src, "topology", key);
- new_pajeEndLink(SIMIX_get_clock(), father, link_type, dst, "topology", key);
+ new StartLinkEvent(SIMIX_get_clock(), father, link_type, src, "topology", key);
+ new EndLinkEvent(SIMIX_get_clock(), father, link_type, dst, "topology", key);
XBT_DEBUG (" linkContainers %s <-> %s", src->name, dst->name);
}
static void recursiveGraphExtraction(simgrid::s4u::NetZone* netzone, container_t container, xbt_dict_t filter)
{
- if (!TRACE_platform_topology()){
+ if (not TRACE_platform_topology()) {
XBT_DEBUG("Graph extraction disabled by user.");
return;
}
- XBT_DEBUG("Graph extraction for NetZone = %s", netzone->name());
- if (!xbt_dict_is_empty(netzone->children())) {
- xbt_dict_cursor_t cursor = nullptr;
- NetZone_t nz_son;
- char *child_name;
+ XBT_DEBUG("Graph extraction for NetZone = %s", netzone->getCname());
+ if (not netzone->getChildren()->empty()) {
//bottom-up recursion
- xbt_dict_foreach (netzone->children(), cursor, child_name, nz_son) {
- container_t child_container = static_cast<container_t>(xbt_dict_get(container->children, nz_son->name()));
+ for (auto nz_son : *netzone->getChildren()) {
+ container_t child_container = static_cast<container_t>(xbt_dict_get(container->children, nz_son->getCname()));
recursiveGraphExtraction(nz_son, child_container, filter);
}
}
/*
* Callbacks
*/
-void sg_instr_AS_begin(sg_platf_AS_cbarg_t AS)
+static void sg_instr_AS_begin(simgrid::s4u::NetZone& netzone)
{
- const char*id = AS->id;
+ const char* id = netzone.getCname();
if (PJ_container_get_root() == nullptr){
PJ_container_alloc ();
- PJ_type_alloc();
container_t root = PJ_container_new (id, INSTR_AS, nullptr);
PJ_container_set_root (root);
type_t mpi = PJ_type_get_or_null ("MPI", root->type);
if (mpi == nullptr){
mpi = PJ_type_container_new("MPI", root->type);
- if (!TRACE_smpi_is_grouped())
+ if (not TRACE_smpi_is_grouped())
PJ_type_state_new ("MPI_STATE", mpi);
PJ_type_link_new ("MPI_LINK", PJ_type_get_root(), mpi, mpi);
}
}
}
-void sg_instr_AS_end()
+static void sg_instr_AS_end(simgrid::s4u::NetZone& /*netzone*/)
{
if (TRACE_needs_platform()){
currentContainer.pop_back();
container_t container = PJ_container_new(link.name(), INSTR_LINK, father);
- if ((TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) && (! TRACE_disable_link())) {
+ if ((TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) && (not TRACE_disable_link())) {
type_t bandwidth = PJ_type_get_or_null("bandwidth", container->type);
if (bandwidth == nullptr) {
bandwidth = PJ_type_variable_new("bandwidth", nullptr, container->type);
if (latency == nullptr) {
latency = PJ_type_variable_new("latency", nullptr, container->type);
}
- new_pajeSetVariable(0, container, bandwidth, bandwidth_value);
- new_pajeSetVariable(0, container, latency, latency_value);
+ new SetVariableEvent(0, container, bandwidth, bandwidth_value);
+ new SetVariableEvent(0, container, latency, latency_value);
}
if (TRACE_uncategorized()) {
type_t bandwidth_used = PJ_type_get_or_null("bandwidth_used", container->type);
}
}
-void sg_instr_new_host(simgrid::s4u::Host& host)
+static void sg_instr_new_host(simgrid::s4u::Host& host)
{
container_t father = currentContainer.back();
- container_t container = PJ_container_new(host.cname(), INSTR_HOST, father);
+ container_t container = PJ_container_new(host.getCname(), INSTR_HOST, father);
- if ((TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) && (! TRACE_disable_speed())) {
+ if ((TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) && (not TRACE_disable_speed())) {
type_t speed = PJ_type_get_or_null ("power", container->type);
if (speed == nullptr){
speed = PJ_type_variable_new ("power", nullptr, container->type);
}
- double current_speed_state = host.getPstateSpeedCurrent();
- new_pajeSetVariable (0, container, speed, current_speed_state);
+ double current_speed_state = host.getSpeed();
+ new SetVariableEvent (0, container, speed, current_speed_state);
}
if (TRACE_uncategorized()){
type_t speed_used = PJ_type_get_or_null ("power_used", 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);
- PJ_value_new ("suspend", "1 0 1", state);
- PJ_value_new ("sleep", "1 1 0", state);
- PJ_value_new ("receive", "1 0 0", state);
- PJ_value_new ("send", "0 0 1", state);
- PJ_value_new ("task_execute", "0 1 1", state);
+ s_val PJ_value("suspend", "1 0 1", state);
+ PJ_value.PJ_value_update("sleep", "1 1 0", state);
+ PJ_value.PJ_value_update("receive", "1 0 0", state);
+ PJ_value.PJ_value_update("send", "0 0 1", state);
+ PJ_value.PJ_value_update("task_execute", "0 1 1", state);
PJ_type_link_new ("MSG_PROCESS_LINK", PJ_type_get_root(), msg_process, msg_process);
PJ_type_link_new ("MSG_PROCESS_TASK_LINK", PJ_type_get_root(), msg_process, msg_process);
}
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);
- PJ_value_new ("suspend", "1 0 1", state);
- PJ_value_new ("sleep", "1 1 0", state);
- PJ_value_new ("receive", "1 0 0", state);
- PJ_value_new ("send", "0 0 1", state);
- PJ_value_new ("task_execute", "0 1 1", state);
+ s_val PJ_value("suspend", "1 0 1", state);
+ PJ_value.PJ_value_update ("sleep", "1 1 0", state);
+ PJ_value.PJ_value_update ("receive", "1 0 0", state);
+ PJ_value.PJ_value_update ("send", "0 0 1", state);
+ PJ_value.PJ_value_update ("task_execute", "0 1 1", state);
PJ_type_link_new ("MSG_VM_LINK", PJ_type_get_root(), msg_vm, msg_vm);
PJ_type_link_new ("MSG_VM_PROCESS_LINK", PJ_type_get_root(), msg_vm, msg_vm);
}
}
-void sg_instr_new_router(const char* name)
+static void sg_instr_new_router(simgrid::kernel::routing::NetPoint * netpoint)
{
+ if (not netpoint->isRouter())
+ return;
if (TRACE_is_enabled() && TRACE_needs_platform()) {
container_t father = currentContainer.back();
- PJ_container_new(name, INSTR_ROUTER, father);
+ PJ_container_new(netpoint->cname(), INSTR_ROUTER, father);
}
}
currentContainer.clear();
xbt_dict_t filter = xbt_dict_new_homogeneous(xbt_free_f);
XBT_DEBUG ("Starting graph extraction.");
- recursiveGraphExtraction(simgrid::s4u::Engine::instance()->netRoot(), PJ_container_get_root(), filter);
+ recursiveGraphExtraction(simgrid::s4u::Engine::getInstance()->getNetRoot(), PJ_container_get_root(), filter);
XBT_DEBUG ("Graph extraction finished.");
xbt_dict_free(&filter);
platform_created = 1;
{
//always need the call backs to ASes (we need only the root AS),
//to create the rootContainer and the rootType properly
- if (!TRACE_is_enabled() || !TRACE_needs_platform())
+ if (not TRACE_is_enabled())
return;
- simgrid::s4u::Link::onCreation.connect(instr_routing_parse_start_link);
- simgrid::s4u::onPlatformCreated.connect(instr_routing_parse_end_platform);
+ if (TRACE_needs_platform()) {
+ simgrid::s4u::Link::onCreation.connect(instr_routing_parse_start_link);
+ simgrid::s4u::onPlatformCreated.connect(instr_routing_parse_end_platform);
+ simgrid::s4u::Host::onCreation.connect(sg_instr_new_host);
+ }
+ simgrid::s4u::NetZone::onCreation.connect(sg_instr_AS_begin);
+ simgrid::s4u::NetZone::onSeal.connect(sg_instr_AS_end);
+ simgrid::kernel::routing::NetPoint::onCreation.connect(&sg_instr_new_router);
}
-
/*
* user categories support
*/
static void recursiveNewVariableType (const char *new_typename, const char *color, type_t root)
{
- if (!strcmp (root->name, "HOST")){
+ if (not strcmp(root->name, "HOST")) {
char tnstr[INSTR_DEFAULT_STR_SIZE];
snprintf (tnstr, INSTR_DEFAULT_STR_SIZE, "p%s", new_typename);
PJ_type_variable_new (tnstr, color, root);
}
- if (!strcmp (root->name, "MSG_VM")){
+ if (not strcmp(root->name, "MSG_VM")) {
char tnstr[INSTR_DEFAULT_STR_SIZE];
snprintf (tnstr, INSTR_DEFAULT_STR_SIZE, "p%s", new_typename);
PJ_type_variable_new (tnstr, color, root);
}
- if (!strcmp (root->name, "LINK")){
+ if (not strcmp(root->name, "LINK")) {
char tnstr[INSTR_DEFAULT_STR_SIZE];
snprintf (tnstr, INSTR_DEFAULT_STR_SIZE, "b%s", new_typename);
PJ_type_variable_new (tnstr, color, root);
static void recursiveNewUserVariableType (const char *father_type, const char *new_typename, const char *color, type_t root)
{
- if (!strcmp (root->name, father_type)){
+ if (not strcmp(root->name, father_type)) {
PJ_type_variable_new (new_typename, color, root);
}
xbt_dict_cursor_t cursor = nullptr;
static void recursiveNewUserStateType (const char *father_type, const char *new_typename, type_t root)
{
- if (!strcmp (root->name, father_type)){
+ if (not strcmp(root->name, father_type)) {
PJ_type_state_new (new_typename, root);
}
xbt_dict_cursor_t cursor = nullptr;
static void recursiveNewValueForUserStateType (const char *type_name, const char *value, const char *color, type_t root)
{
- if (!strcmp (root->name, type_name)){
- PJ_value_new (value, color, root);
+ if (not strcmp(root->name, type_name)) {
+ s_val PJ_value (value, color, root);
}
xbt_dict_cursor_t cursor = nullptr;
type_t child_type;
#define GRAPHICATOR_SUPPORT_FUNCTIONS
-static void recursiveXBTGraphExtraction(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges, NetZone_t netzone,
+static void recursiveXBTGraphExtraction(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges, sg_netzone_t netzone,
container_t container)
{
- if (!xbt_dict_is_empty(netzone->children())) {
- xbt_dict_cursor_t cursor = nullptr;
- NetZone_t netzone_child;
- char *child_name;
+ if (not netzone->getChildren()->empty()) {
//bottom-up recursion
- xbt_dict_foreach (netzone->children(), cursor, child_name, netzone_child) {
- container_t child_container = static_cast<container_t>(xbt_dict_get(container->children, netzone_child->name()));
+ for (auto netzone_child : *netzone->getChildren()) {
+ container_t child_container =
+ static_cast<container_t>(xbt_dict_get(container->children, netzone_child->getCname()));
recursiveXBTGraphExtraction(graph, nodes, edges, netzone_child, child_container);
}
}
xbt_graph_t ret = xbt_graph_new_graph (0, nullptr);
xbt_dict_t nodes = xbt_dict_new_homogeneous(nullptr);
xbt_dict_t edges = xbt_dict_new_homogeneous(nullptr);
- recursiveXBTGraphExtraction(ret, nodes, edges, simgrid::s4u::Engine::instance()->netRoot(), PJ_container_get_root());
+ recursiveXBTGraphExtraction(ret, nodes, edges, simgrid::s4u::Engine::getInstance()->getNetRoot(),
+ PJ_container_get_root());
xbt_dict_free (&nodes);
xbt_dict_free (&edges);
return ret;
