XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf,
"Logging specific to SURF (kernel)");
-int use_sdp_solver = 0;
-int use_lagrange_solver = 0;
-
/* Additional declarations for Windows potability. */
#ifndef MAX_DRIVE
tmgr_history_t history = NULL;
lmm_system_t maxmin_system = NULL;
xbt_dynar_t surf_path = NULL;
-const char *surf_action_state_names[6] = {
- "SURF_ACTION_READY",
- "SURF_ACTION_RUNNING",
- "SURF_ACTION_FAILED",
- "SURF_ACTION_DONE",
- "SURF_ACTION_TO_FREE",
- "SURF_ACTION_NOT_IN_THE_SYSTEM"
-};
/* Don't forget to update the option description in smx_config when you change this */
s_surf_model_description_t surf_network_model_description[] = {
{"LegrandVelho", NULL, surf_network_model_init_LegrandVelho},
#ifdef HAVE_GTNETS
{"GTNets", NULL, surf_network_model_init_GTNETS},
-#endif
-#ifdef HAVE_SDP
- {"SDP", NULL, surf_network_model_init_SDP},
#endif
{"Reno", NULL, surf_network_model_init_Reno},
{"Reno2", NULL, surf_network_model_init_Reno2},
return min;
}
-e_surf_action_state_t surf_action_get_state(surf_action_t action)
-{
- surf_action_state_t action_state =
- &(action->model_type->common_public.states);
-
- if (action->state_set == action_state->ready_action_set)
- return SURF_ACTION_READY;
- if (action->state_set == action_state->running_action_set)
- return SURF_ACTION_RUNNING;
- if (action->state_set == action_state->failed_action_set)
- return SURF_ACTION_FAILED;
- if (action->state_set == action_state->done_action_set)
- return SURF_ACTION_DONE;
- return SURF_ACTION_NOT_IN_THE_SYSTEM;
-}
-
-double surf_action_get_start_time(surf_action_t action)
-{
- return action->start;
-}
-
-double surf_action_get_finish_time(surf_action_t action)
-{
- return action->finish;
-}
-
-void surf_action_free(surf_action_t * action)
-{
- (*action)->model_type->common_public.action_cancel(*action);
- free(*action);
- *action = NULL;
-}
-
-void surf_action_change_state(surf_action_t action,
- e_surf_action_state_t state)
-{
- surf_action_state_t action_state =
- &(action->model_type->common_public.states);
- XBT_IN2("(%p,%s)", action, surf_action_state_names[state]);
- xbt_swag_remove(action, action->state_set);
-
- if (state == SURF_ACTION_READY)
- action->state_set = action_state->ready_action_set;
- else if (state == SURF_ACTION_RUNNING)
- action->state_set = action_state->running_action_set;
- else if (state == SURF_ACTION_FAILED)
- action->state_set = action_state->failed_action_set;
- else if (state == SURF_ACTION_DONE)
- action->state_set = action_state->done_action_set;
- else
- action->state_set = NULL;
-
- if (action->state_set)
- xbt_swag_insert(action, action->state_set);
- XBT_OUT;
-}
-
-void surf_action_set_data(surf_action_t action, void *data)
-{
- action->data = data;
-}
XBT_LOG_EXTERNAL_CATEGORY(surf_cpu);
XBT_LOG_EXTERNAL_CATEGORY(surf_kernel);
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);
-#ifdef HAVE_SDP
-XBT_LOG_EXTERNAL_CATEGORY(surf_sdp_out);
-XBT_LOG_EXTERNAL_CATEGORY(surf_sdp);
-#endif
#ifdef HAVE_GTNETS
XBT_LOG_EXTERNAL_CATEGORY(surf_network_gtnets);
#endif
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);
-#ifdef HAVE_SDP
- XBT_LOG_CONNECT(surf_sdp_out, surf);
- XBT_LOG_CONNECT(surf_sdp, surf);
-#endif
#ifdef HAVE_GTNETS
XBT_LOG_CONNECT(surf_network_gtnets, surf);
#endif
surf_config_init(argc, argv);
}
-static char *path_name = NULL;
+#ifdef WIN32
+# define FILE_DELIM "\\"
+#else
+# define FILE_DELIM "/" /* FIXME: move to better location */
+#endif
+
FILE *surf_fopen(const char *name, const char *mode)
{
- unsigned int iter;
- char *path = NULL;
+ unsigned int cpt;
+ char *path_elm = NULL;
+ char *buff;
FILE *file = NULL;
- unsigned int path_name_len = 0; /* don't count '\0' */
-
- xbt_assert0(name, "Need a non-NULL file name");
- xbt_assert0(surf_path,
- "surf_init has to be called before using surf_fopen");
+ xbt_assert(name);
- if (__surf_is_absolute_file_path(name)) { /* don't mess with absolute file names */
+ if (__surf_is_absolute_file_path(name)) /* don't mess with absolute file names */
return fopen(name, mode);
- } else { /* search relative files in the path */
+ /* search relative files in the path */
+ xbt_dynar_foreach(surf_path, cpt, path_elm) {
+ buff = bprintf("%s" FILE_DELIM "%s", path_elm,name);
+ file = fopen(buff, mode);
+ free(buff);
- if (!path_name) {
- path_name_len = strlen(name);
- path_name = xbt_new0(char, path_name_len + 1);
- }
-
- xbt_dynar_foreach(surf_path, iter, path) {
- if (path_name_len < strlen(path) + strlen(name) + 1) {
- path_name_len = strlen(path) + strlen(name) + 1; /* plus '/' */
- path_name = xbt_realloc(path_name, path_name_len + 1);
- }
-#ifdef WIN32
- sprintf(path_name, "%s\\%s", path, name);
-#else
- sprintf(path_name, "%s/%s", path, name);
-#endif
- file = fopen(path_name, mode);
- if (file)
- return file;
- }
+ if (file)
+ return file;
}
- return file;
+ return NULL;
}
void surf_exit(void)
surf_config_finalize();
- xbt_dynar_foreach(model_list, iter, model) {
- model->common_private->finalize();
- }
+ xbt_dynar_foreach(model_list, iter, model)
+ model->model_private->finalize();
+ xbt_dynar_free(&model_list);
if (maxmin_system) {
lmm_system_free(maxmin_system);
tmgr_history_free(history);
history = NULL;
}
- if (model_list)
- xbt_dynar_free(&model_list);
if (surf_path)
xbt_dynar_free(&surf_path);
tmgr_finalize();
surf_parse_lex_destroy();
- if (path_name) {
- free(path_name);
- path_name = NULL;
- }
surf_parse_free_callbacks();
xbt_dict_free(&route_table);
NOW = 0; /* Just in case the user plans to restart the simulation afterward */
while ((event =
tmgr_history_get_next_event_leq(history, next_event_date,
&value, (void **) &resource))) {
- resource->model->common_private->update_resource_state(resource,
- event, value,
- NOW);
+ resource->model->model_private->update_resource_state(resource,
+ event, value,
+ NOW);
}
}
- xbt_dynar_foreach(model_list, iter, model) {
- model->common_private->update_actions_state(NOW, 0.0);
- }
+ xbt_dynar_foreach(model_list, iter, model)
+ model->model_private->update_actions_state(NOW, 0.0);
}
double surf_solve(void)
DEBUG0("Looking for next action end");
xbt_dynar_foreach(model_list, iter, model) {
- DEBUG1("Running for Resource [%s]", model->common_public.name);
- model_next_action_end = model->common_private->share_resources(NOW);
+ DEBUG1("Running for Resource [%s]", model->name);
+ model_next_action_end = model->model_private->share_resources(NOW);
DEBUG2("Resource [%s] : next action end = %f",
- model->common_public.name, model_next_action_end);
+ 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;
while ((event =
tmgr_history_get_next_event_leq(history, next_event_date,
&value, (void **) &resource))) {
- if (resource->model->common_private->resource_used(resource)) {
+ if (resource->model->model_private->resource_used(resource)) {
min = next_event_date - NOW;
DEBUG1
("This event will modify model state. Next event set to %f", min);
}
/* update state of model_obj according to new value. Does not touch lmm.
It will be modified if needed when updating actions */
- resource->model->common_private->update_resource_state(resource,
- event, value,
- NOW + min);
+ resource->model->model_private->update_resource_state(resource,
+ event, value,
+ NOW + min);
}
}
NOW = NOW + min;
- xbt_dynar_foreach(model_list, iter, model) {
- model->common_private->update_actions_state(NOW, min);
- }
+ xbt_dynar_foreach(model_list, iter, model)
+ model->model_private->update_actions_state(NOW, min);
return min;
}
