#include "xbt/str.h"
#include "xbt/dict.h"
#include "surf_private.h"
+#include "surf/surf_resource.h"
+//#include "surf/surf_resource_lmm.h"
typedef enum {
SURF_WORKSTATION_RESOURCE_CPU,
}
}
lat_bound = sg_tcp_gamma / (2.0 * lat_current);
- DEBUG2("action (%p) : lat_bound = %g", action, lat_bound);
+ XBT_DEBUG("action (%p) : lat_bound = %g", action, lat_bound);
if ((action->latency == 0.0) && (action->suspended == 0)) {
if (action->rate < 0)
lmm_update_variable_bound(ptask_maxmin_system, action->variable,
free(((surf_action_workstation_L07_t) action)->workstation_list);
free(((surf_action_workstation_L07_t) action)->communication_amount);
free(((surf_action_workstation_L07_t) action)->computation_amount);
- free(action);
+ surf_action_free(&action);
return 1;
}
return 0;
static void ptask_action_suspend(surf_action_t action)
{
- XBT_IN1("(%p))", action);
+ XBT_IN("(%p))", action);
if (((surf_action_workstation_L07_t) action)->suspended != 2) {
((surf_action_workstation_L07_t) action)->suspended = 1;
lmm_update_variable_weight(ptask_maxmin_system,
((surf_action_workstation_L07_t)
action)->variable, 0.0);
}
- XBT_OUT;
+ XBT_OUT();
}
static void ptask_action_resume(surf_action_t action)
surf_action_workstation_L07_t act =
(surf_action_workstation_L07_t) action;
- XBT_IN1("(%p)", act);
+ XBT_IN("(%p)", act);
if (act->suspended != 2) {
lmm_update_variable_weight(ptask_maxmin_system, act->variable, 1.0);
act->suspended = 0;
}
- XBT_OUT;
+ XBT_OUT();
}
static int ptask_action_is_suspended(surf_action_t action)
static void ptask_action_set_max_duration(surf_action_t action,
double duration)
{ /* FIXME: should inherit */
- XBT_IN2("(%p,%g)", action, duration);
+ XBT_IN("(%p,%g)", action, duration);
action->max_duration = duration;
- XBT_OUT;
+ XBT_OUT();
}
static void ptask_action_set_priority(surf_action_t action,
double priority)
{ /* FIXME: should inherit */
- XBT_IN2("(%p,%g)", action, priority);
+ XBT_IN("(%p,%g)", action, priority);
action->priority = priority;
- XBT_OUT;
+ XBT_OUT();
}
static double ptask_action_get_remains(surf_action_t action)
{
- XBT_IN1("(%p)", action);
+ XBT_IN("(%p)", action);
return action->remains;
- XBT_OUT;
+ XBT_OUT();
}
/**************************************/
if (action->latency > 0) {
if (min < 0) {
min = action->latency;
- DEBUG3("Updating min (value) with %p (start %f): %f", action,
+ XBT_DEBUG("Updating min (value) with %p (start %f): %f", action,
action->generic_action.start, min);
} else if (action->latency < min) {
min = action->latency;
- DEBUG3("Updating min (latency) with %p (start %f): %f", action,
+ XBT_DEBUG("Updating min (latency) with %p (start %f): %f", action,
action->generic_action.start, min);
}
}
}
- DEBUG1("min value : %f", min);
+ XBT_DEBUG("min value : %f", min);
return min;
}
1.0);
}
}
- DEBUG3("Action (%p) : remains (%g) updated by %g.",
+ XBT_DEBUG("Action (%p) : remains (%g) updated by %g.",
action, action->generic_action.remains,
lmm_variable_getvalue(action->variable) * delta);
double_update(&(action->generic_action.remains),
if (action->generic_action.max_duration != NO_MAX_DURATION)
double_update(&(action->generic_action.max_duration), delta);
- DEBUG2("Action (%p) : remains (%g).",
+ XBT_DEBUG("Action (%p) : remains (%g).",
action, action->generic_action.remains);
if ((action->generic_action.remains <= 0) &&
(lmm_get_variable_weight(action->variable) > 0)) {
/* if(((link_L07_t)constraint_id)->type== */
/* SURF_WORKSTATION_RESOURCE_LINK) { */
-/* DEBUG2("Checking for link %s (%p)", */
+/* XBT_DEBUG("Checking for link %s (%p)", */
/* ((link_L07_t)constraint_id)->name, */
/* ((link_L07_t)constraint_id)); */
/* } */
/* if(((cpu_L07_t)constraint_id)->type== */
/* SURF_WORKSTATION_RESOURCE_CPU) { */
-/* DEBUG3("Checking for cpu %s (%p) : %s", */
+/* XBT_DEBUG("Checking for cpu %s (%p) : %s", */
/* ((cpu_L07_t)constraint_id)->name, */
/* ((cpu_L07_t)constraint_id), */
/* ((cpu_L07_t)constraint_id)->state_current==SURF_CPU_OFF?"Off":"On"); */
SURF_WORKSTATION_RESOURCE_CPU) &&
(((cpu_L07_t) constraint_id)->state_current ==
SURF_RESOURCE_OFF))) {
- DEBUG1("Action (%p) Failed!!", action);
+ XBT_DEBUG("Action (%p) Failed!!", action);
action->generic_action.finish = surf_get_clock();
surf_action_state_set((surf_action_t) action,
SURF_ACTION_FAILED);
link_L07_t nw_link = id;
if (nw_link->type == SURF_WORKSTATION_RESOURCE_LINK) {
- DEBUG2("Updating link %s (%p)", surf_resource_name(nw_link), nw_link);
+ XBT_DEBUG("Updating link %s (%p)", surf_resource_name(nw_link), nw_link);
if (event_type == nw_link->bw_event) {
nw_link->bw_current = value;
lmm_update_constraint_bound(ptask_maxmin_system, nw_link->constraint,
if (tmgr_trace_event_free(event_type))
nw_link->state_event = NULL;
} else {
- CRITICAL0("Unknown event ! \n");
+ XBT_CRITICAL("Unknown event ! \n");
xbt_abort();
}
return;
} else if (cpu->type == SURF_WORKSTATION_RESOURCE_CPU) {
- DEBUG3("Updating cpu %s (%p) with value %g", surf_resource_name(cpu),
+ XBT_DEBUG("Updating cpu %s (%p) with value %g", surf_resource_name(cpu),
cpu, value);
if (event_type == cpu->power_event) {
cpu->power_current = value;
if (tmgr_trace_event_free(event_type))
cpu->state_event = NULL;
} else {
- CRITICAL0("Unknown event ! \n");
+ XBT_CRITICAL("Unknown event ! \n");
xbt_abort();
}
return;
static void ptask_finalize(void)
{
- if (ptask_parallel_task_link_set != NULL)
- xbt_dict_free(&ptask_parallel_task_link_set);
+ xbt_dict_free(&ptask_parallel_task_link_set);
surf_model_exit(surf_workstation_model);
surf_workstation_model = NULL;
action =
surf_action_new(sizeof(s_surf_action_workstation_L07_t), amount,
surf_workstation_model, 0);
- DEBUG3("Creating a parallel task (%p) with %d cpus and %d links.",
+ XBT_DEBUG("Creating a parallel task (%p) with %d cpus and %d links.",
action, workstation_nb, nb_link);
action->suspended = 0; /* Should be useless because of the
calloc but it seems to help valgrind... */
{
surf_action_workstation_L07_t action = NULL;
- XBT_IN2("(%s,%g)", surf_resource_name(cpu), duration);
+ XBT_IN("(%s,%g)", surf_resource_name(cpu), duration);
action = (surf_action_workstation_L07_t) ptask_execute(cpu, 1.0);
action->generic_action.max_duration = duration;
action->suspended = 2;
lmm_update_variable_weight(ptask_maxmin_system, action->variable, 0.0);
- XBT_OUT;
+ XBT_OUT();
return (surf_action_t) action;
}
/*** Resource Creation & Destruction **/
/**************************************/
-static cpu_L07_t ptask_cpu_new(const char *name, double power_scale,
+static void* ptask_cpu_create_resource(const char *name, double power_scale,
double power_initial,
tmgr_trace_t power_trace,
e_surf_resource_state_t state_initial,
tmgr_trace_t state_trace,
xbt_dict_t cpu_properties)
{
- cpu_L07_t cpu = xbt_new0(s_cpu_L07_t, 1);
- xbt_assert1(!surf_model_resource_by_name(surf_workstation_model, name),
+ cpu_L07_t cpu = NULL;
+ xbt_assert(!surf_workstation_resource_by_name(name),
"Host '%s' declared several times in the platform file.",
name);
- cpu->generic_resource.model = surf_workstation_model;
+ cpu = (cpu_L07_t) surf_resource_new(sizeof(s_cpu_L07_t),
+ surf_workstation_model, name,cpu_properties);
+
cpu->type = SURF_WORKSTATION_RESOURCE_CPU;
- cpu->generic_resource.name = xbt_strdup(name);
- cpu->generic_resource.properties = current_property_set;
cpu->id = ptask_host_count++;
cpu->power_scale = power_scale;
- xbt_assert0(cpu->power_scale > 0, "Power has to be >0");
+ xbt_assert(cpu->power_scale > 0, "Power has to be >0");
cpu->power_current = power_initial;
if (power_trace)
lmm_constraint_new(ptask_maxmin_system, cpu,
cpu->power_current * cpu->power_scale);
- xbt_dict_set(surf_model_resource_set(surf_workstation_model), name, cpu,
- surf_resource_free);
+ xbt_lib_set(host_lib, name, SURF_WKS_LEVEL, cpu);
return cpu;
}
-static void ptask_parse_cpu_init(void)
-{
- double power_scale = 0.0;
- double power_initial = 0.0;
- tmgr_trace_t power_trace = NULL;
- e_surf_resource_state_t state_initial = SURF_RESOURCE_OFF;
- tmgr_trace_t state_trace = NULL;
-
- power_scale = get_cpu_power(A_surfxml_host_power);
- surf_parse_get_double(&power_initial, A_surfxml_host_availability);
- power_trace = tmgr_trace_new(A_surfxml_host_availability_file);
-
- xbt_assert0((A_surfxml_host_state == A_surfxml_host_state_ON) ||
- (A_surfxml_host_state == A_surfxml_host_state_OFF),
- "Invalid state");
- if (A_surfxml_host_state == A_surfxml_host_state_ON)
- state_initial = SURF_RESOURCE_ON;
- if (A_surfxml_host_state == A_surfxml_host_state_OFF)
- state_initial = SURF_RESOURCE_OFF;
- state_trace = tmgr_trace_new(A_surfxml_host_state_file);
-
- current_property_set = xbt_dict_new();
- ptask_cpu_new(A_surfxml_host_id, power_scale, power_initial, power_trace,
- state_initial, state_trace, current_property_set);
-}
-
-static void ptask_cpu_create_resource(char *name, double power_peak,
- double power_scale,
- tmgr_trace_t power_trace,
- e_surf_resource_state_t
- state_initial,
- tmgr_trace_t state_trace,
- xbt_dict_t cpu_properties)
+static void ptask_parse_cpu_init(sg_platf_host_cbarg_t host)
{
- ptask_cpu_new(xbt_strdup(name), power_peak, power_scale, power_trace,
- state_initial, state_trace, cpu_properties);
+ ptask_cpu_create_resource(
+ host->id,
+ host->power_peak,
+ host->power_scale,
+ host->power_trace,
+ host->initial_state,
+ host->state_trace,
+ host->properties);
}
-static link_L07_t ptask_link_new(char *name,
+static void* ptask_link_create_resource(const char *name,
double bw_initial,
tmgr_trace_t bw_trace,
double lat_initial,
policy, xbt_dict_t properties)
{
link_L07_t nw_link = xbt_new0(s_link_L07_t, 1);
- xbt_assert1(!xbt_dict_get_or_null
- (surf_network_model->resource_set, name),
+ xbt_assert(!xbt_lib_get_or_null(link_lib, name, SURF_LINK_LEVEL),
"Link '%s' declared several times in the platform file.",
name);
nw_link->generic_resource.model = surf_workstation_model;
nw_link->generic_resource.properties = properties;
- nw_link->generic_resource.name = name;
+ nw_link->generic_resource.name = xbt_strdup(name);
nw_link->type = SURF_WORKSTATION_RESOURCE_LINK;
nw_link->bw_current = bw_initial;
if (bw_trace)
if (policy == SURF_LINK_FATPIPE)
lmm_constraint_shared(nw_link->constraint);
- xbt_dict_set(surf_network_model->resource_set, name, nw_link,
- surf_resource_free);
-
-
+ xbt_lib_set(link_lib, name, SURF_LINK_LEVEL, nw_link);
return nw_link;
}
-static void ptask_parse_link_init(void)
-{
- double bw_initial;
- tmgr_trace_t bw_trace;
- double lat_initial;
- tmgr_trace_t lat_trace;
- e_surf_resource_state_t state_initial_link = SURF_RESOURCE_ON;
- e_surf_link_sharing_policy_t policy_initial_link = SURF_LINK_SHARED;
- tmgr_trace_t state_trace;
- char *name_link_up = NULL;
- char *name_link_down = NULL;
- char *name_link = NULL;
-
- if(A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_FULLDUPLEX)
- {
- name_link_up = xbt_strdup(bprintf("%s_UP",A_surfxml_link_id));
- name_link_down = xbt_strdup(bprintf("%s_DOWN",A_surfxml_link_id));
- }
- else
- {
- name_link = xbt_strdup(A_surfxml_link_id);
- }
- surf_parse_get_double(&bw_initial, A_surfxml_link_bandwidth);
- bw_trace = tmgr_trace_new(A_surfxml_link_bandwidth_file);
- surf_parse_get_double(&lat_initial, A_surfxml_link_latency);
- lat_trace = tmgr_trace_new(A_surfxml_link_latency_file);
-
- xbt_assert0((A_surfxml_link_state == A_surfxml_link_state_ON)
- || (A_surfxml_link_state ==
- A_surfxml_link_state_OFF), "Invalid state");
- if (A_surfxml_link_state == A_surfxml_link_state_ON)
- state_initial_link = SURF_RESOURCE_ON;
- else if (A_surfxml_link_state == A_surfxml_link_state_OFF)
- state_initial_link = SURF_RESOURCE_OFF;
-
- if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_SHARED)
- policy_initial_link = SURF_LINK_SHARED;
- if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_FATPIPE)
- policy_initial_link = SURF_LINK_FATPIPE;
- if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_FULLDUPLEX)
- policy_initial_link = SURF_LINK_FULLDUPLEX;
-
- state_trace = tmgr_trace_new(A_surfxml_link_state_file);
-
- current_property_set = xbt_dict_new();
-
- if(policy_initial_link == SURF_LINK_FULLDUPLEX)
- {
- ptask_link_new(name_link_up, bw_initial, bw_trace, lat_initial, lat_trace,
- state_initial_link, state_trace, policy_initial_link,
- current_property_set);
- ptask_link_new(name_link_down, bw_initial, bw_trace, lat_initial, lat_trace,
- state_initial_link, state_trace, policy_initial_link,
- xbt_dict_new());
- }
- else
- {
- ptask_link_new(name_link, bw_initial, bw_trace, lat_initial, lat_trace,
- state_initial_link, state_trace, policy_initial_link,
- current_property_set);
+static void ptask_parse_link_init(sg_platf_link_cbarg_t link)
+{
+ if (link->policy == SURF_LINK_FULLDUPLEX) {
+ char *link_id;
+ link_id = bprintf("%s_UP", link->id);
+ ptask_link_create_resource(link_id,
+ link->bandwidth,
+ link->bandwidth_trace,
+ link->latency,
+ link->latency_trace,
+ link->state,
+ link->state_trace,
+ link->policy,
+ link->properties);
+ xbt_free(link_id);
+ link_id = bprintf("%s_DOWN", link->id);
+ ptask_link_create_resource(bprintf("%s_DOWN", link->id),
+ link->bandwidth,
+ link->bandwidth_trace,
+ link->latency,
+ link->latency_trace,
+ link->state,
+ link->state_trace,
+ link->policy,
+ NULL); /* FIXME: We need to deep copy the
+ * properties or we won't be able to free
+ * it */
+ xbt_free(link_id);
+ } else {
+ ptask_link_create_resource(link->id,
+ link->bandwidth,
+ link->bandwidth_trace,
+ link->latency,
+ link->latency_trace,
+ link->state,
+ link->state_trace,
+ link->policy,
+ link->properties);
}
-}
-static void ptask_link_create_resource(char *name,
- double bw_initial,
- tmgr_trace_t bw_trace,
- double lat_initial,
- tmgr_trace_t lat_trace,
- e_surf_resource_state_t
- state_initial,
- tmgr_trace_t state_trace,
- e_surf_link_sharing_policy_t
- policy, xbt_dict_t properties)
-{
-
- ptask_link_new(name, bw_initial, bw_trace,
- lat_initial, lat_trace, state_initial, state_trace,
- policy, xbt_dict_new());
+ current_property_set = NULL;
}
-
static void ptask_add_traces(void)
{
xbt_dict_cursor_t cursor = NULL;
/* Connect traces relative to cpu */
xbt_dict_foreach(trace_connect_list_host_avail, cursor, trace_name, elm) {
tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name);
- cpu_L07_t host =
- surf_model_resource_by_name(surf_workstation_model, elm);
+ cpu_L07_t host = surf_workstation_resource_by_name(elm);
- xbt_assert1(host, "Host %s undefined", elm);
- xbt_assert1(trace, "Trace %s undefined", trace_name);
+ xbt_assert(host, "Host %s undefined", elm);
+ xbt_assert(trace, "Trace %s undefined", trace_name);
host->state_event =
tmgr_history_add_trace(history, trace, 0.0, 0, host);
xbt_dict_foreach(trace_connect_list_power, cursor, trace_name, elm) {
tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name);
- cpu_L07_t host =
- surf_model_resource_by_name(surf_workstation_model, elm);
+ cpu_L07_t host = surf_workstation_resource_by_name(elm);
- xbt_assert1(host, "Host %s undefined", elm);
- xbt_assert1(trace, "Trace %s undefined", trace_name);
+ xbt_assert(host, "Host %s undefined", elm);
+ xbt_assert(trace, "Trace %s undefined", trace_name);
host->power_event =
tmgr_history_add_trace(history, trace, 0.0, 0, host);
xbt_dict_foreach(trace_connect_list_link_avail, cursor, trace_name, elm) {
tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name);
link_L07_t link =
- xbt_dict_get_or_null(surf_network_model->resource_set, elm);
+ xbt_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL);
- xbt_assert1(link, "Link %s undefined", elm);
- xbt_assert1(trace, "Trace %s undefined", trace_name);
+ xbt_assert(link, "Link %s undefined", elm);
+ xbt_assert(trace, "Trace %s undefined", trace_name);
link->state_event =
tmgr_history_add_trace(history, trace, 0.0, 0, link);
xbt_dict_foreach(trace_connect_list_bandwidth, cursor, trace_name, elm) {
tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name);
link_L07_t link =
- xbt_dict_get_or_null(surf_network_model->resource_set, elm);
+ xbt_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL);
- xbt_assert1(link, "Link %s undefined", elm);
- xbt_assert1(trace, "Trace %s undefined", trace_name);
+ xbt_assert(link, "Link %s undefined", elm);
+ xbt_assert(trace, "Trace %s undefined", trace_name);
link->bw_event = tmgr_history_add_trace(history, trace, 0.0, 0, link);
}
xbt_dict_foreach(trace_connect_list_latency, cursor, trace_name, elm) {
tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name);
link_L07_t link =
- xbt_dict_get_or_null(surf_network_model->resource_set, elm);
+ xbt_lib_get_or_null(link_lib, elm, SURF_LINK_LEVEL);
- xbt_assert1(link, "Link %s undefined", elm);
- xbt_assert1(trace, "Trace %s undefined", trace_name);
+ xbt_assert(link, "Link %s undefined", elm);
+ xbt_assert(trace, "Trace %s undefined", trace_name);
link->lat_event = tmgr_history_add_trace(history, trace, 0.0, 0, link);
}
}
-static void ptask_define_callbacks(const char *file)
+static void ptask_define_callbacks()
{
- /* Adding callback functions */
- surf_parse_reset_parser();
- surfxml_add_callback(STag_surfxml_host_cb_list, &ptask_parse_cpu_init);
- surfxml_add_callback(STag_surfxml_link_cb_list, &ptask_parse_link_init);
- surfxml_add_callback(ETag_surfxml_platform_cb_list, &ptask_add_traces);
+ sg_platf_host_add_cb(ptask_parse_cpu_init);
+ sg_platf_link_add_cb(ptask_parse_link_init);
+ sg_platf_postparse_add_cb(ptask_add_traces);
}
/**************************************/
ptask_maxmin_system = lmm_system_new();
routing_model_create(sizeof(link_L07_t),
- ptask_link_new(xbt_strdup("__loopback__"),
- 498000000, NULL, 0.000015, NULL,
- SURF_RESOURCE_ON, NULL,
- SURF_LINK_FATPIPE, NULL),
- ptask_get_link_latency);
+ ptask_link_create_resource("__loopback__",
+ 498000000, NULL,
+ 0.000015, NULL,
+ SURF_RESOURCE_ON, NULL,
+ SURF_LINK_FATPIPE, NULL));
}
/**************************************/
/*************** Generic **************/
/**************************************/
-void surf_workstation_model_init_ptask_L07(const char *filename)
+void surf_workstation_model_init_ptask_L07(void)
{
- INFO0("surf_workstation_model_init_ptask_L07");
- xbt_assert0(!surf_cpu_model, "CPU model type already defined");
- xbt_assert0(!surf_network_model, "network model type already defined");
+ XBT_INFO("surf_workstation_model_init_ptask_L07");
+ xbt_assert(!surf_cpu_model, "CPU model type already defined");
+ xbt_assert(!surf_network_model, "network model type already defined");
surf_network_model = surf_model_init();
- ptask_define_callbacks(filename);
+ ptask_define_callbacks();
ptask_model_init_internal();
-
- update_model_description(surf_workstation_model_description,
- "ptask_L07", surf_workstation_model);
xbt_dynar_push(model_list, &surf_workstation_model);
}
