/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
simix_global->maestro_process = NULL;
simix_global->registered_functions = xbt_dict_new_homogeneous(NULL);
simix_global->maestro_process = NULL;
simix_global->registered_functions = xbt_dict_new_homogeneous(NULL);
- simix_global->create_process_function = SIMIX_process_create;
- simix_global->kill_process_function = kill_process;
- simix_global->cleanup_process_function = SIMIX_process_cleanup;
+ simix_global->create_process_function = &SIMIX_process_create;
+ simix_global->kill_process_function = &kill_process;
+ simix_global->cleanup_process_function = &SIMIX_process_cleanup;
simix_global->mutex = xbt_os_mutex_init();
surf_init(argc, argv); /* Initialize SURF structures */
simix_global->mutex = xbt_os_mutex_init();
surf_init(argc, argv); /* Initialize SURF structures */
- __xbt_running_ctx_fetch = SIMIX_process_get_running_context;
- __xbt_ex_terminate = SIMIX_process_exception_terminate;
+ __xbt_running_ctx_fetch = &SIMIX_process_get_running_context;
+ __xbt_ex_terminate = &SIMIX_process_exception_terminate;
/* Prepare to display some more info when dying on Ctrl-C pressing */
signal(SIGINT, inthandler);
/* Prepare to display some more info when dying on Ctrl-C pressing */
signal(SIGINT, inthandler);
//FIXME: make the timers being real callbacks
// (i.e. provide dispatchers that read and expand the args)
timer = (smx_timer_t) xbt_heap_pop(simix_timers);
//FIXME: make the timers being real callbacks
// (i.e. provide dispatchers that read and expand the args)
timer = (smx_timer_t) xbt_heap_pop(simix_timers);
- smx_timer_t timer = xbt_new0(s_smx_timer_t, 1);
+ smx_timer_t timer = new s_smx_timer_t(date, std::bind(function, arg));
+ xbt_heap_push(simix_timers, timer, date);
+ return timer;
+}
/** @brief cancels a timer that was added earlier */
void SIMIX_timer_remove(smx_timer_t timer) {
xbt_heap_rm_elm(simix_timers, timer, timer->date);
/** @brief cancels a timer that was added earlier */
void SIMIX_timer_remove(smx_timer_t timer) {
xbt_heap_rm_elm(simix_timers, timer, timer->date);
- process->pid, process->name, sg_host_get_name(process->host),
+ process->pid, process->name.c_str(), sg_host_get_name(process->host),
synchro_description, process->waiting_synchro,
process->waiting_synchro->name, (int)process->waiting_synchro->state);
}
else {
synchro_description, process->waiting_synchro,
process->waiting_synchro->name, (int)process->waiting_synchro->state);
}
else {
- XBT_INFO("Process %lu (%s@%s)", process->pid, process->name, sg_host_get_name(process->host));
+ XBT_INFO("Process %lu (%s@%s)", process->pid, process->name.c_str(), sg_host_get_name(process->host));