summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
ff3ef77)
network_interface is TRACE-free \o/
bool isOff() { return not isOn(); }
double getSpeed();
bool isOff() { return not isOn(); }
double getSpeed();
+ double get_available_speed();
int getCoreCount();
std::map<std::string, std::string>* getProperties();
const char* getProperty(const char* key);
int getCoreCount();
std::map<std::string, std::string>* getProperties();
const char* getProperty(const char* key);
#include "simgrid/s4u/VirtualMachine.hpp"
#include "src/surf/cpu_interface.hpp"
#include "src/surf/network_interface.hpp"
#include "simgrid/s4u/VirtualMachine.hpp"
#include "src/surf/cpu_interface.hpp"
#include "src/surf/network_interface.hpp"
+#include "src/surf/surf_interface.hpp"
#include "src/surf/xml/platf_private.hpp"
#include "surf/surf.hpp"
#include "xbt/graph.h"
#include "src/surf/xml/platf_private.hpp"
#include "surf/surf.hpp"
#include "xbt/graph.h"
+static void instr_host_on_speed_change(simgrid::s4u::Host* host)
+{
+ simgrid::instr::Container::by_name(host->get_cname())
+ ->get_variable("power")
+ ->set_event(surf_get_clock(), host->getCoreCount() * host->get_available_speed());
+}
+
static void instr_cpu_action_on_state_change(simgrid::surf::CpuAction* action,
simgrid::kernel::resource::Action::State /* previous */)
{
static void instr_cpu_action_on_state_change(simgrid::surf::CpuAction* action,
simgrid::kernel::resource::Action::State /* previous */)
{
action->get_last_update(), SIMIX_get_clock() - action->get_last_update());
}
}
action->get_last_update(), SIMIX_get_clock() - action->get_last_update());
}
}
+static void instr_link_on_bandwidth_change(simgrid::s4u::Link& link)
+{
+ simgrid::instr::Container::by_name(link.get_cname())
+ ->get_variable("bandwidth")
+ ->set_event(surf_get_clock(), sg_bandwidth_factor * link.bandwidth());
+}
static void instr_netpoint_on_creation(simgrid::kernel::routing::NetPoint* netpoint)
{
static void instr_netpoint_on_creation(simgrid::kernel::routing::NetPoint* netpoint)
{
if (TRACE_needs_platform()) {
simgrid::s4u::on_platform_created.connect(instr_on_platform_created);
simgrid::s4u::Host::onCreation.connect(instr_host_on_creation);
if (TRACE_needs_platform()) {
simgrid::s4u::on_platform_created.connect(instr_on_platform_created);
simgrid::s4u::Host::onCreation.connect(instr_host_on_creation);
+ simgrid::s4u::Host::onSpeedChange.connect(instr_host_on_speed_change);
simgrid::s4u::Link::on_creation.connect(instr_link_on_creation);
simgrid::s4u::Link::on_creation.connect(instr_link_on_creation);
+ simgrid::s4u::Link::on_bandwidth_change.connect(instr_link_on_bandwidth_change);
}
simgrid::s4u::NetZone::onCreation.connect(instr_netzone_on_creation);
simgrid::s4u::NetZone::onSeal.connect(instr_netzone_on_seal);
}
simgrid::s4u::NetZone::onCreation.connect(instr_netzone_on_creation);
simgrid::s4u::NetZone::onSeal.connect(instr_netzone_on_seal);
{
return pimpl_cpu->getSpeed(1.0);
}
{
return pimpl_cpu->getSpeed(1.0);
}
+double Host::get_available_speed()
+{
+ return pimpl_cpu->get_available_speed();
+}
/** @brief Returns the number of core of the processor. */
int Host::getCoreCount()
/** @brief Returns the number of core of the processor. */
int Host::getCoreCount()
double sg_host_get_available_speed(sg_host_t host)
{
double sg_host_get_available_speed(sg_host_t host)
{
- return host->pimpl_cpu->get_available_speed();
+ return host->get_available_speed();
}
/** @brief Returns the number of power states for a host.
}
/** @brief Returns the number of power states for a host.
}
void Cpu::onSpeedChange() {
}
void Cpu::onSpeedChange() {
- if (TRACE_categorized() || TRACE_uncategorized() || TRACE_platform())
- instr::Container::by_name(get_cname())
- ->get_variable("power")
- ->set_event(surf_get_clock(), coresAmount_ * speed_.scale * speed_.peak);
s4u::Host::onSpeedChange(*host_);
}
s4u::Host::onSpeedChange(*host_);
}
#include "network_interface.hpp"
#include "simgrid/sg_config.hpp"
#include "network_interface.hpp"
#include "simgrid/sg_config.hpp"
-#include "src/instr/instr_private.hpp" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the surf signals
#include "src/surf/surf_interface.hpp"
#include "surf/surf.hpp"
#include "src/surf/surf_interface.hpp"
#include "surf/surf.hpp"
s4u::Link::on_state_change(this->piface_);
}
}
s4u::Link::on_state_change(this->piface_);
}
}
void LinkImpl::turn_off()
{
if (is_on()) {
void LinkImpl::turn_off()
{
if (is_on()) {
void LinkImpl::on_bandwidth_change()
{
void LinkImpl::on_bandwidth_change()
{
- if (TRACE_categorized() || TRACE_uncategorized() || TRACE_platform())
- instr::Container::by_name(get_cname())
- ->get_variable("bandwidth")
- ->set_event(surf_get_clock(), sg_bandwidth_factor * bandwidth_.scale * bandwidth_.peak);
s4u::Link::on_bandwidth_change(this->piface_);
}
s4u::Link::on_bandwidth_change(this->piface_);
}