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
Avoid a name conflict with /usr/include/sys/wait.h on mac (at least)
[simgrid.git]
/
src
/
simix
/
smx_global.c
diff --git
a/src/simix/smx_global.c
b/src/simix/smx_global.c
index 9df8f761702e6b371a7ba7b52f43511368903460..6daaf17e8222fd972a7938a43da5341599305889 100644
(file)
--- a/
src/simix/smx_global.c
+++ b/
src/simix/smx_global.c
@@
-19,7
+19,6
@@
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_EXTERNAL_CATEGORY(simix_process);
XBT_LOG_EXTERNAL_CATEGORY(simix_synchro);
XBT_LOG_EXTERNAL_CATEGORY(simix_context);
-XBT_LOG_EXTERNAL_CATEGORY(simix_network);
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_kernel, simix,
"Logging specific to SIMIX (kernel)");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_kernel, simix,
"Logging specific to SIMIX (kernel)");
@@
-58,7
+57,6
@@
void SIMIX_global_init(int *argc, char **argv)
XBT_LOG_CONNECT(simix_process, simix);
XBT_LOG_CONNECT(simix_synchro, simix);
XBT_LOG_CONNECT(simix_context, simix);
XBT_LOG_CONNECT(simix_process, simix);
XBT_LOG_CONNECT(simix_synchro, simix);
XBT_LOG_CONNECT(simix_context, simix);
- XBT_LOG_CONNECT(simix_network, simix);
simix_global = xbt_new0(s_SIMIX_Global_t, 1);
simix_global = xbt_new0(s_SIMIX_Global_t, 1);
@@
-269,7
+267,7
@@
void SIMIX_clean(void)
*
* \return Return the clock.
*/
*
* \return Return the clock.
*/
-double SIMIX_get_clock(void)
+
XBT_INLINE
double SIMIX_get_clock(void)
{
return surf_get_clock();
}
{
return surf_get_clock();
}
@@
-279,7
+277,7
@@
double SIMIX_get_clock(void)
*
* Must be called before the first call to SIMIX_solve()
*/
*
* Must be called before the first call to SIMIX_solve()
*/
-void SIMIX_init(void)
+
XBT_INLINE
void SIMIX_init(void)
{
surf_presolve();
}
{
surf_presolve();
}
@@
-419,10
+417,8
@@
double SIMIX_solve(xbt_fifo_t actions_done, xbt_fifo_t actions_failed)
if (smx_action) {
/* Copy the transfered data of the completed communication actions */
/* FIXME: find a better way to determine if its a comm action */
if (smx_action) {
/* Copy the transfered data of the completed communication actions */
/* FIXME: find a better way to determine if its a comm action */
- if(smx_action->data != NULL) {
- CDEBUG1(simix_network,"Communication %p finished",smx_action->data);
+ if(smx_action->data != NULL)
SIMIX_network_copy_data((smx_comm_t)smx_action->data);
SIMIX_network_copy_data((smx_comm_t)smx_action->data);
- }
SIMIX_action_signal_all(smx_action);
}
}
SIMIX_action_signal_all(smx_action);
}
}
@@
-458,12
+454,12
@@
double SIMIX_solve(xbt_fifo_t actions_done, xbt_fifo_t actions_failed)
* \param arg Parameters of the function
*
*/
* \param arg Parameters of the function
*
*/
-void SIMIX_timer_set(double date, void *function, void *arg)
+
XBT_INLINE
void SIMIX_timer_set(double date, void *function, void *arg)
{
surf_timer_model->extension.timer.set(date, function, arg);
}
{
surf_timer_model->extension.timer.set(date, function, arg);
}
-int SIMIX_timer_get(void **function, void **arg)
+
XBT_INLINE
int SIMIX_timer_get(void **function, void **arg)
{
return surf_timer_model->extension.timer.get(function, arg);
}
{
return surf_timer_model->extension.timer.get(function, arg);
}
@@
-475,7
+471,7
@@
int SIMIX_timer_get(void **function, void **arg)
* \param function Create process function
*
*/
* \param function Create process function
*
*/
-void SIMIX_function_register_process_create(smx_creation_func_t 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");
{
xbt_assert0((simix_global->create_process_function == NULL),
"Data already set");
@@
-490,7
+486,7
@@
void SIMIX_function_register_process_create(smx_creation_func_t function)
* \param function Kill process function
*
*/
* \param function Kill process function
*
*/
-void SIMIX_function_register_process_kill(void_f_pvoid_t function)
+
XBT_INLINE
void SIMIX_function_register_process_kill(void_f_pvoid_t function)
{
xbt_assert0((simix_global->kill_process_function == NULL),
"Data already set");
{
xbt_assert0((simix_global->kill_process_function == NULL),
"Data already set");
@@
-505,7
+501,7
@@
void SIMIX_function_register_process_kill(void_f_pvoid_t function)
* \param function cleanup process function
*
*/
* \param function cleanup process function
*
*/
-void SIMIX_function_register_process_cleanup(void_f_pvoid_t function)
+
XBT_INLINE
void SIMIX_function_register_process_cleanup(void_f_pvoid_t function)
{
simix_global->cleanup_process_function = function;
}
{
simix_global->cleanup_process_function = function;
}