XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_process, simix,
"Logging specific to SIMIX (process)");
-static unsigned long simix_process_count = 0;
+unsigned long simix_process_maxpid = 0;
+/* FIXME: Ugly hack!*/
+extern double NOW;
/**
* \brief Returns the current agent.
*/
XBT_INLINE smx_process_t SIMIX_process_self(void)
{
- if (simix_global)
- return SIMIX_context_get_data(SIMIX_context_self());
+ smx_context_t self_context = SIMIX_context_self();
- return NULL;
+ return self_context ? SIMIX_context_get_data(self_context) : NULL;
}
/**
void SIMIX_process_cleanup(smx_process_t process)
{
DEBUG1("Cleanup process %s", process->name);
- xbt_swag_remove(process, simix_global->process_to_run);
+ /*xbt_swag_remove(process, simix_global->process_to_run);*/
xbt_swag_remove(process, simix_global->process_list);
xbt_swag_remove(process, process->smx_host->process_list);
xbt_swag_insert(process, simix_global->process_to_destroy);
/* Create maestro process and intilialize it */
maestro = xbt_new0(s_smx_process_t, 1);
- maestro->pid = simix_process_count++;
+ maestro->pid = simix_process_maxpid++;
maestro->name = (char *) "";
maestro->running_ctx = xbt_new(xbt_running_ctx_t, 1);
XBT_RUNNING_CTX_INITIALIZE(maestro->running_ctx);
maestro->context = SIMIX_context_new(NULL, 0, NULL, NULL, maestro);
+ maestro->request.issuer = maestro;
simix_global->maestro_process = maestro;
return;
xbt_assert0(((code != NULL) && (host != NULL)), "Invalid parameters");
/* Process data */
- process->pid = simix_process_count++;
+ process->pid = simix_process_maxpid++;
process->name = xbt_strdup(name);
process->smx_host = host;
process->data = data;
/* Now insert it in the global process list and in the process to run list */
xbt_swag_insert(process, simix_global->process_list);
DEBUG2("Inserting %s(%s) in the to_run list", process->name, host->name);
- xbt_swag_insert(process, simix_global->process_to_run);
+ xbt_dynar_push_as(simix_global->process_to_run, smx_process_t, process);
}
return process;
break;
case SIMIX_ACTION_SYNCHRO:
- SIMIX_synchro_stop_waiting(process, process->request);
+ SIMIX_synchro_stop_waiting(process, &process->request);
SIMIX_synchro_destroy(process->waiting_action);
break;
SIMIX_context_stop(process->context);
}
else {
- xbt_swag_insert(process, simix_global->process_to_run);
+ xbt_dynar_push_as(simix_global->process_to_run, smx_process_t, process);
}
}
while ((p = xbt_swag_extract(simix_global->process_list)))
SIMIX_process_kill(p, SIMIX_process_self());
+ SIMIX_context_runall(simix_global->process_to_run);
+
SIMIX_process_empty_trash();
}
}
}
else {
- xbt_swag_insert(process, simix_global->process_to_run);
+ xbt_dynar_push_as(simix_global->process_to_run, smx_process_t, process);
}
}
}
+int SIMIX_process_get_maxpid(void) {
+ return simix_process_maxpid;
+}
int SIMIX_process_count(void)
{
return xbt_swag_size(simix_global->process_list);
int SIMIX_process_is_enabled(smx_process_t process)
{
- if (process->request && SIMIX_request_is_enabled(process->request))
+ if (process->request.call != REQ_NO_REQ && SIMIX_request_is_enabled(&process->request))
return TRUE;
return FALSE;
void SIMIX_pre_process_sleep(smx_req_t req)
{
if (MC_IS_ENABLED) {
+ NOW += req->process_sleep.duration;
req->process_sleep.result = SIMIX_DONE;
SIMIX_request_answer(req);
}
/* Ok, maestro returned control to us */
DEBUG1("Maestro returned control to me: '%s'", self->name);
- if (self->context->iwannadie)
+ if (self->context->iwannadie){
+ DEBUG0("I wanna die!");
SIMIX_context_stop(self->context);
+ }
if (self->doexception) {
DEBUG0("Wait, maestro left me an exception");