-/* 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);
-static void IB_create_host_callback(sg_platf_host_cbarg_t t){
+static void IB_create_host_callback(simgrid::s4u::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.name().c_str(), act, NULL);
+
}
-static void IB_action_state_changed_callback(NetworkAction *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];
}
-static void IB_action_init_callback(NetworkAction *action,RoutingEdge *src, RoutingEdge *dst, double size, double rate){
+static void IB_action_init_callback(
+ simgrid::surf::NetworkAction *action, simgrid::surf::NetCard *src, simgrid::surf::NetCard *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 !");
- IBNode* act_src= (IBNode*) xbt_dict_get_or_null(((NetworkIBModel*)surf_network_model)->active_nodes, src->getName());
+ IBNode* act_src= (IBNode*) xbt_dict_get_or_null(((NetworkIBModel*)surf_network_model)->active_nodes, src->name());
if(act_src==NULL)
xbt_die("could not find src node active comms !");
//act_src->rate=rate;
- IBNode* act_dst= (IBNode*) xbt_dict_get_or_null(((NetworkIBModel*)surf_network_model)->active_nodes, dst->getName());
+ IBNode* act_dst= (IBNode*) xbt_dict_get_or_null(((NetworkIBModel*)surf_network_model)->active_nodes, dst->name());
if(act_dst==NULL)
xbt_die("could not find dst node active comms !");
// act_dst->rate=rate;
- ((NetworkIBModel*)surf_network_model)->active_comms[action]=make_pair(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_DEBUG("IB callback - action %p init", action);
}
-
-
/*********
* 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::s4u::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;
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 *));
+ Be = xbt_str_parse_double(xbt_dynar_get_as(radical_elements, 0, char *), "First part of smpi/IB_penalty_factors is not numerical: %s");
+ Bs = xbt_str_parse_double(xbt_dynar_get_as(radical_elements, 1, char *), "Second part of smpi/IB_penalty_factors is not numerical: %s");
+ ys = xbt_str_parse_double(xbt_dynar_get_as(radical_elements, 2, char *), "Third part of smpi/IB_penalty_factors is not numerical: %s");
xbt_dynar_free(&radical_elements);
}
if(num_comm_out!=1){
if((*it)->destination->nbActiveCommsDown > 2)//number of comms sent to the receiving node
- my_penalty_out = num_comm_out * Bs * ys;
+ my_penalty_out = num_comm_out * Bs * ys;
else
- my_penalty_out = num_comm_out * Bs;
+ 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) {
int nb_comms = (*it)->destination->nbActiveCommsDown;//total number of incoming comms
if(nb_comms!=1)
my_penalty_in = ((*it)->destination->ActiveCommsDown)[root] //number of comm sent to dest by root node
- * Be
- * (*it)->destination->ActiveCommsDown.size();//number of different nodes sending to dest
+ * 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
to->nbActiveCommsDown--;
for (std::vector<ActiveComm*>::iterator it= from->ActiveCommsUp.begin();
- it != from->ActiveCommsUp.end(); ++it) {
+ it != from->ActiveCommsUp.end(); ++it) {
if((*it)->action==action){
- comm=(*it);
- from->ActiveCommsUp.erase(it);
- break;
+ comm=(*it);
+ from->ActiveCommsUp.erase(it);
+ break;
}
}
action->unref();
delete comm;
xbt_free(updated);
}
+
+}
+}