#include "surf/random_mgr.h"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
-static random_data_t random_latency = NULL;
static int host_number_int = 0;
-static void netcste_count_hosts(sg_platf_host_cbarg_t h) {
+static void netcste_count_hosts(sg_platf_host_cbarg_t /*h*/) {
host_number_int++;
}
xbt_assert(surf_network_model == NULL);
surf_network_model = new NetworkConstantModel();
- if (!random_latency)
- random_latency = random_new(RAND, 100, 0.0, 1.0, .125, .034);
+ sg_platf_host_add_cb(netcste_count_hosts);
- //FIXME:sg_platf_host_add_cb(netcste_count_hosts);
-
- xbt_dynar_push(model_list, &surf_network_model);
-
- //FIXME:routing_model_create(NULL);
+ ModelPtr model = static_cast<ModelPtr>(surf_network_model);
+ xbt_dynar_push(model_list, &model);
}
-double NetworkConstantModel::shareResources(double now)
+double NetworkConstantModel::shareResources(double /*now*/)
{
void *_action = NULL;
NetworkConstantActionLmmPtr action = NULL;
double min = -1.0;
- xbt_swag_foreach(_action, p_runningActionSet) {
- action = (NetworkConstantActionLmmPtr) _action;
+ xbt_swag_t actionSet = getRunningActionSet();
+ xbt_swag_foreach(_action, actionSet) {
+ action = dynamic_cast<NetworkConstantActionLmmPtr>(static_cast<ActionPtr>(_action));
if (action->m_latency > 0) {
if (min < 0)
min = action->m_latency;
return min;
}
-void NetworkConstantModel::updateActionsState(double now, double delta)
+void NetworkConstantModel::updateActionsState(double /*now*/, double delta)
{
void *_action, *_next_action;
NetworkConstantActionLmmPtr action = NULL;
-
- xbt_swag_foreach_safe(_action, _next_action, p_runningActionSet) {
- action = (NetworkConstantActionLmmPtr) _action;
+ xbt_swag_t actionSet = getRunningActionSet();
+ xbt_swag_foreach_safe(_action, _next_action, actionSet) {
+ action = dynamic_cast<NetworkConstantActionLmmPtr>(static_cast<ActionPtr>(_action));
if (action->m_latency > 0) {
if (action->m_latency > delta) {
double_update(&(action->m_latency), delta);
action->m_latency = 0.0;
}
}
- double_update(&(action->m_remains),
- action->m_cost * delta / action->m_latInit);
- if (action->m_maxDuration != NO_MAX_DURATION)
- double_update(&(action->m_maxDuration), delta);
+ action->updateRemains(action->getCost() * delta / action->m_latInit);
+ if (action->getMaxDuration() != NO_MAX_DURATION)
+ action->updateMaxDuration(delta);
- if (action->m_remains <= 0) {
- action->m_finish = surf_get_clock();
+ if (action->getRemains() <= 0) {
+ action->finish();
action->setState(SURF_ACTION_DONE);
- } else if ((action->m_maxDuration != NO_MAX_DURATION)
- && (action->m_maxDuration <= 0)) {
- action->m_finish = surf_get_clock();
+ } else if ((action->getMaxDuration() != NO_MAX_DURATION)
+ && (action->getMaxDuration() <= 0)) {
+ action->finish();
action->setState(SURF_ACTION_DONE);
}
}
}
-NetworkCm02ActionLmmPtr NetworkConstantModel::communicate(RoutingEdgePtr src, RoutingEdgePtr dst,
+ActionPtr NetworkConstantModel::communicate(RoutingEdgePtr src, RoutingEdgePtr dst,
double size, double rate)
{
char *src_name = src->p_name;
char *dst_name = dst->p_name;
XBT_IN("(%s,%s,%g,%g)", src_name, dst_name, size, rate);
- NetworkConstantActionLmmPtr action = new NetworkConstantActionLmm(this, sg_latency_factor);
+ NetworkConstantActionLmmPtr action = new NetworkConstantActionLmm(this, size, sg_latency_factor);
XBT_OUT();
return action;
return 0;
}
-void NetworkConstantLinkLmm::updateState(tmgr_trace_event_t event_type,
- double value, double time)
+void NetworkConstantLinkLmm::updateState(tmgr_trace_event_t /*event_type*/,
+ double /*value*/, double /*time*/)
{
DIE_IMPOSSIBLE;
}
{
m_refcount--;
if (!m_refcount) {
- xbt_swag_remove(this, p_stateSet);
+ xbt_swag_remove(static_cast<ActionPtr>(this), p_stateSet);
delete this;
return 1;
}
}
#ifdef HAVE_TRACING
-void NetworkConstantActionLmm::setCategory(const char *category)
+void NetworkConstantActionLmm::setCategory(const char */*category*/)
{
//ignore completely the categories in constant model, they are not traced
}