e_surf_resource_state_t(*get_state) (void *cpu);
double (*get_speed) (void *cpu, double load);
double (*get_available_speed) (void *cpu);
- void (*create_resource) (char *name, double power_peak,
+ void* (*create_resource) (char *name, double power_peak,
double power_scale,
tmgr_trace_t power_trace,
int core,
double (*get_link_latency) (const void *link);
int (*link_shared) (const void *link);
void (*add_traces) (void);
- void (*create_resource) (char *name,
+ void* (*create_resource) (char *name,
double bw_initial,
tmgr_trace_t bw_trace,
double lat_initial,
double (*get_link_latency) (const void *link); /**< Return the current latency of a network link */
int (*link_shared) (const void *link);
xbt_dict_t(*get_properties) (const void *resource);
- void (*link_create_resource) (char *name,
+ void* (*link_create_resource) (char *name,
double bw_initial,
tmgr_trace_t bw_trace,
double lat_initial,
tmgr_trace_t state_trace,
e_surf_link_sharing_policy_t
policy, xbt_dict_t properties);
- void (*cpu_create_resource) (char *name, double power_peak,
+ void* (*cpu_create_resource) (char *name, double power_peak,
double power_scale,
tmgr_trace_t power_trace,
e_surf_resource_state_t state_initial,
*
* see surfxml_parse.c
* */
-XBT_PUBLIC(void) surf_host_create_resource(char *name, double power_peak,
+XBT_PUBLIC(void*) surf_host_create_resource(char *name, double power_peak,
double power_scale,
tmgr_trace_t power_trace,
int core,
*
* see surfxml_parse.c
* */
-XBT_PUBLIC(void) surf_wsL07_host_create_resource(char *name,
+XBT_PUBLIC(void*) surf_wsL07_host_create_resource(char *name,
double power_peak,
double power_scale,
tmgr_trace_t power_trace,
* create link resource
* see surfxml_parse.c
*/
-XBT_PUBLIC(void) surf_link_create_resource(char *name,
+XBT_PUBLIC(void*) surf_link_create_resource(char *name,
double bw_initial,
tmgr_trace_t bw_trace,
double lat_initial,
policy, xbt_dict_t properties);
-XBT_PUBLIC(void) surf_wsL07_link_create_resource(char *name,
+XBT_PUBLIC(void*) surf_wsL07_link_create_resource(char *name,
double bw_initial,
tmgr_trace_t bw_trace,
double lat_initial,
static xbt_swag_t cpu_running_action_set_that_does_not_need_being_checked =
NULL;
-static cpu_Cas01_t cpu_new(char *name, double power_peak,
+static void* cpu_create_resource(char *name, double power_peak,
double power_scale,
tmgr_trace_t power_trace,
int core,
state_initial = SURF_RESOURCE_OFF;
state_trace = tmgr_trace_new(A_surfxml_host_state_file);
- cpu_new(xbt_strdup(A_surfxml_host_id), power_peak, power_scale,
+ cpu_create_resource(xbt_strdup(A_surfxml_host_id), power_peak, power_scale,
power_trace, core, state_initial, state_trace, current_property_set);
current_property_set = NULL;
}
return ((cpu_Cas01_t) cpu)->power_scale;
}
-static void cpu_create_resource(char *name, double power_peak,
- double power_scale,
- tmgr_trace_t power_trace,
- int core,
- e_surf_resource_state_t state_initial,
- tmgr_trace_t state_trace,
- xbt_dict_t cpu_properties)
-{
- cpu_new(name, power_peak, power_scale, power_trace, core,
- state_initial, state_trace, cpu_properties);
-}
static void cpu_finalize(void)
{
static xbt_swag_t
cpu_im_running_action_set_that_does_not_need_being_checked = NULL;
-static cpu_Cas01_im_t cpu_im_new(char *name, double power_peak,
+static void* cpu_im_create_resource(char *name, double power_peak,
double power_scale,
tmgr_trace_t power_trace,
int core,
state_initial = SURF_RESOURCE_OFF;
state_trace = tmgr_trace_new(A_surfxml_host_state_file);
- cpu_im_new(xbt_strdup(A_surfxml_host_id), power_peak, power_scale,
+ cpu_im_create_resource(xbt_strdup(A_surfxml_host_id), power_peak, power_scale,
power_trace, core, state_initial, state_trace,
current_property_set);
current_property_set = NULL;
((surf_action_cpu_Cas01_im_t) action)->index_heap = i;
}
-static void cpu_im_create_resource(char *name, double power_peak,
- double power_scale,
- tmgr_trace_t power_trace,
- int core,
- e_surf_resource_state_t state_initial,
- tmgr_trace_t state_trace,
- xbt_dict_t cpu_properties)
-{
- cpu_im_new(name, power_peak, power_scale, power_trace, core,
- state_initial, state_trace, cpu_properties);
-}
-
static void cpu_im_finalize(void)
{
void **cpu;
}
-static cpu_ti_t cpu_ti_new(char *name, double power_peak,
+static void* cpu_ti_create_resource(char *name, double power_peak,
double power_scale,
tmgr_trace_t power_trace,
int core,
s_tmgr_event_t val;
cpu_ti_t cpu = xbt_new0(s_cpu_ti_t, 1);
s_surf_action_cpu_ti_t ti_action;
+ xbt_assert(core==1,"Multi-core not handled with this model yet");
xbt_assert(!surf_cpu_resource_by_name(name),
"Host '%s' declared several times in the platform file",
name);
state_initial = SURF_RESOURCE_OFF;
state_trace = tmgr_trace_new(A_surfxml_host_state_file);
- cpu_ti_new(xbt_strdup(A_surfxml_host_id), power_peak, power_scale,
+ cpu_ti_create_resource(xbt_strdup(A_surfxml_host_id), power_peak, power_scale,
power_trace, core, state_initial, state_trace,
current_property_set);
current_property_set = NULL;
return CPU->power_scale;
}
-static void cpu_ti_create_resource(char *name, double power_peak,
- double power_scale,
- tmgr_trace_t power_trace,
- int core,
- e_surf_resource_state_t state_initial,
- tmgr_trace_t state_trace,
- xbt_dict_t cpu_properties)
-{
- xbt_assert(core==1,"Multi-core not handled with this model yet");
- cpu_ti_new(name, power_peak, power_scale, power_trace, core,
- state_initial, state_trace, cpu_properties);
-}
-
static void cpu_ti_finalize(void)
{
void **cpu;
&constant_bandwidth_constraint;
-static link_CM02_t net_link_new(char *name,
+static void* net_create_resource(char *name,
double bw_initial,
tmgr_trace_t bw_trace,
double lat_initial,
if(policy_initial_link == SURF_LINK_FULLDUPLEX)
{
- net_link_new(bprintf("%s_UP",name_link), bw_initial, bw_trace,
+ net_create_resource(bprintf("%s_UP",name_link), bw_initial, bw_trace,
lat_initial, lat_trace, state_initial_link, state_trace,
policy_initial_link, xbt_dict_new());
- net_link_new(bprintf("%s_DOWN",name_link), bw_initial, bw_trace,
+ net_create_resource(bprintf("%s_DOWN",name_link), bw_initial, bw_trace,
lat_initial, lat_trace, state_initial_link, state_trace,
policy_initial_link, xbt_dict_new());
}
else
{
- net_link_new(name_link, bw_initial, bw_trace,
+ net_create_resource(name_link, bw_initial, bw_trace,
lat_initial, lat_trace, state_initial_link, state_trace,
policy_initial_link, xbt_dict_new());
}
}
-static void net_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)
-{
- net_link_new(name, bw_initial, bw_trace,
- lat_initial, lat_trace, state_initial, state_trace,
- policy, xbt_dict_new());
-}
-
static void net_add_traces(void)
{
xbt_dict_cursor_t cursor = NULL;
network_maxmin_system = lmm_system_new();
routing_model_create(sizeof(link_CM02_t),
- net_link_new(xbt_strdup("__loopback__"),
- 498000000, NULL, 0.000015, NULL,
- SURF_RESOURCE_ON, NULL,
- SURF_LINK_FATPIPE, NULL),
- net_get_link_latency);
+ net_create_resource(xbt_strdup("__loopback__"),
+ 498000000, NULL, 0.000015, NULL,
+ SURF_RESOURCE_ON, NULL,
+ SURF_LINK_FATPIPE, NULL),
+ net_get_link_latency);
}
&im_constant_bandwidth_constraint;
-static link_CM02_im_t im_net_link_new(char *name,
+static void* im_net_create_resource(char *name,
double bw_initial,
tmgr_trace_t bw_trace,
double lat_initial,
if(policy_initial_link == SURF_LINK_FULLDUPLEX)
{
- im_net_link_new(bprintf("%s_UP",name_link), bw_initial, bw_trace,
+ im_net_create_resource(bprintf("%s_UP",name_link), bw_initial, bw_trace,
lat_initial, lat_trace, state_initial_link, state_trace,
policy_initial_link, xbt_dict_new());
- im_net_link_new(bprintf("%s_DOWN",name_link), bw_initial, bw_trace,
+ im_net_create_resource(bprintf("%s_DOWN",name_link), bw_initial, bw_trace,
lat_initial, lat_trace, state_initial_link, state_trace,
policy_initial_link, xbt_dict_new());
}
else
{
- im_net_link_new(name_link, bw_initial, bw_trace,
+ im_net_create_resource(name_link, bw_initial, bw_trace,
lat_initial, lat_trace, state_initial_link, state_trace,
policy_initial_link, xbt_dict_new());
}
}
-static void im_net_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)
-{
- im_net_link_new(name, bw_initial, bw_trace,
- lat_initial, lat_trace, state_initial, state_trace,
- policy, xbt_dict_new());
-}
-
static void im_net_add_traces(void)
{
xbt_dict_cursor_t cursor = NULL;
xbt_heap_set_update_callback(im_net_action_heap, im_net_action_update_index_heap);
- routing_model_create(sizeof(link_CM02_im_t), im_net_link_new(xbt_strdup("__loopback__"),
- 498000000, NULL, 0.000015, NULL,
- SURF_RESOURCE_ON, NULL,
- SURF_LINK_FATPIPE, NULL),
- im_net_get_link_latency);
+ routing_model_create(sizeof(link_CM02_im_t),
+ im_net_create_resource(xbt_strdup("__loopback__"),
+ 498000000, NULL, 0.000015, NULL,
+ SURF_RESOURCE_ON, NULL,
+ SURF_LINK_FATPIPE, NULL),
+ im_net_get_link_latency);
im_net_modified_set =
xbt_swag_new(xbt_swag_offset(comm, action_list_hookup));
keep_track = im_net_modified_set;
/**
* create CPU resource via CPU Model
*/
-void surf_host_create_resource(char *name, double power_peak,
+void* surf_host_create_resource(char *name, double power_peak,
double power_scale,
tmgr_trace_t power_trace, int core,
e_surf_resource_state_t state_initial,
* create CPU resource via worsktation_ptask_L07 model
*/
-void surf_wsL07_host_create_resource(char *name, double power_peak,
+void* surf_wsL07_host_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)
{
- surf_workstation_model->extension.workstation.cpu_create_resource(name,
+ return surf_workstation_model->extension.workstation.cpu_create_resource(name,
power_peak,
power_scale,
power_trace,
/**
* create link resource via network Model
*/
-void surf_link_create_resource(char *name,
+void* surf_link_create_resource(char *name,
double bw_initial,
tmgr_trace_t bw_trace,
double lat_initial,
* create link resource via workstation_ptask_L07 model
*/
-void surf_wsL07_link_create_resource(char *name,
+void* surf_wsL07_link_create_resource(char *name,
double bw_initial,
tmgr_trace_t bw_trace,
double lat_initial,
/*** Resource Creation & Destruction **/
/**************************************/
-static cpu_L07_t ptask_cpu_new(const char *name, double power_scale,
+static void* ptask_cpu_create_resource(char *name, double power_scale,
double power_initial,
tmgr_trace_t power_trace,
e_surf_resource_state_t state_initial,
state_initial = SURF_RESOURCE_OFF;
state_trace = tmgr_trace_new(A_surfxml_host_state_file);
- ptask_cpu_new(A_surfxml_host_id, power_scale, power_initial, power_trace,
+ ptask_cpu_create_resource(A_surfxml_host_id, power_scale, power_initial, power_trace,
state_initial, state_trace, current_property_set);
current_property_set=NULL;
}
-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)
-{
- ptask_cpu_new(xbt_strdup(name), power_peak, power_scale, power_trace,
- state_initial, state_trace, cpu_properties);
-}
-
-static link_L07_t ptask_link_new(char *name,
+static void* ptask_link_create_resource(char *name,
double bw_initial,
tmgr_trace_t bw_trace,
double lat_initial,
if(policy_initial_link == SURF_LINK_FULLDUPLEX)
{
- ptask_link_new(name_link_up, bw_initial, bw_trace, lat_initial, lat_trace,
+ ptask_link_create_resource(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,
+ ptask_link_create_resource(name_link_down, bw_initial, bw_trace, lat_initial, lat_trace,
state_initial_link, state_trace, policy_initial_link,
current_property_set);
}
else
{
- ptask_link_new(name_link, bw_initial, bw_trace, lat_initial, lat_trace,
+ ptask_link_create_resource(name_link, bw_initial, bw_trace, lat_initial, lat_trace,
state_initial_link, state_trace, policy_initial_link,
current_property_set);
}
current_property_set = NULL;
}
-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, properties);
-}
-
-
static void ptask_add_traces(void)
{
xbt_dict_cursor_t cursor = NULL;
ptask_maxmin_system = lmm_system_new();
routing_model_create(sizeof(link_L07_t),
- ptask_link_new(xbt_strdup("__loopback__"),
+ ptask_link_create_resource(xbt_strdup("__loopback__"),
498000000, NULL, 0.000015, NULL,
SURF_RESOURCE_ON, NULL,
SURF_LINK_FATPIPE, NULL),