#define NETWORK_INTERFACE_CPP_
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_network, surf,
- "Logging specific to the SURF network module");
+ "Logging specific to the SURF network module");
/*********
* C API *
extern "C" {
-const char* sg_link_name(Link *link) {
- return link->getName();
-}
-Link * sg_link_by_name(const char* name) {
- return Link::byName(name);
-}
+ const char* sg_link_name(Link *link) {
+ return link->getName();
+ }
+ Link * sg_link_by_name(const char* name) {
+ return Link::byName(name);
+ }
-int sg_link_is_shared(Link *link){
- return link->sharingPolicy();
-}
-double sg_link_bandwidth(Link *link){
- return link->getBandwidth();
-}
-double sg_link_latency(Link *link){
- return link->getLatency();
-}
-void* sg_link_data(Link *link) {
- return link->getData();
-}
-void sg_link_data_set(Link *link,void *data) {
- link->setData(data);
-}
-int sg_link_count(void) {
- return Link::linksCount();
-}
-Link** sg_link_list(void) {
- return Link::linksList();
-}
-void sg_link_exit(void) {
- Link::linksExit();
-}
+ int sg_link_is_shared(Link *link){
+ return link->sharingPolicy();
+ }
+ double sg_link_bandwidth(Link *link){
+ return link->getBandwidth();
+ }
+ double sg_link_latency(Link *link){
+ return link->getLatency();
+ }
+ void* sg_link_data(Link *link) {
+ return link->getData();
+ }
+ void sg_link_data_set(Link *link,void *data) {
+ link->setData(data);
+ }
+ int sg_link_count(void) {
+ return Link::linksCount();
+ }
+ Link** sg_link_list(void) {
+ return Link::linksList();
+ }
+ void sg_link_exit(void) {
+ Link::linksExit();
+ }
}
*****************/
namespace simgrid {
-namespace surf {
+ namespace surf {
-boost::unordered_map<std::string,Link *> *Link::links = new boost::unordered_map<std::string,Link *>();
-Link *Link::byName(const char* name) {
- Link * res = NULL;
- try {
- res = links->at(name);
- } catch (std::out_of_range& e) {}
+ boost::unordered_map<std::string,Link *> *Link::links = new boost::unordered_map<std::string,Link *>();
+ Link *Link::byName(const char* name) {
+ Link * res = NULL;
+ try {
+ res = links->at(name);
+ } catch (std::out_of_range& e) {}
- return res;
-}
-/** @brief Returns the amount of links in the platform */
-int Link::linksCount() {
- return links->size();
-}
-/** @brief Returns a list of all existing links */
-Link **Link::linksList() {
- Link **res = xbt_new(Link*, (int)links->size());
- int i=0;
- for (auto kv : *links) {
- res[i++] = kv.second;
- }
- return res;
-}
-/** @brief destructor of the static data */
-void Link::linksExit() {
- for (auto kv : *links)
- (kv.second)->destroy();
- delete links;
-}
+ return res;
+ }
+ /** @brief Returns the amount of links in the platform */
+ int Link::linksCount() {
+ return links->size();
+ }
+ /** @brief Returns a list of all existing links */
+ Link **Link::linksList() {
+ Link **res = xbt_new(Link*, (int)links->size());
+ int i=0;
+ for (auto kv : *links) {
+ res[i++] = kv.second;
+ }
+ return res;
+ }
+ /** @brief destructor of the static data */
+ void Link::linksExit() {
+ for (auto kv : *links)
+ (kv.second)->destroy();
+ delete links;
+ }
-/*************
- * Callbacks *
- *************/
+ /*************
+ * Callbacks *
+ *************/
-simgrid::xbt::signal<void(simgrid::surf::Link*)> Link::onCreation;
-simgrid::xbt::signal<void(simgrid::surf::Link*)> Link::onDestruction;
-simgrid::xbt::signal<void(simgrid::surf::Link*, int, int)> Link::onStateChange; // signature: wasOn, currentlyOn
+ simgrid::xbt::signal<void(simgrid::surf::Link*)> Link::onCreation;
+ simgrid::xbt::signal<void(simgrid::surf::Link*)> Link::onDestruction;
+ simgrid::xbt::signal<void(simgrid::surf::Link*)> Link::onStateChange;
-simgrid::xbt::signal<void(simgrid::surf::NetworkAction*, e_surf_action_state_t, e_surf_action_state_t)> networkActionStateChangedCallbacks;
-simgrid::xbt::signal<void(simgrid::surf::NetworkAction*, simgrid::surf::NetCard *src, simgrid::surf::NetCard *dst, double size, double rate)> networkCommunicateCallbacks;
+ simgrid::xbt::signal<void(simgrid::surf::NetworkAction*, e_surf_action_state_t, e_surf_action_state_t)> networkActionStateChangedCallbacks;
+ simgrid::xbt::signal<void(simgrid::surf::NetworkAction*, simgrid::surf::NetCard *src, simgrid::surf::NetCard *dst, double size, double rate)> networkCommunicateCallbacks;
-}
+ }
}
void netlink_parse_init(sg_platf_link_cbarg_t link){
char *link_id;
link_id = bprintf("%s_UP", link->id);
surf_network_model->createLink(link_id,
- link->bandwidth,
- link->bandwidth_trace,
- link->latency,
- link->latency_trace,
- link->initiallyOn,
- link->state_trace, link->policy, link->properties);
+ link->bandwidth,
+ link->bandwidth_trace,
+ link->latency,
+ link->latency_trace,
+ link->state_trace, link->policy, link->properties);
xbt_free(link_id);
link_id = bprintf("%s_DOWN", link->id);
surf_network_model->createLink(link_id,
- link->bandwidth,
- link->bandwidth_trace,
- link->latency,
- link->latency_trace,
- link->initiallyOn,
- link->state_trace, link->policy, link->properties);
+ link->bandwidth,
+ link->bandwidth_trace,
+ link->latency,
+ link->latency_trace,
+ link->state_trace, link->policy, link->properties);
xbt_free(link_id);
} else {
- surf_network_model->createLink(link->id,
- link->bandwidth,
- link->bandwidth_trace,
- link->latency,
- link->latency_trace,
- link->initiallyOn,
- link->state_trace, link->policy, link->properties);
+ surf_network_model->createLink(link->id,
+ link->bandwidth,
+ link->bandwidth_trace,
+ link->latency,
+ link->latency_trace,
+ link->state_trace, link->policy, link->properties);
}
}
simgrid::surf::NetworkModel *surf_network_model = NULL;
namespace simgrid {
-namespace surf {
+ namespace surf {
-double NetworkModel::latencyFactor(double /*size*/) {
- return sg_latency_factor;
-}
+ double NetworkModel::latencyFactor(double /*size*/) {
+ return sg_latency_factor;
+ }
-double NetworkModel::bandwidthFactor(double /*size*/) {
- return sg_bandwidth_factor;
-}
+ double NetworkModel::bandwidthFactor(double /*size*/) {
+ return sg_bandwidth_factor;
+ }
-double NetworkModel::bandwidthConstraint(double rate, double /*bound*/, double /*size*/) {
- return rate;
-}
+ double NetworkModel::bandwidthConstraint(double rate, double /*bound*/, double /*size*/) {
+ return rate;
+ }
-double NetworkModel::shareResourcesFull(double now)
-{
- NetworkAction *action = NULL;
- ActionList *runningActions = surf_network_model->getRunningActionSet();
- double minRes;
+ double NetworkModel::next_occuring_event_full(double now)
+ {
+ NetworkAction *action = NULL;
+ ActionList *runningActions = surf_network_model->getRunningActionSet();
+ double minRes;
- minRes = shareResourcesMaxMin(runningActions, surf_network_model->p_maxminSystem, surf_network_model->f_networkSolve);
+ minRes = shareResourcesMaxMin(runningActions, surf_network_model->p_maxminSystem, surf_network_model->f_networkSolve);
- for(ActionList::iterator it(runningActions->begin()), itend(runningActions->end())
- ; it != itend ; ++it) {
- action = static_cast<NetworkAction*>(&*it);
+ for(ActionList::iterator it(runningActions->begin()), itend(runningActions->end())
+ ; it != itend ; ++it) {
+ action = static_cast<NetworkAction*>(&*it);
#ifdef HAVE_LATENCY_BOUND_TRACKING
- if (lmm_is_variable_limited_by_latency(action->getVariable())) {
- action->m_latencyLimited = 1;
- } else {
- action->m_latencyLimited = 0;
- }
+ if (lmm_is_variable_limited_by_latency(action->getVariable())) {
+ action->m_latencyLimited = 1;
+ } else {
+ action->m_latencyLimited = 0;
+ }
#endif
- if (action->m_latency > 0) {
- minRes = (minRes < 0) ? action->m_latency : std::min(minRes, action->m_latency);
+ if (action->m_latency > 0) {
+ minRes = (minRes < 0) ? action->m_latency : std::min(minRes, action->m_latency);
+ }
+ }
+
+ XBT_DEBUG("Min of share resources %f", minRes);
+
+ return minRes;
}
- }
- XBT_DEBUG("Min of share resources %f", minRes);
+ /************
+ * Resource *
+ ************/
- return minRes;
-}
+ Link::Link(simgrid::surf::NetworkModel *model, const char *name, xbt_dict_t props)
+ : Resource(model, name),
+ PropertyHolder(props)
+ {
+ links->insert({name, this});
-/************
- * Resource *
- ************/
+ m_latency.scale = 1;
+ m_bandwidth.scale = 1;
+ XBT_DEBUG("Create link '%s'",name);
+ }
-Link::Link(simgrid::surf::NetworkModel *model, const char *name, xbt_dict_t props)
-: Resource(model, name),
- PropertyHolder(props)
-{
- links->insert({name, this});
+ Link::Link(simgrid::surf::NetworkModel *model, const char *name, xbt_dict_t props,
+ lmm_constraint_t constraint,
+ tmgr_trace_t state_trace)
+ : Resource(model, name, constraint),
+ PropertyHolder(props)
+ {
+ m_latency.scale = 1;
+ m_bandwidth.scale = 1;
+ if (state_trace)
+ m_stateEvent = future_evt_set->add_trace(state_trace, 0.0, this);
- XBT_DEBUG("Create link '%s'",name);
-}
+ links->insert({name, this});
+ XBT_DEBUG("Create link '%s'",name);
-Link::Link(simgrid::surf::NetworkModel *model, const char *name, xbt_dict_t props,
- lmm_constraint_t constraint,
- tmgr_history_t history,
- tmgr_trace_t state_trace)
-: Resource(model, name, constraint),
- PropertyHolder(props)
-{
- if (state_trace)
- p_stateEvent = tmgr_history_add_trace(history, state_trace, 0.0, 0, this);
+ }
- links->insert({name, this});
- XBT_DEBUG("Create link '%s'",name);
+ /** @brief use destroy() instead of this destructor */
+ Link::~Link() {
+ xbt_assert(currentlyDestroying_, "Don't delete Links directly. Call destroy() instead.");
+ }
+ /** @brief Fire the require callbacks and destroy the object
+ *
+ * Don't delete directly an Link, call l->destroy() instead.
+ */
+ void Link::destroy()
+ {
+ if (!currentlyDestroying_) {
+ currentlyDestroying_ = true;
+ onDestruction(this);
+ delete this;
+ }
+ }
-}
+ bool Link::isUsed()
+ {
+ return lmm_constraint_used(getModel()->getMaxminSystem(), getConstraint());
+ }
-/** @brief use destroy() instead of this destructor */
-Link::~Link() {
- xbt_assert(currentlyDestroying_, "Don't delete Links directly. Call destroy() instead.");
-}
-/** @brief Fire the require callbacks and destroy the object
- *
- * Don't delete directly an Link, call l->destroy() instead.
- */
-void Link::destroy()
-{
- if (!currentlyDestroying_) {
- currentlyDestroying_ = true;
- onDestruction(this);
- delete this;
- }
-}
+ double Link::getLatency()
+ {
+ return m_latency.peak * m_latency.scale;
+ }
-bool Link::isUsed()
-{
- return lmm_constraint_used(getModel()->getMaxminSystem(), getConstraint());
-}
+ double Link::getBandwidth()
+ {
+ return m_bandwidth.peak * m_bandwidth.scale;
+ }
-double Link::getLatency()
-{
- return m_latCurrent;
-}
+ int Link::sharingPolicy()
+ {
+ return lmm_constraint_sharing_policy(getConstraint());
+ }
-double Link::getBandwidth()
-{
- return p_speed.peak * p_speed.scale;
-}
+ void Link::turnOn(){
+ if (isOff()) {
+ Resource::turnOn();
+ onStateChange(this);
+ }
+ }
+ void Link::turnOff(){
+ if (isOn()) {
+ Resource::turnOff();
+ onStateChange(this);
+ }
+ }
+ void Link::set_state_trace(tmgr_trace_t trace)
+ {
+ xbt_assert(m_stateEvent==NULL,"Cannot set a second state trace to Link %s", getName());
-int Link::sharingPolicy()
-{
- return lmm_constraint_sharing_policy(getConstraint());
-}
+ m_stateEvent = future_evt_set->add_trace(trace, 0.0, this);
+ }
+ void Link::set_bandwidth_trace(tmgr_trace_t trace)
+ {
+ xbt_assert(m_bandwidth.event==NULL,"Cannot set a second bandwidth trace to Link %s", getName());
-void Link::turnOn(){
- if (isOff()) {
- Resource::turnOn();
- onStateChange(this, 0, 1);
- }
-}
-void Link::turnOff(){
- if (isOn()) {
- Resource::turnOff();
- onStateChange(this, 1, 0);
- }
-}
+ m_bandwidth.event = future_evt_set->add_trace(trace, 0.0, this);
+ }
+ void Link::set_latency_trace(tmgr_trace_t trace)
+ {
+ xbt_assert(m_latency.event==NULL,"Cannot set a second latency trace to Link %s", getName());
-/**********
- * Action *
- **********/
+ m_latency.event = future_evt_set->add_trace(trace, 0.0, this);
+ }
-void NetworkAction::setState(e_surf_action_state_t state){
- e_surf_action_state_t old = getState();
- Action::setState(state);
- networkActionStateChangedCallbacks(this, old, state);
-}
-}
+ /**********
+ * Action *
+ **********/
+
+ void NetworkAction::setState(e_surf_action_state_t state){
+ e_surf_action_state_t old = getState();
+ Action::setState(state);
+ networkActionStateChangedCallbacks(this, old, state);
+ }
+
+ }
}
#endif /* NETWORK_INTERFACE_CPP_ */