#include "gras_stub_generator.h"
#include <stdarg.h>
-
-
+extern char *xbt_binary_name;
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(stubgen, gras, "Stub generator");
-
#ifdef _XBT_WIN32
#include <windows.h>
#endif
xbt_dict_t process_function_set = NULL;
xbt_dynar_t process_list = NULL;
xbt_dict_t machine_set = NULL;
+char *warning = NULL;
void s_process_free(void *process)
{
static void parse_process_init(void)
{
- xbt_dict_set(process_function_set, A_surfxml_process_function, NULL,
- NULL);
+ xbt_dict_set(process_function_set, A_surfxml_process_function, NULL, NULL);
xbt_dict_set(machine_set, A_surfxml_process_host, NULL, NULL);
process.argc = 1;
process.argv = xbt_new(char *, 1);
process.argv[0] = xbt_strdup(A_surfxml_process_function);
process.host = strdup(A_surfxml_process_host);
- /*VERB1("Function: %s",A_surfxml_process_function); */
+ /*XBT_VERB("Function: %s",A_surfxml_process_function); */
}
static void parse_argument(void)
static void parse_process_finalize(void)
{
xbt_dynar_push(process_list, &process);
- /*VERB1("Function: %s",process.argv[0]); */
+ /*XBT_VERB("Function: %s",process.argv[0]); */
}
/*FIXME Defined in surfxml_parse.c*/
char *deployment_file = NULL;
int i;
+ xbt_binary_name=xbt_strdup(argv[0]);
+
surf_init(&argc, argv);
- process_function_set = xbt_dict_new();
+ process_function_set = xbt_dict_new_homogeneous(NULL);
process_list = xbt_dynar_new(sizeof(s_process_t), s_process_free);
- machine_set = xbt_dict_new();
+ machine_set = xbt_dict_new_homogeneous(NULL);
for (i = 1; i < argc; i++) {
int need_removal = 0;
}
}
- xbt_assert1((argc >= 3),
+ xbt_assert((argc >= 3),
"Usage: %s project_name deployment_file [deployment_file...]\n",
argv[0]);
project_name = argv[1];
- surf_parse_reset_parser();
- DEBUG2("%p %p", parse_process_init, &parse_process_init);
+ surf_parse_reset_callbacks();
+ XBT_DEBUG("%p %p", parse_process_init, &parse_process_init);
surfxml_add_callback(STag_surfxml_process_cb_list, &parse_process_init);
surfxml_add_callback(ETag_surfxml_argument_cb_list, &parse_argument);
surfxml_add_callback(ETag_surfxml_process_cb_list,
deployment_file = argv[i];
surf_parse_open(deployment_file);
if (surf_parse())
- xbt_assert1(0, "Parse error in %s", deployment_file);
+ xbt_die("Parse error in %s", deployment_file);
surf_parse_close();
}
for (cursor=NULL, xbt_dict_cursor_first((process_function_set),&(cursor)) ;
xbt_dict_cursor_get_or_free(&(cursor),&(key),(void**)(&data));
xbt_dict_cursor_step(cursor) ) {
- DEBUG1("Function %s", key);
+ XBT_DEBUG("Function %s", key);
}
xbt_dict_dump(process_function_set,print);
generate_simulation_dsp_file(project_name);
generate_real_live_dsp_file(project_name);
- if (__gras_path)
- xbt_free(__gras_path);
+ xbt_free(__gras_path);
#endif
free(warning);
+
+ xbt_dict_free(&process_function_set);
+ xbt_dynar_free(&process_list);
+ xbt_dict_free(&machine_set);
surf_exit();
+
return 0;
}