A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge xbt/ex.hpp into simgrid/exception.hpp
[simgrid.git]
/
src
/
simix
/
smx_global.cpp
diff --git
a/src/simix/smx_global.cpp
b/src/simix/smx_global.cpp
index
0d7299f
..
d61721f
100644
(file)
--- a/
src/simix/smx_global.cpp
+++ b/
src/simix/smx_global.cpp
@@
-168,8
+168,8
@@
void SIMIX_set_maestro(void (*code)(void*), void* data)
}
/**
}
/**
- *
\
ingroup SIMIX_API
- *
\
brief Initialize SIMIX internal data.
+ *
@
ingroup SIMIX_API
+ *
@
brief Initialize SIMIX internal data.
*/
void SIMIX_global_init(int *argc, char **argv)
{
*/
void SIMIX_global_init(int *argc, char **argv)
{
@@
-185,7
+185,6
@@
void SIMIX_global_init(int *argc, char **argv)
simix_global->create_process_function = &SIMIX_process_create;
simix_global->kill_process_function = &kill_process;
simix_global->cleanup_process_function = &SIMIX_process_cleanup;
simix_global->create_process_function = &SIMIX_process_create;
simix_global->kill_process_function = &kill_process;
simix_global->cleanup_process_function = &SIMIX_process_cleanup;
- simix_global->mutex = xbt_os_mutex_init();
surf_init(argc, argv); /* Initialize SURF structures */
SIMIX_context_mod_init();
surf_init(argc, argv); /* Initialize SURF structures */
SIMIX_context_mod_init();
@@
-219,8
+218,8
@@
void SIMIX_global_init(int *argc, char **argv)
int smx_cleaned = 0;
/**
int smx_cleaned = 0;
/**
- *
\
ingroup SIMIX_API
- *
\
brief Clean the SIMIX simulation
+ *
@
ingroup SIMIX_API
+ *
@
brief Clean the SIMIX simulation
*
* This functions remove the memory used by SIMIX
*/
*
* This functions remove the memory used by SIMIX
*/
@@
-267,8
+266,6
@@
void SIMIX_clean()
simix_global->process_to_destroy.clear();
simix_global->process_list.clear();
simix_global->process_to_destroy.clear();
simix_global->process_list.clear();
- xbt_os_mutex_destroy(simix_global->mutex);
- simix_global->mutex = nullptr;
#if SIMGRID_HAVE_MC
xbt_dynar_free(&simix_global->actors_vector);
xbt_dynar_free(&simix_global->dead_actors_vector);
#if SIMGRID_HAVE_MC
xbt_dynar_free(&simix_global->actors_vector);
xbt_dynar_free(&simix_global->dead_actors_vector);
@@
-288,12
+285,11
@@
void SIMIX_clean()
simix_global = nullptr;
}
simix_global = nullptr;
}
-
/**
/**
- *
\
ingroup SIMIX_API
- *
\
brief A clock (in second).
+ *
@
ingroup SIMIX_API
+ *
@
brief A clock (in second).
*
*
- *
\
return Return the clock.
+ *
@
return Return the clock.
*/
double SIMIX_get_clock()
{
*/
double SIMIX_get_clock()
{
@@
-373,8
+369,8
@@
static bool SIMIX_execute_tasks()
}
/**
}
/**
- *
\
ingroup SIMIX_API
- *
\
brief Run the main simulation loop.
+ *
@
ingroup SIMIX_API
+ *
@
brief Run the main simulation loop.
*/
void SIMIX_run()
{
*/
void SIMIX_run()
{
@@
-507,13
+503,6
@@
void SIMIX_run()
SIMIX_wake_processes();
} while (again);
SIMIX_wake_processes();
} while (again);
- /* Autorestart all process */
- for (auto const& host : host_that_restart) {
- XBT_INFO("Restart processes on host %s", host->get_cname());
- SIMIX_host_autorestart(host);
- }
- host_that_restart.clear();
-
/* Clean processes to destroy */
SIMIX_process_empty_trash();
/* Clean processes to destroy */
SIMIX_process_empty_trash();
@@
-538,12
+527,12
@@
void SIMIX_run()
}
/**
}
/**
- *
\
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.
*
* Set the date to execute the function on the surf.
- *
\
param date Date to execute function
- *
\
param callback Function to be executed
- *
\
param arg Parameters of the function
+ *
@
param date Date to execute function
+ *
@
param callback Function to be executed
+ *
@
param arg Parameters of the function
*
*/
smx_timer_t SIMIX_timer_set(double date, void (*callback)(void*), void *arg)
*
*/
smx_timer_t SIMIX_timer_set(double date, void (*callback)(void*), void *arg)
@@
-572,12
+561,12
@@
double SIMIX_timer_get_date(smx_timer_t timer) {
}
/**
}
/**
- *
\
brief Registers a function to create a process.
+ *
@
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().
*
* 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
+ *
@
param function create process function
*/
void SIMIX_function_register_process_create(smx_creation_func_t function)
{
*/
void SIMIX_function_register_process_create(smx_creation_func_t function)
{
@@
-585,12
+574,12
@@
void SIMIX_function_register_process_create(smx_creation_func_t function)
}
/**
}
/**
- *
\
brief Registers a function to kill a process.
+ *
@
brief Registers a function to kill a process.
*
* This function registers a function to be called when a process is killed. The function has to call the
* SIMIX_process_kill().
*
*
* 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
+ *
@
param function Kill process function
*/
void SIMIX_function_register_process_kill(void_pfn_smxprocess_t function)
{
*/
void SIMIX_function_register_process_kill(void_pfn_smxprocess_t function)
{
@@
-598,11
+587,11
@@
void SIMIX_function_register_process_kill(void_pfn_smxprocess_t function)
}
/**
}
/**
- *
\
brief Registers a function to cleanup a process.
+ *
@
brief Registers a function to cleanup a process.
*
* This function registers a user function to be called when a process ends properly.
*
*
* This function registers a user function to be called when a process ends properly.
*
- *
\
param function cleanup process function
+ *
@
param function cleanup process function
*/
void SIMIX_function_register_process_cleanup(void_pfn_smxprocess_t function)
{
*/
void SIMIX_function_register_process_cleanup(void_pfn_smxprocess_t function)
{