summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
71855c3)
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@5304
48e7efb5-ca39-0410-a469-
dd3cf9ba447f
s_surf_action_t generic_action;
double latency;
double lat_current;
s_surf_action_t generic_action;
double latency;
double lat_current;
- lmm_variable_t variable;
double rate;
int suspended;
network_card_Constant_t src;
double rate;
int suspended;
network_card_Constant_t src;
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_network);
-static lmm_system_t network_maxmin_system = NULL;
-static void (*network_solve) (lmm_system_t) = NULL;
-
static int card_number = 0;
static int host_number = 0;
static int card_number = 0;
static int host_number = 0;
action->using--;
if (!action->using) {
xbt_swag_remove(action, action->state_set);
action->using--;
if (!action->using) {
xbt_swag_remove(action, action->state_set);
- if (((surf_action_network_Constant_t) action)->variable)
- lmm_variable_free(network_maxmin_system,
- ((surf_action_network_Constant_t) action)->variable);
free(action);
return 1;
}
free(action);
return 1;
}
static void action_change_state(surf_action_t action,
e_surf_action_state_t state)
{
static void action_change_state(surf_action_t action,
e_surf_action_state_t state)
{
-/* if((state==SURF_ACTION_DONE) || (state==SURF_ACTION_FAILED)) */
-/* if(((surf_action_network_Constant_t)action)->variable) { */
-/* lmm_variable_disable(network_maxmin_system, ((surf_action_network_Constant_t)action)->variable); */
-/* ((surf_action_network_Constant_t)action)->variable = NULL; */
-/* } */
-
surf_action_change_state(action, state);
return;
}
surf_action_change_state(action, state);
return;
}
static void action_suspend(surf_action_t action)
{
((surf_action_network_Constant_t) action)->suspended = 1;
static void action_suspend(surf_action_t action)
{
((surf_action_network_Constant_t) action)->suspended = 1;
- lmm_update_variable_weight(network_maxmin_system,
- ((surf_action_network_Constant_t) action)->
- variable, 0.0);
}
static void action_resume(surf_action_t action)
{
}
static void action_resume(surf_action_t action)
{
- if (((surf_action_network_Constant_t) action)->suspended) {
- lmm_update_variable_weight(network_maxmin_system,
- ((surf_action_network_Constant_t) action)->
- variable,
- ((surf_action_network_Constant_t) action)->
- lat_current);
+ if (((surf_action_network_Constant_t) action)->suspended)
((surf_action_network_Constant_t) action)->suspended = 0;
((surf_action_network_Constant_t) action)->suspended = 0;
}
static int action_is_suspended(surf_action_t action)
}
static int action_is_suspended(surf_action_t action)
link_set = xbt_dict_new();
network_card_set = xbt_dict_new();
link_set = xbt_dict_new();
network_card_set = xbt_dict_new();
- if (!network_maxmin_system)
- network_maxmin_system = lmm_system_new();
}
void surf_network_model_init_Constant(const char *filename)
}
void surf_network_model_init_Constant(const char *filename)
surf_network_model_init_internal();
define_callbacks(filename);
xbt_dynar_push(model_list, &surf_network_model);
surf_network_model_init_internal();
define_callbacks(filename);
xbt_dynar_push(model_list, &surf_network_model);
- network_solve = lmm_solve;
update_model_description(surf_network_model_description,
surf_network_model_description_size,
update_model_description(surf_network_model_description,
surf_network_model_description_size,