#include "xbt/module.h"
#include "mc/mc.h"
#include "surf/surf_resource.h"
+#include "xbt/xbt_os_thread.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf,
"Logging specific to SURF (kernel)");
{NULL, NULL, NULL} /* this array must be NULL terminated */
};
+s_surf_model_description_t surf_storage_model_description[] = {
+ {"default",
+ "Simplistic storage model.",
+ surf_storage_model_init_default},
+ {NULL, NULL, NULL} /* this array must be NULL terminated */
+};
+
#ifdef CONTEXT_THREADS
-static xbt_parmap_t surf_parmap; /* parallel map for share_resources */
+static xbt_parmap_t surf_parmap = NULL; /* parallel map on models */
#endif
-static int surf_nthreads; /* number of threads of the parmap (1 means no parallelism) */
+static int surf_nthreads = 1; /* number of threads of the parmap (1 means no parallelism) */
static double *surf_mins = NULL; /* return value of share_resources for each model */
static int surf_min_index; /* current index in surf_mins */
+static double min; /* duration determined by surf_solve */
static void surf_share_resources(surf_model_t model);
+static void surf_update_actions_state(surf_model_t model);
/** Displays the long description of all registered models, and quit */
void model_help(const char *category, s_surf_model_description_t * table)
return min;
}
-XBT_LOG_EXTERNAL_CATEGORY(surf_cpu);
-XBT_LOG_EXTERNAL_CATEGORY(surf_kernel);
-XBT_LOG_EXTERNAL_CATEGORY(surf_lagrange);
-XBT_LOG_EXTERNAL_CATEGORY(surf_lagrange_dichotomy);
-XBT_LOG_EXTERNAL_CATEGORY(surf_maxmin);
-XBT_LOG_EXTERNAL_CATEGORY(surf_network);
-XBT_LOG_EXTERNAL_CATEGORY(surf_trace);
-XBT_LOG_EXTERNAL_CATEGORY(surf_parse);
-XBT_LOG_EXTERNAL_CATEGORY(surf_timer);
-XBT_LOG_EXTERNAL_CATEGORY(surf_workstation);
-XBT_LOG_EXTERNAL_CATEGORY(surf_config);
-XBT_LOG_EXTERNAL_CATEGORY(surf_route);
-
-#ifdef HAVE_GTNETS
-XBT_LOG_EXTERNAL_CATEGORY(surf_network_gtnets);
-#endif
+static XBT_INLINE void routing_asr_host_free(void *p)
+{
+ network_element_t elm = p;
+ free(elm->name);
+ xbt_free(elm);
+}
void surf_init(int *argc, char **argv)
{
- XBT_DEBUG("Create all Libs");
- host_lib = xbt_lib_new();
- link_lib = xbt_lib_new();
- as_router_lib = xbt_lib_new();
-
- XBT_DEBUG("ADD ROUTING LEVEL");
- 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,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);
+ XBT_DEBUG("Create all Libs");
+ host_lib = xbt_lib_new();
+ link_lib = xbt_lib_new();
+ as_router_lib = xbt_lib_new();
+ storage_lib = xbt_lib_new();
+ storage_type_lib = xbt_lib_new();
+
+ XBT_DEBUG("ADD ROUTING LEVEL");
+ ROUTING_HOST_LEVEL = xbt_lib_add_level(host_lib,routing_asr_host_free);
+ ROUTING_ASR_LEVEL = xbt_lib_add_level(as_router_lib,routing_asr_host_free);
+ ROUTING_STORAGE_LEVEL = xbt_lib_add_level(storage_lib,xbt_free);
+ ROUTING_STORAGE_HOST_LEVEL = xbt_lib_add_level(storage_lib,routing_storage_host_free);
+ ROUTING_STORAGE_TYPE_LEVEL = xbt_lib_add_level(storage_type_lib,routing_storage_type_free);
+
+ XBT_DEBUG("ADD SURF LEVELS");
+ 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);
+ SURF_STORAGE_LEVEL = xbt_lib_add_level(storage_lib,surf_resource_free);
/* Connect our log channels: that must be done manually under windows */
+ XBT_LOG_CONNECT(surf_config, surf);
XBT_LOG_CONNECT(surf_cpu, surf);
XBT_LOG_CONNECT(surf_kernel, surf);
+
XBT_LOG_CONNECT(surf_lagrange, surf);
XBT_LOG_CONNECT(surf_lagrange_dichotomy, surf_lagrange);
+
XBT_LOG_CONNECT(surf_maxmin, surf);
XBT_LOG_CONNECT(surf_network, surf);
- XBT_LOG_CONNECT(surf_trace, surf);
- XBT_LOG_CONNECT(surf_parse, surf);
- XBT_LOG_CONNECT(surf_timer, surf);
- XBT_LOG_CONNECT(surf_workstation, surf);
- XBT_LOG_CONNECT(surf_config, surf);
- XBT_LOG_CONNECT(surf_route, surf);
-
#ifdef HAVE_GTNETS
XBT_LOG_CONNECT(surf_network_gtnets, surf);
#endif
+ XBT_LOG_CONNECT(surf_parse, surf);
+ XBT_LOG_CONNECT(surf_route, surf);
+ XBT_LOG_CONNECT(surf_trace, surf);
+ XBT_LOG_CONNECT(surf_workstation, surf);
xbt_init(argc, argv);
if (!model_list)
model_list = xbt_dynar_new(sizeof(surf_model_private_t), NULL);
if (!history)
history = tmgr_history_new();
- surf_parmap = xbt_parmap_new(4, XBT_PARMAP_DEFAULT);
surf_config_init(argc, argv);
surf_action_init();
#ifdef CONTEXT_THREADS
xbt_parmap_destroy(surf_parmap);
xbt_free(surf_mins);
+ surf_mins = NULL;
#endif
xbt_dynar_free(&surf_path);
xbt_lib_free(&host_lib);
xbt_lib_free(&link_lib);
xbt_lib_free(&as_router_lib);
-
+ xbt_lib_free(&storage_lib);
+ xbt_lib_free(&storage_type_lib);
tmgr_finalize();
surf_parse_lex_destroy();
double surf_solve(double max_date)
{
- double min = -1.0; /* duration */
+ min = -1.0; /* duration */
double next_event_date = -1.0;
double model_next_action_end = -1.0;
double value = -1.0;
}
surf_min_index = 0;
+
if (surf_get_nthreads() > 1) {
/* parallel version */
+#ifdef CONTEXT_THREADS
xbt_parmap_apply(surf_parmap, (void_f_pvoid_t) surf_share_resources, model_list);
+#endif
}
else {
/* sequential version */
NOW = NOW + min;
- xbt_dynar_foreach(model_list, iter, model)
- model->model_private->update_actions_state(NOW, min);
+ if (surf_get_nthreads() > 1) {
+ /* parallel version */
+#ifdef CONTEXT_THREADS
+ xbt_parmap_apply(surf_parmap, (void_f_pvoid_t) surf_update_actions_state, model_list);
+#endif
+ }
+ else {
+ /* sequential version */
+ xbt_dynar_foreach(model_list, iter, model) {
+ surf_update_actions_state(model);
+ }
+ }
#ifdef HAVE_TRACING
TRACE_paje_dump_buffer (0);
return NOW;
}
-static void surf_share_resources(surf_model_t model) {
-
+static void surf_share_resources(surf_model_t model)
+{
+ double next_action_end = -1.0;
+ int i = __sync_fetch_and_add(&surf_min_index, 1);
if (strcmp(model->name,"network NS3")) {
XBT_DEBUG("Running for Resource [%s]", model->name);
- double next_action_end = model->model_private->share_resources(NOW);
+ next_action_end = model->model_private->share_resources(NOW);
XBT_DEBUG("Resource [%s] : next action end = %f",
model->name, next_action_end);
- int i = __sync_fetch_and_add(&surf_min_index, 1);
- surf_mins[i] = next_action_end;
}
+ surf_mins[i] = next_action_end;
+}
+
+static void surf_update_actions_state(surf_model_t model)
+{
+ model->model_private->update_actions_state(NOW, min);
}
/**
*/
void surf_set_nthreads(int nthreads) {
- xbt_assert(nthreads > 0, "Invalid number of parallel threads: %d", nthreads);
+ if (nthreads<=0) {
+ nthreads = xbt_os_get_numcores();
+ XBT_INFO("Auto-setting surf/nthreads to %d",nthreads);
+ }
+
+#ifdef CONTEXT_THREADS
+ xbt_parmap_destroy(surf_parmap);
+ surf_parmap = NULL;
+#endif
if (nthreads > 1) {
-#ifndef CONTEXT_THREADS
+#ifdef CONTEXT_THREADS
+ surf_parmap = xbt_parmap_new(nthreads, XBT_PARMAP_DEFAULT);
+#else
THROWF(arg_error, 0, "Cannot activate parallel threads in Surf: your architecture does not support threads");
#endif
}
