#include "network_constant.hpp"
#include "surf/random_mgr.h"
+#include "host_interface.hpp"
+
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
static int host_number_int = 0;
-static void netcste_count_hosts(sg_platf_host_cbarg_t /*h*/) {
- host_number_int++;
-}
static void netcste_parse_nolink(sg_platf_link_cbarg_t link){
xbt_die("There is no link in the Constant network model. "
"Please remove any link from your platform (and switch to routing='None')");
void surf_network_model_init_Constant()
{
xbt_assert(surf_network_model == NULL);
- surf_network_model = new NetworkConstantModel();
+ surf_network_model = new simgrid::surf::NetworkConstantModel();
routing_model_create(NULL);
- sg_platf_host_add_cb(netcste_count_hosts);
+ simgrid::surf::Host::onCreation.connect([](simgrid::surf::Host*) {
+ host_number_int++;
+ });
sg_platf_link_add_cb(netcste_parse_nolink);
- Model *model = surf_network_model;
- xbt_dynar_push(model_list, &model);
+ simgrid::surf::Model *model = surf_network_model;
+ xbt_dynar_push(all_existing_models, &model);
}
+namespace simgrid {
+namespace surf {
+
double NetworkConstantModel::shareResources(double /*now*/)
{
NetworkConstantAction *action = NULL;
}
}
-Action *NetworkConstantModel::communicate(RoutingEdge *src, RoutingEdge *dst,
+Action *NetworkConstantModel::communicate(NetCard *src, NetCard *dst,
double size, double rate)
{
char *src_name = src->getName();
NetworkConstantAction *action = new NetworkConstantAction(this, size, sg_latency_factor);
XBT_OUT();
- surf_callback_emit(networkCommunicateCallbacks, action, src, dst, size, rate);
+ networkCommunicateCallbacks(action, src, dst, size, rate);
return action;
}
{
m_refcount--;
if (!m_refcount) {
- if (actionHook::is_linked())
+ if (action_hook.is_linked())
p_stateSet->erase(p_stateSet->iterator_to(*this));
delete this;
return 1;
return;
}
-void NetworkConstantAction::setCategory(const char * /*category*/)
-{
- //ignore completely the categories in constant model, they are not traced
}
-
-void NetworkConstantAction::suspend()
-{
- m_suspended = true;
}
-
-void NetworkConstantAction::resume()
-{
- if (m_suspended)
- m_suspended = false;
-}
-
-bool NetworkConstantAction::isSuspended()
-{
- return m_suspended;
-}
-