/* 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. */
-#include "private.h"
+#include "smx_private.h"
#include "xbt/heap.h"
#include "xbt/sysdep.h"
#include "xbt/log.h"
#include "xbt/ex.h" /* ex_backtrace_display */
#include "mc/mc.h"
-XBT_LOG_EXTERNAL_CATEGORY(simix);
-XBT_LOG_EXTERNAL_CATEGORY(simix_action);
-XBT_LOG_EXTERNAL_CATEGORY(simix_deployment);
-XBT_LOG_EXTERNAL_CATEGORY(simix_environment);
-XBT_LOG_EXTERNAL_CATEGORY(simix_host);
-XBT_LOG_EXTERNAL_CATEGORY(simix_process);
-XBT_LOG_EXTERNAL_CATEGORY(simix_synchro);
-XBT_LOG_EXTERNAL_CATEGORY(simix_context);
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_kernel, simix,
"Logging specific to SIMIX (kernel)");
s_smx_process_t proc;
if (!simix_global) {
- /* Connect our log channels: that must be done manually under windows */
- XBT_LOG_CONNECT(simix_action, simix);
- XBT_LOG_CONNECT(simix_deployment, simix);
- XBT_LOG_CONNECT(simix_environment, simix);
- XBT_LOG_CONNECT(simix_host, simix);
- XBT_LOG_CONNECT(simix_kernel, simix);
- XBT_LOG_CONNECT(simix_process, simix);
- XBT_LOG_CONNECT(simix_synchro, simix);
- XBT_LOG_CONNECT(simix_context, simix);
-
simix_global = xbt_new0(s_smx_global_t, 1);
simix_global->process_to_run = xbt_dynar_new(sizeof(smx_process_t), NULL);
xbt_dynar_length(simix_global->process_to_run));
SIMIX_process_runall();
xbt_dynar_foreach(simix_global->process_that_ran, iter, process) {
- if (process->request.call != REQ_NO_REQ) {
- SIMIX_request_pre(&process->request, 0);
+ if (process->simcall.call != SIMCALL_NONE) {
+ SIMIX_simcall_pre(&process->simcall, 0);
}
}
}
if (timer->func)
((void (*)(void*))timer->func)(timer->args);
}
- /* Wake up all process waiting for the action finish */
+ /* Wake up all processes waiting for a Surf action to finish */
xbt_dynar_foreach(model_list, iter, model) {
- for (set = model->states.failed_action_set;
- set;
- set = (set == model->states.failed_action_set)
- ? model->states.done_action_set
- : NULL) {
- while ((action = xbt_swag_extract(set)))
- SIMIX_request_post((smx_action_t) action->data);
- }
+ set = model->states.failed_action_set;
+ while ((action = xbt_swag_extract(set)))
+ SIMIX_simcall_post((smx_action_t) action->data);
+ set = model->states.done_action_set;
+ while ((action = xbt_swag_extract(set)))
+ SIMIX_simcall_post((smx_action_t) action->data);
}
/* Clean processes to destroy */
const char* action_description = "unknown";
switch (process->waiting_action->type) {
- case SIMIX_ACTION_EXECUTE:
- action_description = "execution";
- break;
+ case SIMIX_ACTION_EXECUTE:
+ action_description = "execution";
+ break;
- case SIMIX_ACTION_PARALLEL_EXECUTE:
- action_description = "parallel execution";
- break;
+ case SIMIX_ACTION_PARALLEL_EXECUTE:
+ action_description = "parallel execution";
+ break;
- case SIMIX_ACTION_COMMUNICATE:
- action_description = "communication";
- break;
+ case SIMIX_ACTION_COMMUNICATE:
+ action_description = "communication";
+ break;
- case SIMIX_ACTION_SLEEP:
- action_description = "sleeping";
- break;
+ case SIMIX_ACTION_SLEEP:
+ action_description = "sleeping";
+ break;
- case SIMIX_ACTION_SYNCHRO:
- action_description = "synchronization";
- break;
+ case SIMIX_ACTION_SYNCHRO:
+ action_description = "synchronization";
+ break;
- case SIMIX_ACTION_IO:
- action_description = "I/O";
- break;
+ case SIMIX_ACTION_IO:
+ action_description = "I/O";
+ break;
}
- XBT_INFO("Process %ld (%s@%s): waiting for %s action %p (%s) in state %d to finish",
+ XBT_INFO("Process %lu (%s@%s): waiting for %s action %p (%s) in state %d to finish",
process->pid, process->name, process->smx_host->name,
- action_description, process->waiting_action,
- process->waiting_action->name, process->waiting_action->state);
+ action_description, process->waiting_action,
+ process->waiting_action->name, (int)process->waiting_action->state);
}
else {
- XBT_INFO("Process %ld (%s@%s)", process->pid, process->name, process->smx_host->name);
+ XBT_INFO("Process %lu (%s@%s)", process->pid, process->name, process->smx_host->name);
}
}
}
static void* SIMIX_action_mallocator_new_f(void) {
smx_action_t action = xbt_new(s_smx_action_t, 1);
- action->request_list = xbt_fifo_new();
+ action->simcalls = xbt_fifo_new();
return action;
}
static void SIMIX_action_mallocator_free_f(void* action) {
- xbt_fifo_free(((smx_action_t) action)->request_list);
+ xbt_fifo_free(((smx_action_t) action)->simcalls);
xbt_free(action);
}
static void SIMIX_action_mallocator_reset_f(void* action) {
- // we also recycle the request list
- xbt_fifo_t fifo = ((smx_action_t) action)->request_list;
+ // we also recycle the simcall list
+ xbt_fifo_t fifo = ((smx_action_t) action)->simcalls;
xbt_fifo_reset(fifo);
memset(action, 0, sizeof(s_smx_action_t));
- ((smx_action_t) action)->request_list = fifo;
+ ((smx_action_t) action)->simcalls = fifo;
}