void sg_link_data_set(Link *link,void *data) {
link->setData(data);
}
- int sg_link_count(void) {
+ int sg_link_count() {
return Link::linksCount();
}
- Link** sg_link_list(void) {
+ Link** sg_link_list() {
return Link::linksList();
}
- void sg_link_exit(void) {
+ void sg_link_exit() {
Link::linksExit();
}
namespace simgrid {
namespace surf {
- boost::unordered_map<std::string,Link *> *Link::links = new boost::unordered_map<std::string,Link *>();
+ std::unordered_map<std::string,Link *> *Link::links = new std::unordered_map<std::string,Link *>();
Link *Link::byName(const char* name) {
if (links->find(name) == links->end())
return nullptr;
* 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*)> Link::onStateChange;
+ simgrid::xbt::signal<void(Link*)> Link::onCreation;
+ simgrid::xbt::signal<void(Link*)> Link::onDestruction;
+ simgrid::xbt::signal<void(Link*)> Link::onStateChange;
- simgrid::xbt::signal<void(simgrid::surf::NetworkAction*, simgrid::surf::Action::State, simgrid::surf::Action::State)> networkActionStateChangedCallbacks;
- simgrid::xbt::signal<void(simgrid::surf::NetworkAction*, simgrid::routing::NetCard *src, simgrid::routing::NetCard *dst)> Link::onCommunicate;
+ simgrid::xbt::signal<void(NetworkAction*, Action::State, Action::State)> networkActionStateChangedCallbacks;
+ simgrid::xbt::signal<void(NetworkAction*, kernel::routing::NetCard *src, kernel::routing::NetCard *dst)> Link::onCommunicate;
}
}
double NetworkModel::next_occuring_event_full(double now)
{
- NetworkAction *action = nullptr;
ActionList *runningActions = surf_network_model->getRunningActionSet();
- double minRes;
-
- minRes = shareResourcesMaxMin(runningActions, surf_network_model->maxminSystem_, surf_network_model->f_networkSolve);
+ double minRes = shareResourcesMaxMin(runningActions, surf_network_model->maxminSystem_, surf_network_model->f_networkSolve);
for(ActionList::iterator it(runningActions->begin()), itend(runningActions->end())
; it != itend ; ++it) {
- action = static_cast<NetworkAction*>(&*it);
- if (action->latency_ > 0) {
+ NetworkAction *action = static_cast<NetworkAction*>(&*it);
+ if (action->latency_ > 0)
minRes = (minRes < 0) ? action->latency_ : std::min(minRes, action->latency_);
- }
}
XBT_DEBUG("Min of share resources %f", minRes);