#include "xbt/module.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf,
- "Logging specific to SURF (kernel)");
+ "Logging specific to SURF (kernel)");
int use_sdp_solver = 0;
int use_lagrange_solver = 0;
"Y:\\",
"Z:\\"
};
-#endif /* #ifdef _WIN32 */
+#endif /* #ifdef _WIN32 */
/*
* Returns the initial path. On Windows the initial path is
#endif
}
-typedef struct surf_model_object {
- surf_model_t model;
-} s_surf_model_object_t, *surf_model_object_t;
-
static double NOW = 0;
xbt_dynar_t model_list = NULL;
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"
-};
-int surf_network_model_description_size = 3
-#ifdef HAVE_GTNETS
- + 1
-#endif
-#ifdef HAVE_SDP
- + 1
-#endif
- ;
+/* Don't forget to update the option description in smx_config when you change this */
s_surf_model_description_t surf_network_model_description[] = {
+ {"Constant", NULL, surf_network_model_init_Constant},
{"CM02", NULL, surf_network_model_init_CM02},
+ {"LegrandVelho", NULL, surf_network_model_init_LegrandVelho},
#ifdef HAVE_GTNETS
{"GTNets", NULL, surf_network_model_init_GTNETS},
#endif
{"SDP", NULL, surf_network_model_init_SDP},
#endif
{"Reno", NULL, surf_network_model_init_Reno},
- {"Vegas", NULL, surf_network_model_init_Vegas}
+ {"Reno2", NULL, surf_network_model_init_Reno2},
+ {"Vegas", NULL, surf_network_model_init_Vegas},
+ {NULL, NULL, NULL} /* this array must be NULL terminated */
};
-int surf_cpu_model_description_size = 1;
s_surf_model_description_t surf_cpu_model_description[] = {
{"Cas01", NULL, surf_cpu_model_init_Cas01},
+ {NULL, NULL, NULL} /* this array must be NULL terminated */
};
-int surf_workstation_model_description_size = 4;
s_surf_model_description_t surf_workstation_model_description[] = {
- {"CLM03", NULL, surf_workstation_model_init_CLM03},
- {"KCCFLN05", NULL, surf_workstation_model_init_KCCFLN05},
- {"compound", NULL, surf_workstation_model_init_compound},
- {"ptask_L07", NULL, surf_workstation_model_init_ptask_L07}
+ {"CLM03", NULL, surf_workstation_model_init_CLM03, create_workstations},
+ {"compound", NULL, surf_workstation_model_init_compound,
+ create_workstations},
+ {"ptask_L07", NULL, surf_workstation_model_init_ptask_L07, NULL},
+ {NULL, NULL, NULL} /* this array must be NULL terminated */
};
void update_model_description(s_surf_model_description_t * table,
- int table_size,
- const char *name,
- surf_model_t model)
+ const char *name, surf_model_t model)
{
- int i = find_model_description(table, table_size, name);
+ int i = find_model_description(table, name);
table[i].model = model;
}
int find_model_description(s_surf_model_description_t * table,
- int table_size, const char *name)
+ const char *name)
{
int i;
char *name_list = NULL;
- for (i = 0; i < table_size; i++)
+ for (i = 0; table[i].name; i++)
if (!strcmp(name, table[i].name)) {
return i;
}
name_list = strdup(table[0].name);
- for (i = 1; i < table_size; i++) {
+ for (i = 1; table[i].name; i++) {
name_list =
- xbt_realloc(name_list,
- strlen(name_list) + strlen(table[i].name) + 2);
+ xbt_realloc(name_list, strlen(name_list) + strlen(table[i].name) + 2);
strcat(name_list, ", ");
strcat(name_list, table[i].name);
}
xbt_assert2(0, "Model '%s' is invalid! Valid models are: %s.", name,
- name_list);
+ name_list);
}
double generic_maxmin_share_resources(xbt_swag_t running_actions,
- size_t offset,
- lmm_system_t sys,
- void (*solve) (lmm_system_t))
+ size_t offset,
+ lmm_system_t sys,
+ void (*solve) (lmm_system_t))
{
surf_action_t action = NULL;
double min = -1;
return -1.0;
if (value > 0) {
- if(action->remains>0)
+ if (action->remains > 0)
min = action->remains / value;
- else
+ else
min = 0.0;
if ((action->max_duration >= 0) && (action->max_duration < min))
min = action->max_duration;
} else
min = action->max_duration;
- DEBUG5("Found action (%p: duration = %f, remains = %f, value = %f) ! %f",
- action, action->max_duration, action->remains, value, min);
for (action = xbt_swag_getNext(action, running_actions->offset);
- action;
- action = xbt_swag_getNext(action, running_actions->offset)) {
+ action; action = xbt_swag_getNext(action, running_actions->offset)) {
value = lmm_variable_getvalue(VARIABLE(action));
if (value > 0) {
- if(action->remains>0)
- value = action->remains / value;
- else
- value = 0.0;
+ if (action->remains > 0)
+ value = action->remains / value;
+ else
+ value = 0.0;
if (value < min) {
- min = value;
- DEBUG2("Updating min (value) with %p: %f", action, min);
+ min = value;
+ DEBUG2("Updating min (value) with %p: %f", action, min);
}
}
if ((action->max_duration >= 0) && (action->max_duration < min)) {
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;
-}
+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_parse);
+XBT_LOG_EXTERNAL_CATEGORY(surf_timer);
+XBT_LOG_EXTERNAL_CATEGORY(surf_workstation);
+XBT_LOG_EXTERNAL_CATEGORY(surf_config);
-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;
-}
+#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
void surf_init(int *argc, char **argv)
{
- int i, j;
- char *opt;
+ /* Connect our log channels: that must be done manually under windows */
+ 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_parse, surf);
+ XBT_LOG_CONNECT(surf_timer, surf);
+ XBT_LOG_CONNECT(surf_workstation, surf);
+ XBT_LOG_CONNECT(surf_config, surf);
- const char *initial_path;
+#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
xbt_init(argc, argv);
- if (!surf_path) {
-
- /* retrieves the current directory of the current process */
- initial_path = __surf_get_initial_path();
-
- xbt_assert0((initial_path),
- "__surf_get_initial_path() failed! Can't resolves current Windows directory");
-
- surf_path = xbt_dynar_new(sizeof(char *), NULL);
- xbt_dynar_push(surf_path, &initial_path);
-
- for (i = 1; i < *argc; i++) {
- if (!strncmp(argv[i], "--surf-path=", strlen("--surf-path="))) {
- opt = strchr(argv[i], '=');
- opt++;
- xbt_dynar_push(surf_path, &opt);
- /*remove this from argv */
- for (j = i + 1; j < *argc; j++) {
- argv[j - 1] = argv[j];
- }
- argv[j - 1] = NULL;
- (*argc)--;
- i--; /* compensate effect of next loop incrementation */
- }
- }
- }
if (!model_list)
model_list = xbt_dynar_new(sizeof(surf_model_private_t), NULL);
if (!history)
history = tmgr_history_new();
+
+ surf_config_init(argc, argv);
}
static char *path_name = NULL;
FILE *surf_fopen(const char *name, const char *mode)
{
- int i;
+ unsigned int iter;
char *path = NULL;
FILE *file = NULL;
- unsigned int path_name_len = 0; /* don't count '\0' */
+ 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");
+ "surf_init has to be called before using surf_fopen");
- 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 */
+ } else { /* search relative files in the path */
if (!path_name) {
path_name_len = strlen(name);
path_name = xbt_new0(char, path_name_len + 1);
}
- xbt_dynar_foreach(surf_path, i, path) {
+ 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);
+ 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;
+ return file;
}
}
return file;
void surf_exit(void)
{
- int i;
+ unsigned int iter;
surf_model_t model = NULL;
- xbt_dynar_foreach(model_list, i, model) {
- model->common_private->finalize();
+ surf_config_finalize();
+
+ xbt_dynar_foreach(model_list, iter, model) {
+ model->model_private->finalize();
}
if (maxmin_system) {
free(path_name);
path_name = NULL;
}
- NOW=0; /* Just in case the user plans to restart the simulation afterward */
+ surf_parse_free_callbacks();
+ xbt_dict_free(&route_table);
+ NOW = 0; /* Just in case the user plans to restart the simulation afterward */
xbt_exit();
}
-double surf_solve(void)
+void surf_presolve(void)
{
- static int first_run = 1;
+ double next_event_date = -1.0;
+ tmgr_trace_event_t event = NULL;
+ double value = -1.0;
+ surf_resource_t resource = NULL;
+ surf_model_t model = NULL;
+ unsigned int iter;
+ DEBUG0
+ ("First Run! Let's \"purge\" events and put models in the right state");
+ while ((next_event_date = tmgr_history_next_date(history)) != -1.0) {
+ if (next_event_date > NOW)
+ break;
+ while ((event =
+ tmgr_history_get_next_event_leq(history, next_event_date,
+ &value, (void **) &resource))) {
+ resource->model->model_private->update_resource_state(resource,
+ event, value,
+ NOW);
+ }
+ }
+ xbt_dynar_foreach(model_list, iter, model) {
+ model->model_private->update_actions_state(NOW, 0.0);
+ }
+}
+
+double surf_solve(void)
+{
double min = -1.0;
double next_event_date = -1.0;
double model_next_action_end = -1.0;
double value = -1.0;
- surf_model_object_t model_obj = NULL;
+ surf_resource_t resource = NULL;
surf_model_t model = NULL;
tmgr_trace_event_t event = NULL;
- int i;
-
- if (first_run) {
- DEBUG0
- ("First Run! Let's \"purge\" events and put models in the right state");
- while ((next_event_date = tmgr_history_next_date(history)) != -1.0) {
- if (next_event_date > NOW)
- break;
- while ((event =
- tmgr_history_get_next_event_leq(history, next_event_date,
- &value,
- (void **) &model_obj))) {
- model_obj->model->common_private->
- update_resource_state(model_obj, event, value);
- }
- }
- xbt_dynar_foreach(model_list, i, model) {
- model->common_private->update_actions_state(NOW, 0.0);
- }
- first_run = 0;
- return 0.0;
- }
+ unsigned int iter;
min = -1.0;
DEBUG0("Looking for next action end");
- xbt_dynar_foreach(model_list, i, model) {
- DEBUG1("Running for Resource [%s]", model->common_public->name);
- model_next_action_end =
- model->common_private->share_resources(NOW);
+ xbt_dynar_foreach(model_list, iter, model) {
+ 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))
+ && (model_next_action_end >= 0.0))
min = model_next_action_end;
}
DEBUG1("Next action end : %f", min);
break;
DEBUG0("Updating models");
while ((event =
- tmgr_history_get_next_event_leq(history, next_event_date,
- &value,
- (void **) &model_obj))) {
- if (model_obj->model->common_private->
- resource_used(model_obj)) {
- min = next_event_date - NOW;
- DEBUG1
- ("This event will modify model state. Next event set to %f",
- min);
+ tmgr_history_get_next_event_leq(history, next_event_date,
+ &value, (void **) &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 */
- model_obj->model->common_private->
- update_resource_state(model_obj, event, value);
+ resource->model->model_private->update_resource_state(resource,
+ event, value,
+ NOW + min);
}
}
NOW = NOW + min;
- xbt_dynar_foreach(model_list, i, 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;
