static void parse_process_init(void)
{
parse_host = xbt_strdup(A_surfxml_process_host);
- xbt_assert1(SIMIX_host_get_by_name(parse_host),
+ xbt_assert(SIMIX_host_get_by_name(parse_host),
"Host '%s' unknown", parse_host);
parse_code = SIMIX_get_registered_function(A_surfxml_process_function);
- xbt_assert1(parse_code, "Function '%s' unknown",
+ xbt_assert(parse_code, "Function '%s' unknown",
A_surfxml_process_function);
parse_argc = 0;
parse_argv = NULL;
parse_argv[(parse_argc) - 1] = xbt_strdup(A_surfxml_process_function);
surf_parse_get_double(&start_time, A_surfxml_process_start_time);
surf_parse_get_double(&kill_time, A_surfxml_process_kill_time);
-
- current_property_set = xbt_dict_new();
}
static void parse_argument(void)
}
xbt_free(parse_host);
}
+ current_property_set = NULL;
}
/**
void SIMIX_launch_application(const char *file)
{
int parse_status;
- xbt_assert0(simix_global,
+ xbt_assert(simix_global,
"SIMIX_global_init has to be called before SIMIX_launch_application.");
// Reset callbacks
surfxml_add_callback(STag_surfxml_process_cb_list, parse_process_init);
surfxml_add_callback(ETag_surfxml_argument_cb_list, parse_argument);
- surfxml_add_callback(STag_surfxml_prop_cb_list, parse_properties);
+ surfxml_add_callback(STag_surfxml_prop_cb_list, parse_properties_XML);
surfxml_add_callback(ETag_surfxml_process_cb_list,
parse_process_finalize);
surf_parse_open(file);
parse_status = surf_parse();
surf_parse_close();
- xbt_assert1(!parse_status, "Parse error in %s", file);
+ xbt_assert(!parse_status, "Parse error in %s", file);
}
/**
XBT_INLINE void SIMIX_function_register(const char *name,
xbt_main_func_t code)
{
- xbt_assert0(simix_global,
+ xbt_assert(simix_global,
"SIMIX_global_init has to be called before SIMIX_function_register.");
xbt_dict_set(simix_global->registered_functions, name, code, NULL);
*/
void SIMIX_function_register_default(xbt_main_func_t code)
{
- xbt_assert0(simix_global,
+ xbt_assert(simix_global,
"SIMIX_global_init has to be called before SIMIX_function_register.");
default_function = code;
xbt_main_func_t SIMIX_get_registered_function(const char *name)
{
xbt_main_func_t res = NULL;
- xbt_assert0(simix_global,
+ xbt_assert(simix_global,
"SIMIX_global_init has to be called before SIMIX_get_registered_function.");
res = xbt_dict_get_or_null(simix_global->registered_functions, name);
/* init process */
parse_host = xbt_strdup(process_host);
- xbt_assert1(SIMIX_host_get_by_name(parse_host),
+ xbt_assert(SIMIX_host_get_by_name(parse_host),
"Host '%s' unknown", parse_host);
parse_code = SIMIX_get_registered_function(process_function);
- xbt_assert1(parse_code, "Function '%s' unknown", process_function);
+ xbt_assert(parse_code, "Function '%s' unknown", process_function);
parse_argc = 0;
parse_argv = NULL;
parse_argv[(parse_argc) - 1] = xbt_strdup(process_function);
start_time = process_start_time;
kill_time = process_kill_time;
- current_property_set = xbt_dict_new();
/* add arguments */
xbt_dynar_foreach(arguments, i, arg) {