#include "surf_private.h"
#include "xbt/module.h"
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_kernel, surf,
+ "Logging specific to SURF (kernel)");
+
typedef struct surf_resource_object {
surf_resource_t resource;
} s_surf_resource_object_t, *surf_resource_object_t;
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_global, surf,
- "Logging specific to the SURF global module");
-
-
static double NOW = 0;
xbt_dynar_t resource_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"
+};
double generic_maxmin_share_resources(xbt_swag_t running_actions,
size_t offset)
return -1.0;
if (value > 0) {
- min = value = action->remains / value;
+ min = action->remains / value;
if ((action->max_duration >= 0) && (action->max_duration < min))
min = action->max_duration;
} else
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)->resource_type->common_public->action_cancel(*action);
{
surf_action_state_t action_state =
&(action->resource_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)
if (action->state_set)
xbt_swag_insert(action, action->state_set);
+ XBT_OUT;
}
void surf_action_set_data(surf_action_t action,
action->data=data;
}
-/* HACKHACK: msg_global must be set to a sensible value (like NULL) to use the logging mecanisme
- * since log_default_appender use xbt_procname which, in SG, is defined in src/msg/m_process.c
- * (in RL, xbt_procname is defined in src/gras/Virtu/rl_process.c)
- */
-extern void *msg_global;
-
void surf_init(int *argc, char **argv)
{
int i,j;
char *opt;
xbt_init(argc, argv);
- msg_global=NULL; /* see HACKHACK note above */
if (!surf_path) {
const char *initial_path = "./";
surf_path = xbt_dynar_new(sizeof(char*), NULL);
return file;
}
-void surf_finalize(void)
+void surf_exit(void)
{
int i;
surf_resource_t resource = NULL;
free(path_name);
path_name = NULL;
}
+ xbt_exit();
}
double surf_solve(void)
int i;
if (first_run) {
+ DEBUG0("First Run! Let's \"purge\" events and put resources in the right state");
while ((next_event_date = tmgr_history_next_date(history)) != -1.0) {
if (next_event_date > NOW)
break;
min = -1.0;
+ DEBUG0("Looking for next action end");
xbt_dynar_foreach(resource_list, i, resource) {
resource_next_action_end =
resource->common_private->share_resources(NOW);
+ DEBUG2("Resource [%s] : next action end = %f",resource->common_public->name,
+ resource_next_action_end);
if (((min < 0.0) || (resource_next_action_end < min))
&& (resource_next_action_end >= 0.0))
min = resource_next_action_end;
}
+ DEBUG1("Next action end : %f", min);
if (min < 0.0)
return -1.0;
+ DEBUG0("Looking for next event");
while ((next_event_date = tmgr_history_next_date(history)) != -1.0) {
+ DEBUG1("Next event : %f",next_event_date);
if (next_event_date > NOW + min)
break;
+ DEBUG0("Updating resources");
while ((event =
tmgr_history_get_next_event_leq(history, next_event_date,
&value,
if (resource_obj->resource->common_private->
resource_used(resource_obj)) {
min = next_event_date - NOW;
+ DEBUG1("This event will modify resource state. Next event set to %f", min);
}
/* update state of resource_obj according to new value. Does not touch lmm.
It will be modified if needed when updating actions */
}
}
+ DEBUG1("Duration set to %f", min);
+
+ NOW = NOW + min;
xbt_dynar_foreach(resource_list, i, resource) {
resource->common_private->update_actions_state(NOW, min);
}
- NOW = NOW + min;
-
return min;
}