simcall_BODY_process_cleanup(process);
}
-/**
- * \ingroup simix_process_management
- * \brief Migrates an agent to another location.
- *
- * This function changes the value of the host on which \a process is running.
- *
- * \param process the process to migrate
- * \param dest name of the new host
- */
-void simcall_process_set_host(smx_actor_t process, sg_host_t dest)
-{
- simcall_BODY_process_set_host(process, dest);
-}
-
void simcall_process_join(smx_actor_t process, double timeout)
{
simcall_BODY_process_join(process, timeout);
simcall_BODY_process_suspend(process);
}
-/**
- * \ingroup simix_process_management
- * \brief Resumes a suspended process.
- *
- * This function resumes a suspended process by resuming the synchro
- * it was waiting for completion.
- *
- * \param process a SIMIX process
- */
-void simcall_process_resume(smx_actor_t process)
-{
- simcall_BODY_process_resume(process);
-}
-
/**
* \ingroup simix_process_management
* \brief Returns the amount of SIMIX processes in the system
*/
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); });
}
/**
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;
});
}
-/**
- * \ingroup simix_process_management
- * \brief Get the kill time of a process (or 0 if unset).
- */
-double simcall_process_get_kill_time(smx_actor_t process) {
- return SIMIX_timer_get_date(process->kill_timer);
-}
-
-/**
- * \ingroup simix_process_management
- * \brief Returns true if the process is suspended .
- *
- * This checks whether a process is suspended or not by inspecting the task on which it was waiting for the completion.
- * \param process SIMIX process
- * \return 1, if the process is suspended, else 0.
- */
-int simcall_process_is_suspended(smx_actor_t process)
-{
- return simcall_BODY_process_is_suspended(process);
-}
/**
* \ingroup simix_process_management
* \brief Return the properties
*
- * This functions returns the properties associated with this process
+ * This function returns the properties associated with this process
*/
xbt_dict_t simcall_process_get_properties(smx_actor_t process)
{
- return SIMIX_process_get_properties(process);
+ return process->properties;
}
/**
* \ingroup simix_process_management
{
simcall_BODY_process_on_exit(process, fun, data);
}
-/**
- * \ingroup simix_process_management
- * \brief Sets the process to be auto-restarted or not by SIMIX when its host comes back up.
- * Will restart the process when the host comes back up if auto_restart is set to 1.
- */
-
-XBT_PUBLIC(void) simcall_process_auto_restart_set(smx_actor_t process, int auto_restart)
-{
- simcall_BODY_process_auto_restart_set(process, auto_restart);
-}
/**
* \ingroup simix_process_management
/**
* \ingroup simix_comm_management
*/
-void simcall_comm_send(smx_actor_t sender, smx_mailbox_t mbox, double task_size, double rate,
- void *src_buff, size_t src_buff_size,
- int (*match_fun)(void *, void *, smx_activity_t),
- void (*copy_data_fun)(smx_activity_t, void*, size_t), void *data,
- double timeout)
+void simcall_comm_send(smx_actor_t sender, smx_mailbox_t mbox, double 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)
{
/* checking for infinite values */
xbt_assert(std::isfinite(task_size), "task_size is not finite!");
/**
* \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, size_t src_buff_size,
- int (*match_fun)(void *, void *, smx_activity_t),
- void (*clean_fun)(void *),
- void (*copy_data_fun)(smx_activity_t, void*, size_t),
- void *data,
- int detached)
+smx_activity_t simcall_comm_isend(smx_actor_t sender, smx_mailbox_t mbox, double 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),
+ void* data, int detached)
{
/* checking for infinite values */
xbt_assert(std::isfinite(task_size), "task_size is not finite!");
/**
* \ingroup simix_comm_management
*/
-void simcall_comm_recv(smx_actor_t receiver, smx_mailbox_t mbox, void *dst_buff, size_t * dst_buff_size,
- int (*match_fun)(void *, void *, smx_activity_t),
- void (*copy_data_fun)(smx_activity_t, void*, size_t),
- void *data, double timeout, double rate)
+void simcall_comm_recv(smx_actor_t receiver, smx_mailbox_t mbox, void* dst_buff, size_t* dst_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, double rate)
{
xbt_assert(std::isfinite(timeout), "timeout is not finite!");
xbt_assert(mbox, "No rendez-vous point defined for recv");
/**
* \ingroup simix_comm_management
*/
-smx_activity_t simcall_comm_irecv(smx_actor_t receiver, smx_mailbox_t mbox, void *dst_buff, size_t *dst_buff_size,
- int (*match_fun)(void *, void *, smx_activity_t),
- void (*copy_data_fun)(smx_activity_t, void*, size_t),
- void *data, double rate)
+smx_activity_t simcall_comm_irecv(smx_actor_t receiver, smx_mailbox_t mbox, void* dst_buff, size_t* dst_buff_size,
+ int (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*),
+ void (*copy_data_fun)(smx_activity_t, void*, size_t), void* data, double rate)
{
xbt_assert(mbox, "No rendez-vous point defined for irecv");
/**
* \ingroup simix_comm_management
*/
-smx_activity_t simcall_comm_iprobe(smx_mailbox_t mbox, int type, int src, int tag,
- int (*match_fun)(void *, void *, smx_activity_t), void *data)
+smx_activity_t simcall_comm_iprobe(smx_mailbox_t mbox, int type,
+ int (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*), void* data)
{
xbt_assert(mbox, "No rendez-vous point defined for iprobe");
- return simcall_BODY_comm_iprobe(mbox, type, src, tag, match_fun, data);
+ return simcall_BODY_comm_iprobe(mbox, type, match_fun, data);
}
/**
* \ingroup simix_file_management
*
*/
-sg_size_t simcall_file_read(smx_file_t fd, sg_size_t size, sg_host_t host)
-{
- return simcall_BODY_file_read(fd, size, host);
-}
-
-/**
- * \ingroup simix_file_management
- *
- */
-sg_size_t simcall_file_write(smx_file_t fd, sg_size_t size, sg_host_t host)
-{
- return simcall_BODY_file_write(fd, size, host);
-}
-
-/**
- * \ingroup simix_file_management
- * \brief
- */
-smx_file_t simcall_file_open(const char* fullpath, sg_host_t host)
-{
- return simcall_BODY_file_open(fullpath, host);
-}
-
-/**
- * \ingroup simix_file_management
- *
- */
-int simcall_file_close(smx_file_t fd, sg_host_t host)
-{
- return simcall_BODY_file_close(fd, host);
-}
-
-/**
- * \ingroup simix_file_management
- *
- */
-int simcall_file_unlink(smx_file_t fd, sg_host_t host)
-{
- return simcall_BODY_file_unlink(fd, host);
-}
-
-/**
- * \ingroup simix_file_management
- *
- */
-sg_size_t simcall_file_get_size(smx_file_t fd){
- return simcall_BODY_file_get_size(fd);
-}
-
-/**
- * \ingroup simix_file_management
- *
- */
-sg_size_t simcall_file_tell(smx_file_t fd){
- return simcall_BODY_file_tell(fd);
-}
-
-/**
- * \ingroup simix_file_management
- *
- */
-xbt_dynar_t simcall_file_get_info(smx_file_t fd)
+sg_size_t simcall_file_read(surf_file_t fd, sg_size_t size)
{
- return simcall_BODY_file_get_info(fd);
-}
-
-/**
- * \ingroup simix_file_management
- *
- */
-int simcall_file_seek(smx_file_t fd, sg_offset_t offset, int origin){
- return simcall_BODY_file_seek(fd, offset, origin);
+ return simcall_BODY_file_read(fd, size);
}
/**
* \ingroup simix_file_management
- * \brief Move a file to another location on the *same mount point*.
*
*/
-int simcall_file_move(smx_file_t fd, const char* fullpath)
+sg_size_t simcall_file_write(surf_file_t fd, sg_size_t size)
{
- return simcall_BODY_file_move(fd, fullpath);
+ return simcall_BODY_file_write(fd, size);
}
void simcall_run_kernel(std::function<void()> const& code)
