-/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
#include "surf_private.h"
#include "xbt/module.h"
#include "mc/mc.h"
+#include "surf/surf_resource.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf,
"Logging specific to SURF (kernel)");
s_surf_model_description_t surf_network_model_description[] = {
{"Constant",
"Simplistic network model where all communication take a constant time (one second)",
- NULL, surf_network_model_init_Constant},
+ surf_network_model_init_Constant},
{"CM02",
"Realistic network model with lmm_solve and no correction factors",
- NULL, surf_network_model_init_CM02},
+ surf_network_model_init_CM02},
{"LV08",
- "Realistic network model with lmm_solve and these correction factors: latency*=10.4, bandwidth*=.92, S=8775",
- NULL, surf_network_model_init_LegrandVelho},
- {"LV08_im",
- "Realistic network model with IMPROVED ACTION MANAGEMENT and these correction factors: latency*=10.4, bandwidth*=.92, S=8775",
- NULL, im_surf_network_model_init_LegrandVelho},
+ "Realistic network model with lmm_solve, adequate correction factors (latency*=10.4, bandwidth*=.92, S=8775) and partial invalidation optimization",
+ im_surf_network_model_init_LegrandVelho},
+ {"LV08_fullupdate",
+ "Realistic network model wit lmm_solve, adequate correction factors (latency*=10.4, bandwidth*=.92, S=8775) but no further optimization. Should produce the same results as LV08, only slower.",
+ surf_network_model_init_LegrandVelho},
{"SMPI",
"Realistic network model with lmm_solve and correction factors on three intervals (< 1KiB, < 64 KiB, >= 64 KiB)",
- NULL, surf_network_model_init_SMPI},
+ surf_network_model_init_SMPI},
#ifdef HAVE_GTNETS
{"GTNets",
"Network Pseudo-model using the GTNets simulator instead of an analytic model",
- NULL, surf_network_model_init_GTNETS},
+ surf_network_model_init_GTNETS},
+#endif
+#ifdef HAVE_NS3
+ {"NS3",
+ "Use NS3 tcp model",
+ surf_network_model_init_NS3},
#endif
{"Reno",
- "Model using lagrange_solve instead of lmm_solve (experts only)", NULL,
+ "Model using lagrange_solve instead of lmm_solve (experts only)",
surf_network_model_init_Reno},
{"Reno2",
- "Model using lagrange_solve instead of lmm_solve (experts only)", NULL,
+ "Model using lagrange_solve instead of lmm_solve (experts only)",
surf_network_model_init_Reno2},
{"Vegas",
- "Model using lagrange_solve instead of lmm_solve (experts only)", NULL,
+ "Model using lagrange_solve instead of lmm_solve (experts only)",
surf_network_model_init_Vegas},
- {NULL, NULL, NULL, NULL} /* this array must be NULL terminated */
+ {NULL, NULL, NULL} /* this array must be NULL terminated */
};
s_surf_model_description_t surf_cpu_model_description[] = {
- {"Cas01_fullupdate", "CPU classical model time=size/power", NULL,
+ {"Cas01_fullupdate", "CPU classical model time=size/power",
surf_cpu_model_init_Cas01},
{"Cas01",
"Variation of Cas01_fullupdate with partial invalidation optimization of lmm system. Should produce the same values, only faster",
- NULL, surf_cpu_model_init_Cas01_im},
+ surf_cpu_model_init_Cas01_im},
{"CpuTI",
"Variation of Cas01 with also trace integration. Should produce the same values, only faster if you use availability traces",
- NULL, surf_cpu_model_init_ti},
- {NULL, NULL, NULL, NULL} /* this array must be NULL terminated */
+ surf_cpu_model_init_ti},
+ {NULL, NULL, NULL} /* this array must be NULL terminated */
};
s_surf_model_description_t surf_workstation_model_description[] = {
{"CLM03",
"Default workstation model, using LV08 and CM02 as network and CPU",
- NULL, surf_workstation_model_init_CLM03, create_workstations},
+ surf_workstation_model_init_CLM03},
{"compound",
"Workstation model allowing you to use other network and CPU models",
- NULL, surf_workstation_model_init_compound, create_workstations},
+ surf_workstation_model_init_compound},
{"ptask_L07", "Workstation model with better parallel task modeling",
- NULL, surf_workstation_model_init_ptask_L07, NULL},
- {NULL, NULL, NULL, NULL} /* this array must be NULL terminated */
+ surf_workstation_model_init_ptask_L07},
+ {NULL, NULL, NULL} /* this array must be NULL terminated */
};
-void update_model_description(s_surf_model_description_t * table,
- const char *name, surf_model_t model)
-{
- int i = find_model_description(table, name);
- table[i].model = model;
-}
-
/** Displays the long description of all registered models, and quit */
void model_help(const char *category, s_surf_model_description_t * table)
{
double value = -1;
#define VARIABLE(action) (*((lmm_variable_t*)(((char *) (action)) + (offset))))
- xbt_assert0(solve, "Give me a real solver function!");
solve(sys);
xbt_swag_foreach(action, running_actions) {
as_router_lib = xbt_lib_new();
XBT_DEBUG("ADD ROUTING LEVEL");
- ROUTING_HOST_LEVEL = xbt_lib_add_level(host_lib,free);
- ROUTING_ASR_LEVEL = xbt_lib_add_level(as_router_lib,free);
+ ROUTING_HOST_LEVEL = xbt_lib_add_level(host_lib,xbt_free);
+ ROUTING_ASR_LEVEL = xbt_lib_add_level(as_router_lib,xbt_free);
XBT_DEBUG("ADD SURF LEVELS");
- SURF_CPU_LEVEL = xbt_lib_add_level(host_lib,free);
- SURF_WKS_LEVEL = xbt_lib_add_level(host_lib,free);
- SURF_LINK_LEVEL = xbt_lib_add_level(link_lib,free);
-
- XBT_DEBUG("ADD COORD LEVEL");
- COORD_HOST_LEVEL = xbt_lib_add_level(host_lib,free);
- COORD_ASR_LEVEL = xbt_lib_add_level(as_router_lib,free);
+ SURF_CPU_LEVEL = xbt_lib_add_level(host_lib,surf_resource_free);
+ SURF_WKS_LEVEL = xbt_lib_add_level(host_lib,surf_resource_free);
+ SURF_LINK_LEVEL = xbt_lib_add_level(link_lib,surf_resource_free);
/* Connect our log channels: that must be done manually under windows */
XBT_LOG_CONNECT(surf_cpu, surf);
}
surf_action_exit();
- if (surf_path)
- xbt_dynar_free(&surf_path);
+ xbt_dynar_free(&surf_path);
+
+ xbt_lib_free(&host_lib);
+ xbt_lib_free(&link_lib);
+ xbt_lib_free(&as_router_lib);
+
tmgr_finalize();
surf_parse_lex_destroy();
surf_parse_free_callbacks();
+
NOW = 0; /* Just in case the user plans to restart the simulation afterward */
- // Exit the LIB host_lib
- xbt_lib_free(&host_lib);
- xbt_lib_free(&link_lib);
- xbt_lib_free(&as_router_lib);
}
void surf_presolve(void)
min = max_date - NOW;
}
- XBT_DEBUG("Looking for next action end");
+ XBT_DEBUG("Looking for next action end for all models except NS3");
xbt_dynar_foreach(model_list, iter, model) {
- XBT_DEBUG("Running for Resource [%s]", model->name);
- model_next_action_end = model->model_private->share_resources(NOW);
- XBT_DEBUG("Resource [%s] : next action end = %f",
- model->name, model_next_action_end);
- if (((min < 0.0) || (model_next_action_end < min))
- && (model_next_action_end >= 0.0))
- min = model_next_action_end;
+ if(strcmp(model->name,"network NS3") ){
+ XBT_DEBUG("Running for Resource [%s]", model->name);
+ model_next_action_end = model->model_private->share_resources(NOW);
+ XBT_DEBUG("Resource [%s] : next action end = %f",
+ model->name, model_next_action_end);
+ if (((min < 0.0) || (model_next_action_end < min))
+ && (model_next_action_end >= 0.0))
+ min = model_next_action_end;
+ }
}
- XBT_DEBUG("Next action end : %f", min);
- XBT_DEBUG("Looking for next event");
- while ((next_event_date = tmgr_history_next_date(history)) != -1.0) {
+ XBT_DEBUG("Min for resources (except NS3) : %f", min);
+
+ XBT_DEBUG("Looking for next trace event");
+
+ do {
XBT_DEBUG("Next TRACE event : %f", next_event_date);
- if ((min != -1.0) && (next_event_date > NOW + min))
- break;
+
+ next_event_date = tmgr_history_next_date(history);
+
+ if(surf_network_model->name && !strcmp(surf_network_model->name,"network NS3")){
+ if(next_event_date!=-1.0 && min!=-1.0) {
+ min = MIN(next_event_date - NOW, min);
+ } else{
+ min = MAX(next_event_date - NOW, min);
+ }
+
+ XBT_DEBUG("Run for NS3 at most %f", min);
+ // run until min or next flow
+ model_next_action_end = surf_network_model->model_private->share_resources(min);
+
+ XBT_DEBUG("Min for NS3 : %f", model_next_action_end);
+ if(model_next_action_end>=0.0)
+ min = model_next_action_end;
+ }
+
+ if (next_event_date == -1.0) break;
+
+ if ((min != -1.0) && (next_event_date > NOW + min)) break;
+
XBT_DEBUG("Updating models");
while ((event =
tmgr_history_get_next_event_leq(history, next_event_date,
event, value,
NOW + min);
}
- }
-
+ } while (1);
/* FIXME: Moved this test to here to avoid stoping simulation if there are actions running on cpus and all cpus are with availability = 0.
* This may cause an infinite loop if one cpu has a trace with periodicity = 0 and the other a trace with periodicity > 0.
