asprintf(&who, "%s on %s: %s",
process->name,
- p_simdata->s_host->name,
+ p_simdata->smx_host->name,
(process->simdata->blocked) ? "[BLOCKED] "
: ((process->simdata->suspended) ? "[SUSPENDED] " : ""));
free(who);
who = who2;
xbt_fifo_foreach(p_simdata->cond->actions, item, act, smx_action_t) {
- who2 = bprintf("%s '%s'", who, act->name);
+ who2 = bprintf("%s '%s'(%p)", who, act->name,act);
free(who);
who = who2;
}
xbt_fifo_foreach(smx_action->cond_list, _cursor, cond, smx_cond_t) {
xbt_swag_foreach(process, cond->sleeping) {
DEBUG2("\t preparing to wake up %s on %s",
- process->name, process->simdata->s_host->name);
+ process->name, process->simdata->smx_host->name);
}
SIMIX_cond_broadcast(cond);
/* remove conditional from action */
xbt_fifo_foreach(smx_action->cond_list, _cursor, cond, smx_cond_t) {
xbt_swag_foreach(process, cond->sleeping) {
DEBUG2("\t preparing to wake up %s on %s",
- process->name, process->simdata->s_host->name);
+ process->name, process->simdata->smx_host->name);
}
SIMIX_cond_broadcast(cond);
/* remove conditional from action */
xbt_dict_free(&(simix_global->registered_functions));
simix_config_finalize();
free(simix_global);
+ simix_global = NULL;
surf_exit();
return;
}
while ((process = xbt_swag_extract(simix_global->process_to_run))) {
DEBUG2("Scheduling %s on %s",
- process->name, process->simdata->s_host->name);
+ process->name, process->simdata->smx_host->name);
simix_global->current_process = process;
xbt_context_schedule(process->simdata->context);
/* fflush(NULL); */
|| xbt_swag_size(model->common_public->states.
done_action_set)) {
state_modifications = 1;
+ break;
}
}
if (fun == SIMIX_process_kill) {
process = arg;
DEBUG2("Killing %s on %s", process->name,
- process->simdata->s_host->name);
+ process->simdata->smx_host->name);
SIMIX_process_kill(process);
}
}
* \param function Create process function
*
*/
-void SIMIX_function_register_process_create(smx_creation_func_t * function)
+void SIMIX_function_register_process_create(smx_creation_func_t function)
{
xbt_assert0((simix_global->create_process_function == NULL),
"Data already set");
* \param function Kill process function
*
*/
-void SIMIX_function_register_process_kill(void_f_pvoid_t * function)
+void SIMIX_function_register_process_kill(void_f_pvoid_t function)
{
xbt_assert0((simix_global->kill_process_function == NULL),
"Data already set");
* \param function cleanup process function
*
*/
-void SIMIX_function_register_process_cleanup(void_f_pvoid_t * function)
+void SIMIX_function_register_process_cleanup(void_f_pvoid_t function)
{
simix_global->cleanup_process_function = function;
}