/* 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 "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);
static void SIMIX_action_mallocator_free_f(void* action);
static void SIMIX_action_mallocator_reset_f(void* action);
+extern void smx_ctx_raw_new_sr(void);
+
/* FIXME: Yeah, I'll do it in a portable maner one day [Mt] */
#include <signal.h>
+int _surf_do_verbose_exit = 1;
static void _XBT_CALL inthandler(int ignored)
{
- INFO0("CTRL-C pressed. Displaying status and bailing out");
- SIMIX_display_process_status();
+ if ( _surf_do_verbose_exit ) {
+ XBT_INFO("CTRL-C pressed. Displaying status and bailing out");
+ SIMIX_display_process_status();
+ }
+ else {
+ XBT_INFO("CTRL-C pressed. bailing out without displaying because verbose-exit is disabled");
+ }
exit(1);
}
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);
simix_global = xbt_new0(s_smx_global_t, 1);
- simix_global->host = xbt_dict_new();
- simix_global->process_to_run = xbt_dynar_new(sizeof(void *), NULL);
+ simix_global->process_to_run = xbt_dynar_new(sizeof(smx_process_t), NULL);
+ simix_global->process_that_ran = xbt_dynar_new(sizeof(smx_process_t), NULL);
simix_global->process_list =
xbt_swag_new(xbt_swag_offset(proc, process_hookup));
simix_global->process_to_destroy =
xbt_swag_new(xbt_swag_offset(proc, destroy_hookup));
simix_global->maestro_process = NULL;
- simix_global->registered_functions = xbt_dict_new();
+ simix_global->registered_functions = xbt_dict_new_homogeneous(NULL);
- simix_global->create_process_function = NULL;
- simix_global->kill_process_function = NULL;
+ simix_global->create_process_function = SIMIX_process_create;
+ simix_global->kill_process_function = SIMIX_process_kill;
simix_global->cleanup_process_function = SIMIX_process_cleanup;
simix_global->action_mallocator = xbt_mallocator_new(65536,
SIMIX_action_mallocator_new_f, SIMIX_action_mallocator_free_f,
__xbt_running_ctx_fetch = SIMIX_process_get_running_context;
__xbt_ex_terminate = SIMIX_process_exception_terminate;
- /* Initialize request mechanism */
- SIMIX_request_init();
-
/* Initialize the SIMIX network module */
SIMIX_network_init();
if (!simix_timers) {
simix_timers = xbt_heap_new(8, &free);
}
+
+ XBT_DEBUG("ADD SIMIX LEVELS");
+ SIMIX_HOST_LEVEL = xbt_lib_add_level(host_lib,SIMIX_host_destroy);
}
/**
*/
void SIMIX_clean(void)
{
+#ifdef TIME_BENCH
+ smx_ctx_raw_new_sr();
+#endif
+
/* Kill everyone (except maestro) */
- SIMIX_process_killall();
+ SIMIX_process_killall(simix_global->maestro_process);
/* Exit the SIMIX network module */
SIMIX_network_exit();
- /* Exit request mechanism */
- SIMIX_request_destroy();
-
xbt_heap_free(simix_timers);
+ simix_timers = NULL;
/* Free the remaining data structures */
xbt_dynar_free(&simix_global->process_to_run);
+ xbt_dynar_free(&simix_global->process_that_ran);
xbt_swag_free(simix_global->process_to_destroy);
xbt_swag_free(simix_global->process_list);
simix_global->process_list = NULL;
simix_global->process_to_destroy = NULL;
xbt_dict_free(&(simix_global->registered_functions));
- xbt_dict_free(&(simix_global->host));
/* Let's free maestro now */
SIMIX_context_free(simix_global->maestro_process->context);
void SIMIX_run(void)
{
double time = 0;
- smx_req_t req;
+ smx_process_t process;
xbt_swag_t set;
surf_action_t action;
smx_timer_t timer;
unsigned int iter;
do {
- DEBUG1("New Schedule Round; size(queue)=%lu",
+ XBT_DEBUG("New Schedule Round; size(queue)=%lu",
xbt_dynar_length(simix_global->process_to_run));
- do {
- DEBUG1("New Sub-Schedule Round; size(queue)=%lu",
+#ifdef TIME_BENCH
+ smx_ctx_raw_new_sr();
+#endif
+ while (!xbt_dynar_is_empty(simix_global->process_to_run)) {
+ XBT_DEBUG("New Sub-Schedule Round; size(queue)=%lu",
xbt_dynar_length(simix_global->process_to_run));
- SIMIX_context_runall(simix_global->process_to_run);
- while ((req = SIMIX_request_pop())) {
- DEBUG1("Handling request %p", req);
- SIMIX_request_pre(req, 0);
+ SIMIX_process_runall();
+ xbt_dynar_foreach(simix_global->process_that_ran, iter, process) {
+ if (process->simcall.call != SIMCALL_NONE) {
+ SIMIX_simcall_pre(&process->simcall, 0);
+ }
}
- } while (xbt_dynar_length(simix_global->process_to_run));
+ }
- time = surf_solve(SIMIX_timer_next());
+ time = SIMIX_timer_next();
+ if (time != -1.0 || xbt_swag_size(simix_global->process_list) != 0)
+ time = surf_solve(time);
/* Notify all the hosts that have failed */
/* FIXME: iterate through the list of failed host and mark each of them */
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);
}
- } while (time != -1.0);
+
+ /* Clean processes to destroy */
+ SIMIX_process_empty_trash();
+
+ } while (time != -1.0 || !xbt_dynar_is_empty(simix_global->process_to_run));
if (xbt_swag_size(simix_global->process_list) != 0) {
- WARN0("Oops ! Deadlock or code not perfectly clean.");
+#ifdef HAVE_TRACING
+ TRACE_end();
+#endif
+
+ XBT_WARN("Oops ! Deadlock or code not perfectly clean.");
SIMIX_display_process_status();
xbt_abort();
}
}
/**
- * \brief Registers a function to create a process.
- *
- * This function registers an user function to be called when a new process is created. The user function have to call the SIMIX_create_process function.
- * \param function Create process function
+ * \brief Registers a function to create a process.
*
+ * This function registers a function to be called
+ * when a new process is created. The function has
+ * to call SIMIX_process_create().
+ * \param function create process function
*/
XBT_INLINE void SIMIX_function_register_process_create(smx_creation_func_t
function)
{
- xbt_assert0((simix_global->create_process_function == NULL),
- "Data already set");
-
simix_global->create_process_function = function;
}
/**
- * \brief Registers a function to kill a process.
+ * \brief Registers a function to kill a process.
*
- * This function registers an user function to be called when a new process is killed. The user function have to call the SIMIX_kill_process function.
- * \param function Kill process function
+ * This function registers a function to be called when a
+ * process is killed. The function has to call the SIMIX_process_kill().
*
+ * \param function Kill process function
*/
-XBT_INLINE void SIMIX_function_register_process_kill(void_f_pvoid_t
+XBT_INLINE void SIMIX_function_register_process_kill(void_pfn_smxprocess_t
function)
{
- xbt_assert0((simix_global->kill_process_function == NULL),
- "Data already set");
-
simix_global->kill_process_function = function;
}
/**
- * \brief Registers a function to cleanup a process.
+ * \brief Registers a function to cleanup a process.
*
- * This function registers an user function to be called when a new process ends properly.
- * \param function cleanup process function
+ * This function registers a user function to be called when
+ * a process ends properly.
*
+ * \param function cleanup process function
*/
XBT_INLINE void SIMIX_function_register_process_cleanup(void_pfn_smxprocess_t
function)
smx_process_t process = NULL;
int nbprocess = xbt_swag_size(simix_global->process_list);
- INFO1("%d processes are still running, waiting for something.", nbprocess);
+ XBT_INFO("%d processes are still running, waiting for something.", nbprocess);
/* List the process and their state */
- INFO0
- ("Legend of the following listing: \"<process> on <host>: <status>.\"");
+ XBT_INFO
+ ("Legend of the following listing: \"Process <pid> (<name>@<host>): <status>\"");
xbt_swag_foreach(process, simix_global->process_list) {
if (process->waiting_action) {
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;
}
- INFO2("Waiting for %s action %p to finish", action_description, process->waiting_action);
+ 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, (int)process->waiting_action->state);
+ }
+ else {
+ 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;
}
