-/* Copyright (c) 2014. The SimGrid Team.
+/* Copyright (c) 2014-2015. 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 <algorithm>
+#include <utility>
+
#include "network_ib.hpp"
#include "simgrid/sg_config.h"
#include "maxmin_private.hpp"
+#include "src/surf/host_interface.hpp"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
-double Bs=0.925;
-double Be=0.965;
-double ys=1.35;
-
-
-static void IB_create_host_callback(sg_platf_host_cbarg_t t){
+static void IB_create_host_callback(simgrid::surf::Host* host){
+ using namespace simgrid::surf;
static int id=0;
// pour t->id -> rajouter une nouvelle struct dans le dict, pour stocker les comms actives
IBNode* act = new IBNode(id);
id++;
- xbt_dict_set(((NetworkIBModel*)surf_network_model)->active_nodes, t->id, act, NULL);
+ xbt_dict_set(((NetworkIBModel*)surf_network_model)->active_nodes,
+ host->getName(), act, NULL);
}
-static void IB_action_state_changed_callback(NetworkActionPtr action, e_surf_action_state_t statein, e_surf_action_state_t stateout){
+static void IB_action_state_changed_callback(
+ simgrid::surf::NetworkAction *action,
+ e_surf_action_state_t statein, e_surf_action_state_t stateout)
+{
+ using namespace simgrid::surf;
if(statein!=SURF_ACTION_RUNNING|| stateout!=SURF_ACTION_DONE)
return;
std::pair<IBNode*,IBNode*> pair = ((NetworkIBModel*)surf_network_model)->active_comms[action];
- XBT_VERB("action %p finished", action);
+ XBT_DEBUG("IB callback - action %p finished", action);
((NetworkIBModel*)surf_network_model)->updateIBfactors(action, pair.first, pair.second, 1);
}
-static void IB_action_init_callback(NetworkActionPtr action,RoutingEdgePtr src, RoutingEdgePtr dst, double size, double rate){
+static void IB_action_init_callback(
+ simgrid::surf::NetworkAction *action, simgrid::surf::RoutingEdge *src, simgrid::surf::RoutingEdge *dst,
+ double size, double rate)
+{
+ using namespace simgrid::surf;
if(((NetworkIBModel*)surf_network_model)->active_nodes==NULL)
xbt_die("IB comm added, without any node connected !");
xbt_die("could not find dst node active comms !");
// act_dst->rate=rate;
- ((NetworkIBModel*)surf_network_model)->active_comms[action]=make_pair<IBNode*,IBNode*>(act_src, act_dst);
+ ((NetworkIBModel*)surf_network_model)->active_comms[action]=std::make_pair(act_src, act_dst);
//post the action in the second dist, to retrieve in the other callback
- XBT_VERB("action %p init", action);
+ XBT_DEBUG("IB callback - action %p init", action);
((NetworkIBModel*)surf_network_model)->updateIBfactors(action, act_src, act_dst, 0);
}
-
-
/*********
* Model *
*********/
/* } */
void surf_network_model_init_IB(void)
{
+ using simgrid::surf::networkActionStateChangedCallbacks;
+ using simgrid::surf::networkCommunicateCallbacks;
if (surf_network_model)
return;
- surf_network_model = new NetworkIBModel();
+ surf_network_model = new simgrid::surf::NetworkIBModel();
net_define_callbacks();
- xbt_dynar_push(model_list, &surf_network_model);
- surf_callback_connect(networkActionStateChangedCallbacks, IB_action_state_changed_callback);
- surf_callback_connect(networkCommunicateCallbacks, IB_action_init_callback);
-
- sg_platf_host_add_cb(IB_create_host_callback);
+ xbt_dynar_push(all_existing_models, &surf_network_model);
+ networkActionStateChangedCallbacks.connect(IB_action_state_changed_callback);
+ networkCommunicateCallbacks.connect(IB_action_init_callback);
+ simgrid::surf::Host::onCreation.connect(IB_create_host_callback);
xbt_cfg_setdefault_double(_sg_cfg_set, "network/weight_S", 8775);
+
}
+namespace simgrid {
+namespace surf {
+
NetworkIBModel::NetworkIBModel()
: NetworkSmpiModel() {
m_haveGap=false;
active_nodes=NULL;
+
+ const char* IB_factors_string=sg_cfg_get_string("smpi/IB_penalty_factors");
+ xbt_dynar_t radical_elements = xbt_str_split(IB_factors_string, ";");
+
+ if(xbt_dynar_length(radical_elements)!=3)
+ surf_parse_error("smpi/IB_penalty_factors should be provided and contain 3 elements, semi-colon separated : for example 0.965;0.925;1.35");
+
+ Be = atof(xbt_dynar_get_as(radical_elements, 0, char *));
+ Bs = atof(xbt_dynar_get_as(radical_elements, 1, char *));
+ ys = atof(xbt_dynar_get_as(radical_elements, 2, char *));
+
+ xbt_dynar_free(&radical_elements);
}
NetworkIBModel::~NetworkIBModel()
my_penalty_out = num_comm_out * Bs;
}
- max_penalty_out = max(max_penalty_out,my_penalty_out);
+ max_penalty_out = std::max(max_penalty_out,my_penalty_out);
}
for (std::vector<ActiveComm*>::iterator it= root->ActiveCommsUp.begin(); it != root->ActiveCommsUp.end(); ++it) {
* Be
* (*it)->destination->ActiveCommsDown.size();//number of different nodes sending to dest
- double penalty=max(my_penalty_in,max_penalty_out);
+ double penalty = std::max(my_penalty_in,max_penalty_out);
double rate_before_update = (*it)->action->getBound();
//save initial rate of the action
penalized_bw= ! num_comm_out ? (*it)->init_rate : (*it)->init_rate /penalty;
if (!double_equals(penalized_bw, rate_before_update, sg_surf_precision)){
- // XBT_VERB("%d->%d action %p penalty updated : in %f, out %f, final %f, before %f , initial rate %f", root->id,(*it)->destination->id,(*it)->action,my_penalty_in,my_penalty_out,penalized_bw, (*it)->action->getBound(), (*it)->init_rate );
+ XBT_DEBUG("%d->%d action %p penalty updated : bw now %f, before %f , initial rate %f", root->id,(*it)->destination->id,(*it)->action,penalized_bw, (*it)->action->getBound(), (*it)->init_rate );
lmm_update_variable_bound(p_maxminSystem, (*it)->action->getVariable(), penalized_bw);
- }/*else{
- // XBT_VERB("%d->%d action %p penalty not updated : in %f, out %f, final %f, initial rate %f", root->id,(*it)->destination->id,(*it)->action,my_penalty_in,my_penalty_out,penalized_bw, (*it)->init_rate );
- }*/
+ }else{
+ XBT_DEBUG("%d->%d action %p penalty not updated : bw %f, initial rate %f", root->id,(*it)->destination->id,(*it)->action,penalized_bw, (*it)->init_rate );
+ }
}
- XBT_VERB("Finished computing");
+ XBT_DEBUG("Finished computing IB penalties");
}
void NetworkIBModel::updateIBfactors_rec(IBNode *root, bool* updatedlist) {
if(updatedlist[root->id]==0){
- XBT_VERB("Updating rec %d", root->id);
+ XBT_DEBUG("IB - Updating rec %d", root->id);
computeIBfactors(root);
updatedlist[root->id]=1;
for (std::vector<ActiveComm*>::iterator it= root->ActiveCommsUp.begin(); it != root->ActiveCommsUp.end(); ++it) {
}
-void NetworkIBModel::updateIBfactors(NetworkActionPtr action, IBNode *from, IBNode * to, int remove) {
+void NetworkIBModel::updateIBfactors(NetworkAction *action, IBNode *from, IBNode * to, int remove) {
if (from == to)//disregard local comms (should use loopback)
return;
to->nbActiveCommsDown--;
for (std::vector<ActiveComm*>::iterator it= from->ActiveCommsUp.begin();
it != from->ActiveCommsUp.end(); ++it) {
- XBT_VERB("inside vector");
if((*it)->action==action){
comm=(*it);
from->ActiveCommsUp.erase(it);
- XBT_VERB("action deleted");
break;
}
}
action->unref();
- /*from->ActiveCommsUp.erase(
- std::remove(from->ActiveCommsUp.begin(),
- from->ActiveCommsUp.end(), make_pair(to, action)),
- from->ActiveCommsUp.end());*/
}else{
- //from->ActiveCommsUp.push_back(std::make_pair(to, action));
action->ref();
-
ActiveComm* comm=new ActiveComm();
comm->action=action;
comm->destination=to;
to->ActiveCommsDown[from]+=1;
to->nbActiveCommsDown++;
}
- XBT_VERB("Updating %d", from->id);
+ XBT_DEBUG("IB - Updating %d", from->id);
updateIBfactors_rec(from, updated);
- XBT_VERB("Finished updating %d", from->id);
- if(comm)delete comm;
+ XBT_DEBUG("IB - Finished updating %d", from->id);
+ if(comm)
+ delete comm;
xbt_free(updated);
}
+
+}
+}
