* \ingroup simix_process_management
* \brief Kills all SIMIX processes.
*/
-void simcall_process_killall(void)
+void simcall_process_killall(int reset_pid)
{
- simcall_BODY_process_killall();
+ simcall_BODY_process_killall(reset_pid);
}
/**
return simcall_BODY_process_count();
}
+/**
+ * \ingroup simix_process_management
+ * \brief Return the PID of a #smx_process_t.
+ * \param process a SIMIX process
+ * \return the PID of this process
+ */
+int simcall_process_get_PID(smx_process_t process)
+{
+ if (process == SIMIX_process_self()) {
+ /* avoid a simcall if this function is called by the process itself */
+ return SIMIX_process_get_PID(process);
+ }
+
+ return simcall_BODY_process_get_PID(process);
+}
+
+/**
+ * \ingroup simix_process_management
+ * \brief Return the parent PID of a #smx_process_t.
+ * \param process a SIMIX process
+ * \return the PID of this process parenrt
+ */
+int simcall_process_get_PPID(smx_process_t process)
+{
+ if (process == SIMIX_process_self()) {
+ /* avoid a simcall if this function is called by the process itself */
+ return SIMIX_process_get_PPID(process);
+ }
+
+ return simcall_BODY_process_get_PPID(process);
+}
+
/**
* \ingroup simix_process_management
* \brief Return the user data of a #smx_process_t.
if (kill_time > SIMIX_get_clock()) {
if (simix_global->kill_process_function) {
XBT_DEBUG("Set kill time %f for process %s(%s)",kill_time, process->name,
- process->smx_host->name);
+ sg_host_name(process->smx_host));
SIMIX_timer_set(kill_time, simix_global->kill_process_function, process);
}
}
{
xbt_assert(name != NULL, "Invalid parameter for simcall_rdv_get_by_name (name is NULL)");
- /* FIXME: this is a horrible lost of performance, so we hack it out by
+ /* FIXME: this is a horrible loss of performance, so we hack it out by
* skipping the simcall (for now). It works in parallel, it won't work on
* distributed but probably we will change MSG for that. */
}
+/**
+ * \ingroup simix_comm_management
+ */
+void simcall_comm_recv_bounded(smx_rdv_t rdv, void *dst_buff, size_t * dst_buff_size,
+ int (*match_fun)(void *, void *, smx_action_t), void *data, double timeout, double rate)
+{
+ xbt_assert(isfinite(timeout), "timeout is not finite!");
+ xbt_assert(rdv, "No rendez-vous point defined for recv");
+
+ if (MC_is_active()) {
+ /* the model-checker wants two separate simcalls */
+ smx_action_t comm = simcall_comm_irecv_bounded(rdv, dst_buff, dst_buff_size,
+ match_fun, data, rate);
+ simcall_comm_wait(comm, timeout);
+ }
+ else {
+ simcall_BODY_comm_recv_bounded(rdv, dst_buff, dst_buff_size,
+ match_fun, data, timeout, rate);
+ }
+}
+/**
+ * \ingroup simix_comm_management
+ */
+smx_action_t simcall_comm_irecv_bounded(smx_rdv_t rdv, void *dst_buff, size_t *dst_buff_size,
+ int (*match_fun)(void *, void *, smx_action_t), void *data, double rate)
+{
+ xbt_assert(rdv, "No rendez-vous point defined for irecv");
+
+ return simcall_BODY_comm_irecv_bounded(rdv, dst_buff, dst_buff_size,
+ match_fun, data, rate);
+}
+
+
/**
* \ingroup simix_comm_management
*/
* \ingroup simix_file_management
*
*/
-double simcall_file_read(void* ptr, size_t size, size_t nmemb, smx_file_t stream)
+size_t simcall_file_read(void* ptr, size_t size, smx_file_t fd)
{
- return simcall_BODY_file_read(ptr, size, nmemb, stream);
+ return simcall_BODY_file_read(ptr, size, fd);
}
/**
* \ingroup simix_file_management
*
*/
-size_t simcall_file_write(const void* ptr, size_t size, size_t nmemb, smx_file_t stream)
+size_t simcall_file_write(const void* ptr, size_t size,
+ smx_file_t fd)
{
- return simcall_BODY_file_write(ptr, size, nmemb, stream);
+ return simcall_BODY_file_write(ptr, size, fd);
}
/**
* \ingroup simix_file_management
* \brief
*/
-smx_file_t simcall_file_open(const char* mount, const char* path, const char* mode)
+smx_file_t simcall_file_open(const char* mount, const char* path)
{
- return simcall_BODY_file_open(mount, path, mode);
+ return simcall_BODY_file_open(mount, path);
}
/**
* \ingroup simix_file_management
*
*/
-int simcall_file_close(smx_file_t fp)
+int simcall_file_close(smx_file_t fd)
{
- return simcall_BODY_file_close(fp);
+ return simcall_BODY_file_close(fd);
}
/**
* \ingroup simix_file_management
*
*/
-int simcall_file_stat(smx_file_t fd, s_file_stat_t *buf)
+int simcall_file_unlink(smx_file_t fd)
{
- return simcall_BODY_file_stat(fd, buf);
+ return simcall_BODY_file_unlink(fd);
}
/**
* \ingroup simix_file_management
*
*/
-int simcall_file_unlink(smx_file_t fd)
+xbt_dict_t simcall_file_ls(const char* mount, const char* path)
{
- return simcall_BODY_file_unlink(fd);
+ return simcall_BODY_file_ls(mount, path);
}
-
/**
* \ingroup simix_file_management
*
*/
-xbt_dict_t simcall_file_ls(const char* mount, const char* path)
-{
- return simcall_BODY_file_ls(mount, path);
+size_t simcall_file_get_size (smx_file_t fd){
+ return simcall_BODY_file_get_size(fd);
}
#ifdef HAVE_MC
return simcall_BODY_mc_compare_snapshots(s1, s2);
}
+int simcall_mc_random(void)
+{
+ return simcall_BODY_mc_random();
+}
+
+
#endif /* HAVE_MC */
/* ****************************************************************************************** */
