xbt_dict_t cpu_properties)
{
cpu_L07_t cpu = xbt_new0(s_cpu_L07_t, 1);
- xbt_assert1(!surf_workstation_resource_by_name(name),
+ xbt_assert(!surf_workstation_resource_by_name(name),
"Host '%s' declared several times in the platform file.",
name);
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;
}
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) ||
+ xbt_assert((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)
policy, xbt_dict_t properties)
{
link_L07_t nw_link = xbt_new0(s_link_L07_t, 1);
- xbt_assert1(!xbt_lib_get_or_null(link_lib, name, SURF_LINK_LEVEL),
+ xbt_assert(!xbt_lib_get_or_null(link_lib, name, SURF_LINK_LEVEL),
"Link '%s' declared several times in the platform file.",
name);
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)
+ xbt_assert((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)
tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name);
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);
tmgr_trace_t trace = xbt_dict_get_or_null(traces_set_list, trace_name);
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);
link_L07_t link =
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);
link_L07_t link =
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);
}
link_L07_t link =
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);
}
void surf_workstation_model_init_ptask_L07(const char *filename)
{
XBT_INFO("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_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_model_init_internal();