X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dc4066f005c4827b8169f71ea0c500b6dc311721..6199ac2d47ba1f87fe18f6018cf97a6ce3890fd3:/src/surf/network_constant.cpp diff --git a/src/surf/network_constant.cpp b/src/surf/network_constant.cpp index 6b177d6ab4..00d100a4f6 100644 --- a/src/surf/network_constant.cpp +++ b/src/surf/network_constant.cpp @@ -2,10 +2,9 @@ #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++; } @@ -17,18 +16,13 @@ void surf_network_model_init_Constant() 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); ModelPtr model = static_cast(surf_network_model); xbt_dynar_push(model_list, &model); - - routing_model_create(NULL); } -double NetworkConstantModel::shareResources(double now) +double NetworkConstantModel::shareResources(double /*now*/) { void *_action = NULL; NetworkConstantActionLmmPtr action = NULL; @@ -47,7 +41,7 @@ double NetworkConstantModel::shareResources(double now) return min; } -void NetworkConstantModel::updateActionsState(double now, double delta) +void NetworkConstantModel::updateActionsState(double /*now*/, double delta) { void *_action, *_next_action; NetworkConstantActionLmmPtr action = NULL; @@ -84,7 +78,7 @@ ActionPtr NetworkConstantModel::communicate(RoutingEdgePtr src, RoutingEdgePtr d 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; @@ -98,8 +92,8 @@ bool NetworkConstantLinkLmm::isUsed() 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; } @@ -143,7 +137,7 @@ void NetworkConstantActionLmm::cancel() } #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 }