-/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2007-2012. The SimGrid Team. All rights reserved. */
/* 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. */
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);
+static void SIMIX_clean(void);
/* FIXME: Yeah, I'll do it in a portable maner one day [Mt] */
#include <signal.h>
}
/**
+ * \ingroup SIMIX_API
* \brief Initialize SIMIX internal data.
*
* \param argc Argc
if (!simix_global) {
simix_global = xbt_new0(s_smx_global_t, 1);
+#ifdef TIME_BENCH_AMDAHL
+ simix_global->timer_seq = xbt_os_timer_new();
+ simix_global->timer_par = xbt_os_timer_new();
+ xbt_os_timer_start(simix_global->timer_seq);
+#endif
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 =
simix_global->action_mallocator = xbt_mallocator_new(65536,
SIMIX_action_mallocator_new_f, SIMIX_action_mallocator_free_f,
SIMIX_action_mallocator_reset_f);
+ simix_global->autorestart = SIMIX_host_restart_processes;
surf_init(argc, argv); /* Initialize SURF structures */
SIMIX_context_mod_init();
/* Prepare to display some more info when dying on Ctrl-C pressing */
signal(SIGINT, inthandler);
+
+ /* register a function to be called by SURF after the environment creation */
+ sg_platf_init();
+ sg_platf_postparse_add_cb(SIMIX_post_create_environment);
+
}
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);
+
+ atexit(SIMIX_clean);
}
/**
+ * \ingroup SIMIX_API
* \brief Clean the SIMIX simulation
*
* This functions remove the memory used by SIMIX
*/
-void SIMIX_clean(void)
+static void SIMIX_clean(void)
{
-#ifdef TIME_BENCH
+#ifdef TIME_BENCH_PER_SR
smx_ctx_raw_new_sr();
#endif
surf_exit();
+#ifdef TIME_BENCH_AMDAHL
+ xbt_os_timer_stop(simix_global->timer_seq);
+ XBT_INFO("Amdhal timing informations. Sequential time: %lf; Parallel time: %lf",
+ xbt_os_timer_elapsed(simix_global->timer_seq),
+ xbt_os_timer_elapsed(simix_global->timer_par));
+ xbt_os_timer_free(simix_global->timer_seq);
+ xbt_os_timer_free(simix_global->timer_par);
+#endif
+
xbt_mallocator_free(simix_global->action_mallocator);
xbt_free(simix_global);
simix_global = NULL;
/**
+ * \ingroup SIMIX_API
* \brief A clock (in second).
*
* \return Return the clock.
*/
XBT_INLINE double SIMIX_get_clock(void)
{
- if(MC_IS_ENABLED){
+ if(MC_is_active()){
return MC_process_clock_get(SIMIX_process_self());
}else{
return surf_get_clock();
}
}
+/**
+ * \ingroup SIMIX_API
+ * \brief Run the main simulation loop.
+ */
void SIMIX_run(void)
{
double time = 0;
do {
XBT_DEBUG("New Schedule Round; size(queue)=%lu",
xbt_dynar_length(simix_global->process_to_run));
-#ifdef TIME_BENCH
+#ifdef TIME_BENCH_PER_SR
smx_ctx_raw_new_sr();
#endif
while (!xbt_dynar_is_empty(simix_global->process_to_run)) {
xbt_dynar_length(simix_global->process_to_run));
/* Run all processes that are ready to run, possibly in parallel */
+#ifdef TIME_BENCH_AMDAHL
+ xbt_os_timer_stop(simix_global->timer_seq);
+ xbt_os_timer_resume(simix_global->timer_par);
+#endif
SIMIX_process_runall();
+#ifdef TIME_BENCH_AMDAHL
+ xbt_os_timer_stop(simix_global->timer_par);
+ xbt_os_timer_resume(simix_global->timer_seq);
+#endif
/* Move all killing processes to the end of the list, because killing a process that have an ongoing simcall is a bad idea */
xbt_dynar_three_way_partition(simix_global->process_that_ran, process_syscall_color);
}
/**
- * \brief Set the date to execute a function
+ * \brief Set the date to execute a function
*
* Set the date to execute the function on the surf.
- * \param date Date to execute function
- * \param function Function to be executed
- * \param arg Parameters of the function
+ * \param date Date to execute function
+ * \param function Function to be executed
+ * \param arg Parameters of the function
*
*/
XBT_INLINE void SIMIX_timer_set(double date, void *function, void *arg)
*
* \param function Kill process function
*/
-XBT_INLINE void SIMIX_function_register_process_kill(void_pfn_smxprocess_t
+XBT_INLINE void SIMIX_function_register_process_kill(void_pfn_smxprocess_t_smxprocess_t
function)
{
simix_global->kill_process_function = function;
case SIMIX_ACTION_IO:
action_description = "I/O";
+ break;
+ /* **************************************/
+ /* TUTORIAL: New API */
+ case SIMIX_ACTION_NEW_API:
+ action_description = "NEW API";
+ /* **************************************/
+
break;
}
XBT_INFO("Process %lu (%s@%s): waiting for %s action %p (%s) in state %d to finish",
memset(action, 0, sizeof(s_smx_action_t));
((smx_action_t) action)->simcalls = fifo;
}
+
+xbt_dict_t SIMIX_asr_get_properties(const char *name)
+{
+ return xbt_lib_get_or_null(as_router_lib, name, ROUTING_PROP_ASR_LEVEL);
+}
+
