X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6dfbeafc01f45baadb4214d15cd0c703887d743e..921453365eae0f6cd258bdd70cef68ad2b6865c1:/src/simix/libsmx.cpp diff --git a/src/simix/libsmx.cpp b/src/simix/libsmx.cpp index c3bfd8dab7..47b9266843 100644 --- a/src/simix/libsmx.cpp +++ b/src/simix/libsmx.cpp @@ -229,7 +229,7 @@ int simcall_process_count() */ void simcall_process_set_data(smx_actor_t process, void *data) { - simgrid::simix::kernelImmediate(std::bind(SIMIX_process_set_data, process, data)); + simgrid::simix::kernelImmediate([process, data] { process->setUserData(data); }); } /** @@ -241,7 +241,7 @@ void simcall_process_set_kill_time(smx_actor_t process, double kill_time) if (kill_time <= SIMIX_get_clock() || simix_global->kill_process_function == nullptr) return; - XBT_DEBUG("Set kill time %f for process %s@%s", kill_time, process->cname(), process->host->cname()); + XBT_DEBUG("Set kill time %f for process %s@%s", kill_time, process->cname(), process->host->getCname()); process->kill_timer = SIMIX_timer_set(kill_time, [=] { simix_global->kill_process_function(process); process->kill_timer=nullptr; @@ -257,7 +257,6 @@ void simcall_process_set_kill_time(smx_actor_t process, double kill_time) xbt_dict_t simcall_process_get_properties(smx_actor_t process) { return process->properties; - ; } /** * \ingroup simix_process_management @@ -308,7 +307,7 @@ e_smx_state_t simcall_process_sleep(double duration) /** * \ingroup simix_comm_management */ -void simcall_comm_send(smx_actor_t sender, smx_mailbox_t mbox, double task_size, double rate, void* src_buff, +void simcall_comm_send(smx_actor_t sender, smx_mailbox_t mbox, size_t task_size, double rate, void* src_buff, size_t src_buff_size, int (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*), void (*copy_data_fun)(smx_activity_t, void*, size_t), void* data, double timeout) { @@ -336,7 +335,7 @@ void simcall_comm_send(smx_actor_t sender, smx_mailbox_t mbox, double task_size, /** * \ingroup simix_comm_management */ -smx_activity_t simcall_comm_isend(smx_actor_t sender, smx_mailbox_t mbox, double task_size, double rate, void* src_buff, +smx_activity_t simcall_comm_isend(smx_actor_t sender, smx_mailbox_t mbox, size_t task_size, double rate, void* src_buff, size_t src_buff_size, int (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*), void (*clean_fun)(void*), void (*copy_data_fun)(smx_activity_t, void*, size_t),