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
rename AsRoute to BypassRoute, and move it to its own file
[simgrid.git]
/
include
/
simgrid
/
simix.hpp
diff --git
a/include/simgrid/simix.hpp
b/include/simgrid/simix.hpp
index
0da87db
..
b6b9a1c
100644
(file)
--- a/
include/simgrid/simix.hpp
+++ b/
include/simgrid/simix.hpp
@@
-110,7
+110,7
@@
typedef smx_actor_t (*smx_creation_func_t) (
/* name */ const char*,
std::function<void()> code,
/* userdata */ void*,
/* name */ const char*,
std::function<void()> code,
/* userdata */ void*,
- /* hostname */
const char*
,
+ /* hostname */
sg_host_t
,
/* kill_time */ double,
/* props */ xbt_dict_t,
/* auto_restart */ int,
/* kill_time */ double,
/* props */ xbt_dict_t,
/* auto_restart */ int,
@@
-122,7
+122,7
@@
XBT_PUBLIC(void) SIMIX_function_register_process_create(smx_creation_func_t func
XBT_PUBLIC(smx_actor_t) simcall_process_create(const char *name,
std::function<void()> code,
void *data,
XBT_PUBLIC(smx_actor_t) simcall_process_create(const char *name,
std::function<void()> code,
void *data,
-
const char *hostname
,
+
sg_host_t host
,
double kill_time,
xbt_dict_t properties,
int auto_restart);
double kill_time,
xbt_dict_t properties,
int auto_restart);
@@
-130,13
+130,13
@@
XBT_PUBLIC(smx_actor_t) simcall_process_create(const char *name,
XBT_PUBLIC(smx_timer_t) SIMIX_timer_set(double date, simgrid::xbt::Task<void()> callback);
template<class F> inline
XBT_PUBLIC(smx_timer_t) SIMIX_timer_set(double date, simgrid::xbt::Task<void()> callback);
template<class F> inline
-
XBT_PUBLIC(smx_timer_t)
SIMIX_timer_set(double date, F callback)
+
smx_timer_t
SIMIX_timer_set(double date, F callback)
{
return SIMIX_timer_set(date, simgrid::xbt::Task<void()>(std::move(callback)));
}
template<class R, class T> inline
{
return SIMIX_timer_set(date, simgrid::xbt::Task<void()>(std::move(callback)));
}
template<class R, class T> inline
-
XBT_PUBLIC(smx_timer_t)
SIMIX_timer_set(double date, R(*callback)(T*), T* arg)
+
smx_timer_t
SIMIX_timer_set(double date, R(*callback)(T*), T* arg)
{
return SIMIX_timer_set(date, [=](){ callback(arg); });
}
{
return SIMIX_timer_set(date, [=](){ callback(arg); });
}