#include "xbt/log.h"
#include "xbt/dict.h"
#include "msg/mailbox.h"
+#include "mc/mc.h"
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;
/**
* \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());
- return NULL;
+ smx_context_t self_context = SIMIX_context_self();
+
+ 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);
void SIMIX_create_maestro_process()
{
smx_process_t maestro = NULL;
-
+
/* 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;
}
*/
smx_process_t SIMIX_process_create(const char *name,
xbt_main_func_t code,
- void *data,
- const char *hostname,
- int argc, char **argv,
- xbt_dict_t properties) {
+ void *data,
+ const char *hostname,
+ int argc, char **argv,
+ xbt_dict_t properties) {
smx_process_t process = NULL;
smx_host_t host = SIMIX_host_get_by_name(hostname);
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->iwannadie = 0;
process->data = data;
VERB1("Create context %s", process->name);
/* 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;
DEBUG2("Killing process %s on %s", process->name, process->smx_host->name);
- process->iwannadie = 1;
+ process->context->iwannadie = 1;
process->blocked = 0;
process->suspended = 0;
/* FIXME: set doexception to 0 also? */
-
+
if (process->waiting_action) {
switch (process->waiting_action->type) {
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();
}
if (process->waiting_action) {
- switch(process->waiting_action->type) {
+ switch (process->waiting_action->type) {
case SIMIX_ACTION_EXECUTE:
case SIMIX_ACTION_PARALLEL_EXECUTE:
SIMIX_host_execution_resume(process->waiting_action);
break;
-
+
case SIMIX_ACTION_COMMUNICATE:
SIMIX_comm_resume(process->waiting_action);
break;
-
+
case SIMIX_ACTION_SLEEP:
SIMIX_process_sleep_resume(process->waiting_action);
break;
-
+
default:
THROW_IMPOSSIBLE;
}
- } else {
- xbt_swag_insert(process, simix_global->process_to_run);
+ }
+ else {
+ 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_isEnabled(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)
{
-#ifdef HAVE_MC
- if(_surf_do_model_check){
+ if (MC_IS_ENABLED) {
req->process_sleep.result = SIMIX_DONE;
SIMIX_request_answer(req);
}
-#endif
smx_action_t action = SIMIX_process_sleep(req->issuer, req->process_sleep.duration);
xbt_fifo_push(action->request_list, req);
req->issuer->waiting_action = action;
void SIMIX_process_yield(void)
{
smx_process_t self = SIMIX_process_self();
-
+
DEBUG1("Yield process '%s'", self->name);
-
+
/* Go into sleep and return control to maestro */
SIMIX_context_suspend(self->context);
/* Ok, maestro returned control to us */
DEBUG1("Maestro returned control to me: '%s'", self->name);
-
- if (self->iwannadie)
+
+ if (self->context->iwannadie)
SIMIX_context_stop(self->context);
if (self->doexception) {
xbt_ex_display(e);
abort();
}
+
+smx_context_t SIMIX_process_get_context(smx_process_t p) {
+ return p->context;
+}
+void SIMIX_process_set_context(smx_process_t p,smx_context_t c) {
+ p->context = c;
+}
