+/* smx_user.c - public interface to simix */
+
+/* Copyright (c) 2010, 2011. Da SimGrid team. All rights reserved. */
+
+/* This program is free software; you can redistribute it and/or modify it
+ * under the terms of the license (GNU LGPL) which comes with this package. */
+#ifndef _SVID_SOURCE
+# define _SVID_SOURCE /* strdup() */
+#endif
+#ifndef _ISOC99_SOURCE
+# define _ISOC99_SOURCE /* isfinite() */
+#endif
+#ifndef _ISO_C99_SOURCE
+# define _ISO_C99_SOURCE /* isfinite() */
+#endif
+#include <math.h> /* isfinite() */
+
#include "private.h"
+#include "mc/mc.h"
+
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix);
static const char* request_names[] = {
+#undef SIMIX_REQ_ENUM_ELEMENT
#define SIMIX_REQ_ENUM_ELEMENT(x) #x /* generate strings from the enumeration values */
-#include "smx_req_enum.h"
+SIMIX_REQ_LIST
#undef SIMIX_REQ_ENUM_ELEMENT
};
req->call = REQ_HOST_GET_BY_NAME;
req->host_get_by_name.name = name;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->host_get_by_name.result;
}
req->call = REQ_HOST_GET_NAME;
req->host_get_name.host = host;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->host_get_name.result;
}
req->call = REQ_HOST_GET_PROPERTIES;
req->host_get_properties.host = host;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->host_get_properties.result;
}
req->call = REQ_HOST_GET_SPEED;
req->host_get_speed.host = host;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->host_get_speed.result;
}
req->call = REQ_HOST_GET_AVAILABLE_SPEED;
req->host_get_available_speed.host = host;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->host_get_available_speed.result;
}
req->call = REQ_HOST_GET_STATE;
req->host_get_state.host = host;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->host_get_state.result;
}
req->call = REQ_HOST_GET_DATA;
req->host_get_data.host = host;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->host_get_data.result;
}
req->call = REQ_HOST_SET_DATA;
req->host_set_data.host = host;
req->host_set_data.data = data;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
}
/** \brief Creates an action that executes some computation of an host.
* \return A new SIMIX execution action
*/
smx_action_t SIMIX_req_host_execute(const char *name, smx_host_t host,
- double computation_amount)
+ double computation_amount,
+ double priority)
{
+ /* checking for infinite values */
+ xbt_assert(isfinite(computation_amount), "computation_amount is not finite!");
+ xbt_assert(isfinite(priority), "priority is not finite!");
+
smx_req_t req = SIMIX_req_mine();
req->call = REQ_HOST_EXECUTE;
req->host_execute.name = name;
req->host_execute.host = host;
req->host_execute.computation_amount = computation_amount;
- SIMIX_request_push();
+ req->host_execute.priority = priority;
+ SIMIX_request_push(req->issuer);
return req->host_execute.result;
}
double amount,
double rate)
{
+ int i,j;
+ /* checking for infinite values */
+ for (i = 0 ; i < host_nb ; ++i) {
+ xbt_assert(isfinite(computation_amount[i]), "computation_amount[%d] is not finite!", i);
+ for (j = 0 ; j < host_nb ; ++j) {
+ xbt_assert(isfinite(communication_amount[i + host_nb * j]),
+ "communication_amount[%d+%d*%d] is not finite!", i, host_nb, j);
+ }
+ }
+
+ xbt_assert(isfinite(amount), "amount is not finite!");
+ xbt_assert(isfinite(rate), "rate is not finite!");
+
smx_req_t req = SIMIX_req_mine();
req->call = REQ_HOST_PARALLEL_EXECUTE;
req->host_parallel_execute.communication_amount = communication_amount;
req->host_parallel_execute.amount = amount;
req->host_parallel_execute.rate = rate;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->host_parallel_execute.result;
}
req->call = REQ_HOST_EXECUTION_DESTROY;
req->host_execution_destroy.execution = execution;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
}
/**
req->call = REQ_HOST_EXECUTION_CANCEL;
req->host_execution_cancel.execution = execution;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
}
/**
req->call = REQ_HOST_EXECUTION_GET_REMAINS;
req->host_execution_get_remains.execution = execution;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->host_execution_get_remains.result;
}
req->call = REQ_HOST_EXECUTION_GET_STATE;
req->host_execution_get_state.execution = execution;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->host_execution_get_state.result;
}
*/
void SIMIX_req_host_execution_set_priority(smx_action_t execution, double priority)
{
+ /* checking for infinite values */
+ xbt_assert(isfinite(priority), "priority is not finite!");
+
smx_req_t req = SIMIX_req_mine();
req->call = REQ_HOST_EXECUTION_SET_PRIORITY;
req->host_execution_set_priority.execution = execution;
req->host_execution_set_priority.priority = priority;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
}
/**
- * \brief Waits for the completion of an execution action.
+ * \brief Waits for the completion of an execution action and destroy it.
*
* \param execution The execution action
*/
-void SIMIX_req_host_execution_wait(smx_action_t execution)
+e_smx_state_t SIMIX_req_host_execution_wait(smx_action_t execution)
{
smx_req_t req = SIMIX_req_mine();
req->call = REQ_HOST_EXECUTION_WAIT;
req->host_execution_wait.execution = execution;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
+ return req->host_execution_wait.result;
}
/**
* \brief Creates and runs a new SIMIX process.
*
- * The structure and the corresponding threada are created and put in the list of ready processes.
+ * The structure and the corresponding thread are created and put in the list of ready processes.
*
+ * \param process the process created will be stored in this pointer
* \param name a name for the process. It is for user-level information and can be NULL.
* \param code the main function of the process
* \param data a pointer to any data one may want to attach to the new object. It is for user-level information and can be NULL.
* \param argc first argument passed to \a code
* \param argv second argument passed to \a code
* \param properties the properties of the process
- * \return The new process
*/
-smx_process_t SIMIX_req_process_create(const char *name,
- xbt_main_func_t code,
- void *data,
- const char *hostname,
- int argc, char **argv,
- xbt_dict_t properties)
+void SIMIX_req_process_create(smx_process_t *process, const char *name,
+ xbt_main_func_t code,
+ void *data,
+ const char *hostname,
+ int argc, char **argv,
+ xbt_dict_t properties)
{
smx_req_t req = SIMIX_req_mine();
req->call = REQ_PROCESS_CREATE;
+ req->process_create.process = process;
req->process_create.name = name;
req->process_create.code = code;
req->process_create.data = data;
req->process_create.argc = argc;
req->process_create.argv = argv;
req->process_create.properties = properties;
- SIMIX_request_push();
- return req->process_create.result;
+ SIMIX_request_push(req->issuer);
}
/** \brief Kills a SIMIX process.
req->call = REQ_PROCESS_KILL;
req->process_kill.process = process;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
+}
+
+/** \brief Kills all SIMIX processes.
+ */
+void SIMIX_req_process_killall(void)
+{
+ smx_req_t req = SIMIX_req_mine();
+
+ req->call = REQ_PROCESS_KILLALL;
+ SIMIX_request_push(req->issuer);
+}
+
+/** \brief Cleans up a SIMIX process.
+ * \param process poor victim (must have already been killed)
+ */
+void SIMIX_req_process_cleanup(smx_process_t process)
+{
+ smx_req_t req = SIMIX_req_mine();
+
+ req->call = REQ_PROCESS_CLEANUP;
+ req->process_cleanup.process = process;
+ SIMIX_request_push(req->issuer);
}
/**
* \param source name of the previous host
* \param dest name of the new host
*/
-void SIMIX_req_process_change_host(smx_process_t process, const char *source, const char *dest)
+void SIMIX_req_process_change_host(smx_process_t process, smx_host_t dest)
{
smx_req_t req = SIMIX_req_mine();
req->call = REQ_PROCESS_CHANGE_HOST;
req->process_change_host.process = process;
- req->process_change_host.source = source;
req->process_change_host.dest = dest;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
}
/**
*/
void SIMIX_req_process_suspend(smx_process_t process)
{
+ xbt_assert(process, "Invalid parameters");
+
smx_req_t req = SIMIX_req_mine();
req->call = REQ_PROCESS_SUSPEND;
req->process_suspend.process = process;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
}
/**
req->call = REQ_PROCESS_RESUME;
req->process_resume.process = process;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
}
/**
smx_req_t req = SIMIX_req_mine();
req->call = REQ_PROCESS_COUNT;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->process_count.result;
}
/**
* \brief Return the user data of a #smx_process_t.
- *
- * This functions checks whether \a process is a valid pointer or not and return the user data associated to \a process if it is possible.
- * \param process SIMIX process
- * \return A void pointer to the user data
+ * \param process a SIMIX process
+ * \return the user data of this process
*/
void* SIMIX_req_process_get_data(smx_process_t process)
{
+ if (process == SIMIX_process_self()) {
+ /* avoid a request if this function is called by the process itself */
+ return SIMIX_process_get_data(process);
+ }
+
smx_req_t req = SIMIX_req_mine();
req->call = REQ_PROCESS_GET_DATA;
req->process_get_data.process = process;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->process_get_data.result;
}
*/
void SIMIX_req_process_set_data(smx_process_t process, void *data)
{
- smx_req_t req = SIMIX_req_mine();
+ if (process == SIMIX_process_self()) {
+ /* avoid a request if this function is called by the process itself */
+ SIMIX_process_self_set_data(process, data);
+ }
+ else {
+
+ smx_req_t req = SIMIX_req_mine();
- req->call = REQ_PROCESS_SET_DATA;
- req->process_set_data.process = process;
- req->process_set_data.data = data;
- SIMIX_request_push();
+ req->call = REQ_PROCESS_SET_DATA;
+ req->process_set_data.process = process;
+ req->process_set_data.data = data;
+ SIMIX_request_push(req->issuer);
+ }
}
/**
req->call = REQ_PROCESS_GET_HOST;
req->process_get_host.process = process;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->process_get_host.result;
}
*/
const char* SIMIX_req_process_get_name(smx_process_t process)
{
+ if (process == SIMIX_process_self()) {
+ /* avoid a request if this function is called by the process itself */
+ return process->name;
+ }
+
smx_req_t req = SIMIX_req_mine();
req->call = REQ_PROCESS_GET_NAME;
req->process_get_name.process = process;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->process_get_name.result;
}
req->call = REQ_PROCESS_IS_SUSPENDED;
req->process_is_suspended.process = process;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->process_is_suspended.result;
}
req->call = REQ_PROCESS_GET_PROPERTIES;
req->process_get_properties.process = process;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->process_get_properties.result;
}
*/
e_smx_state_t SIMIX_req_process_sleep(double duration)
{
+ /* checking for infinite values */
+ xbt_assert(isfinite(duration), "duration is not finite!");
+
smx_req_t req = SIMIX_req_mine();
req->call = REQ_PROCESS_SLEEP;
req->process_sleep.duration = duration;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->process_sleep.result;
}
req->call = REQ_RDV_CREATE;
req->rdv_create.name = name;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->rdv_create.result;
}
req->call = REQ_RDV_DESTROY;
req->rdv_destroy.rdv = rdv;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
}
smx_rdv_t SIMIX_req_rdv_get_by_name(const char *name)
{
- xbt_assert0(name != NULL, "Invalid parameter for SIMIX_req_rdv_get_by_name (name is NULL)");
- smx_req_t req = SIMIX_req_mine();
+ xbt_assert(name != NULL, "Invalid parameter for SIMIX_req_rdv_get_by_name (name is NULL)");
+ /* FIXME: this is a horrible lost of performance, so we hack it out by
+ * skipping the request (for now). It won't work on distributed but
+ * probably we will change MSG for that. */
+/*
+ smx_req_t req = SIMIX_req_mine();
req->call = REQ_RDV_GEY_BY_NAME;
req->rdv_get_by_name.name = name;
- SIMIX_request_push();
- return req->rdv_get_by_name.result;
+ SIMIX_request_push(req->issuer);
+ return req->rdv_get_by_name.result;*/
+
+ return SIMIX_rdv_get_by_name(name);
}
/**
req->rdv_comm_count_by_host.rdv = rdv;
req->rdv_comm_count_by_host.host = host;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->rdv_comm_count_by_host.result;
}
req->call = REQ_RDV_GET_HEAD;
req->rdv_get_head.rdv = rdv;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->rdv_get_head.result;
}
+void SIMIX_req_comm_send(smx_rdv_t rdv, double task_size, double rate,
+ void *src_buff, size_t src_buff_size,
+ int (*match_fun)(void *, void *), void *data,
+ double timeout)
+{
+ /* checking for infinite values */
+ xbt_assert(isfinite(task_size), "task_size is not finite!");
+ xbt_assert(isfinite(rate), "rate is not finite!");
+ xbt_assert(isfinite(timeout), "timeout is not finite!");
+
+ xbt_assert(rdv, "No rendez-vous point defined for send");
+
+ if (MC_IS_ENABLED) {
+ /* the model-checker wants two separate requests */
+ smx_action_t comm = SIMIX_req_comm_isend(rdv, task_size, rate,
+ src_buff, src_buff_size, match_fun, NULL, data, 0);
+ SIMIX_req_comm_wait(comm, timeout);
+ }
+ else {
+ smx_req_t req = SIMIX_req_mine();
+
+ req->call = REQ_COMM_SEND;
+ req->comm_send.rdv = rdv;
+ req->comm_send.task_size = task_size;
+ req->comm_send.rate = rate;
+ req->comm_send.src_buff = src_buff;
+ req->comm_send.src_buff_size = src_buff_size;
+ req->comm_send.match_fun = match_fun;
+ req->comm_send.data = data;
+ req->comm_send.timeout = timeout;
+
+ SIMIX_request_push(req->issuer);
+ }
+}
+
smx_action_t SIMIX_req_comm_isend(smx_rdv_t rdv, double task_size, double rate,
void *src_buff, size_t src_buff_size,
- int (*match_fun)(void *, void *), void *data)
+ int (*match_fun)(void *, void *),
+ void (*clean_fun)(void *),
+ void *data,
+ int detached)
{
- smx_req_t req = SIMIX_req_mine();
+ /* checking for infinite values */
+ xbt_assert(isfinite(task_size), "task_size is not finite!");
+ xbt_assert(isfinite(rate), "rate is not finite!");
+
+ xbt_assert(rdv, "No rendez-vous point defined for isend");
- xbt_assert0(rdv, "No rendez-vous point defined for isend");
+ smx_req_t req = SIMIX_req_mine();
req->call = REQ_COMM_ISEND;
req->comm_isend.rdv = rdv;
req->comm_isend.src_buff = src_buff;
req->comm_isend.src_buff_size = src_buff_size;
req->comm_isend.match_fun = match_fun;
+ req->comm_isend.clean_fun = clean_fun;
req->comm_isend.data = data;
+ req->comm_isend.detached = detached;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->comm_isend.result;
}
+void SIMIX_req_comm_recv(smx_rdv_t rdv, void *dst_buff, size_t * dst_buff_size,
+ int (*match_fun)(void *, void *), void *data, double timeout)
+{
+ xbt_assert(isfinite(timeout), "timeout is not finite!");
+ xbt_assert(rdv, "No rendez-vous point defined for recv");
+
+ if (MC_IS_ENABLED) {
+ /* the model-checker wants two separate requests */
+ smx_action_t comm = SIMIX_req_comm_irecv(rdv, dst_buff, dst_buff_size,
+ match_fun, data);
+ SIMIX_req_comm_wait(comm, timeout);
+ }
+ else {
+ smx_req_t req = SIMIX_req_mine();
+
+ req->call = REQ_COMM_RECV;
+ req->comm_recv.rdv = rdv;
+ req->comm_recv.dst_buff = dst_buff;
+ req->comm_recv.dst_buff_size = dst_buff_size;
+ req->comm_recv.match_fun = match_fun;
+ req->comm_recv.data = data;
+ req->comm_recv.timeout = timeout;
+
+ SIMIX_request_push(req->issuer);
+ }
+}
+
smx_action_t SIMIX_req_comm_irecv(smx_rdv_t rdv, void *dst_buff, size_t * dst_buff_size,
- int (*match_fun)(void *, void *), void *data)
+ int (*match_fun)(void *, void *), void *data)
{
- smx_req_t req = SIMIX_req_mine();
+ xbt_assert(rdv, "No rendez-vous point defined for irecv");
- xbt_assert0(rdv, "No rendez-vous point defined for isend");
+ smx_req_t req = SIMIX_req_mine();
req->call = REQ_COMM_IRECV;
req->comm_irecv.rdv = rdv;
req->comm_irecv.match_fun = match_fun;
req->comm_irecv.data = data;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->comm_irecv.result;
}
void SIMIX_req_comm_destroy(smx_action_t comm)
{
+ xbt_assert(comm, "Invalid parameter");
+
+ /* FIXME remove this request type: comms are auto-destroyed now */
+
+ /*
smx_req_t req = SIMIX_req_mine();
req->call = REQ_COMM_DESTROY;
req->comm_destroy.comm = comm;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
+ */
}
void SIMIX_req_comm_cancel(smx_action_t comm)
req->call = REQ_COMM_CANCEL;
req->comm_cancel.comm = comm;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
}
unsigned int SIMIX_req_comm_waitany(xbt_dynar_t comms)
req->call = REQ_COMM_WAITANY;
req->comm_waitany.comms = comms;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->comm_waitany.result;
}
int SIMIX_req_comm_testany(xbt_dynar_t comms)
{
smx_req_t req = SIMIX_req_mine();
- if (xbt_dynar_length(comms)==0)
+ if (xbt_dynar_is_empty(comms))
return -1;
req->call = REQ_COMM_TESTANY;
req->comm_testany.comms = comms;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->comm_testany.result;
}
void SIMIX_req_comm_wait(smx_action_t comm, double timeout)
{
+ xbt_assert(isfinite(timeout), "timeout is not finite!");
+
smx_req_t req = SIMIX_req_mine();
req->call = REQ_COMM_WAIT;
req->comm_wait.comm = comm;
req->comm_wait.timeout = timeout;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
}
#ifdef HAVE_TRACING
req->set_category.action = action;
req->set_category.category = category;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
}
#endif
req->call = REQ_COMM_TEST;
req->comm_test.comm = comm;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->comm_test.result;
}
req->call = REQ_COMM_GET_REMAINS;
req->comm_get_remains.comm = comm;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->comm_get_remains.result;
}
req->call = REQ_COMM_GET_STATE;
req->comm_get_state.comm = comm;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->comm_get_state.result;
}
req->call = REQ_COMM_GET_SRC_DATA;
req->comm_get_src_data.comm = comm;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->comm_get_src_data.result;
}
req->call = REQ_COMM_GET_DST_DATA;
req->comm_get_dst_data.comm = comm;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->comm_get_dst_data.result;
}
-void *SIMIX_req_comm_get_src_buff(smx_action_t comm)
-{
- smx_req_t req = SIMIX_req_mine();
-
- req->call = REQ_COMM_GET_SRC_BUFF;
- req->comm_get_src_buff.comm = comm;
-
- SIMIX_request_push();
- return req->comm_get_src_buff.result;
-}
-
-void *SIMIX_req_comm_get_dst_buff(smx_action_t comm)
-{
- smx_req_t req = SIMIX_req_mine();
-
- req->call = REQ_COMM_GET_DST_BUFF;
- req->comm_get_dst_buff.comm = comm;
-
- SIMIX_request_push();
- return req->comm_get_dst_buff.result;
-}
-
-size_t SIMIX_req_comm_get_src_buff_size(smx_action_t comm)
-{
- smx_req_t req = SIMIX_req_mine();
-
- req->call = REQ_COMM_GET_SRC_BUFF_SIZE;
- req->comm_get_src_buff_size.comm = comm;
-
- SIMIX_request_push();
- return req->comm_get_src_buff_size.result;
-}
-
-size_t SIMIX_req_comm_get_dst_buff_size(smx_action_t comm)
-{
- smx_req_t req = SIMIX_req_mine();
-
- req->call = REQ_COMM_GET_DST_BUFF_SIZE;
- req->comm_get_dst_buff_size.comm = comm;
-
- SIMIX_request_push();
- return req->comm_get_dst_buff_size.result;
-}
-
smx_process_t SIMIX_req_comm_get_src_proc(smx_action_t comm)
{
smx_req_t req = SIMIX_req_mine();
req->call = REQ_COMM_GET_SRC_PROC;
req->comm_get_src_proc.comm = comm;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->comm_get_src_proc.result;
}
req->call = REQ_COMM_GET_DST_PROC;
req->comm_get_dst_proc.comm = comm;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->comm_get_dst_proc.result;
}
req->call = REQ_COMM_IS_LATENCY_BOUNDED;
req->comm_is_latency_bounded.comm = comm;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->comm_is_latency_bounded.result;
}
#endif
req->call = REQ_MUTEX_INIT;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->mutex_init.result;
}
req->call = REQ_MUTEX_DESTROY;
req->mutex_destroy.mutex = mutex;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
}
void SIMIX_req_mutex_lock(smx_mutex_t mutex)
req->call = REQ_MUTEX_LOCK;
req->mutex_lock.mutex = mutex;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
}
int SIMIX_req_mutex_trylock(smx_mutex_t mutex)
req->call = REQ_MUTEX_TRYLOCK;
req->mutex_trylock.mutex = mutex;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->mutex_trylock.result;
}
req->call = REQ_MUTEX_UNLOCK;
req->mutex_unlock.mutex = mutex;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
}
req->call = REQ_COND_INIT;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->cond_init.result;
}
req->call = REQ_COND_DESTROY;
req->cond_destroy.cond = cond;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
}
void SIMIX_req_cond_signal(smx_cond_t cond)
req->call = REQ_COND_SIGNAL;
req->cond_signal.cond = cond;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
}
void SIMIX_req_cond_wait(smx_cond_t cond, smx_mutex_t mutex)
req->cond_wait.cond = cond;
req->cond_wait.mutex = mutex;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
}
void SIMIX_req_cond_wait_timeout(smx_cond_t cond,
smx_mutex_t mutex,
double timeout)
{
+ xbt_assert(isfinite(timeout), "timeout is not finite!");
+
smx_req_t req = SIMIX_req_mine();
req->call = REQ_COND_WAIT_TIMEOUT;
req->cond_wait_timeout.mutex = mutex;
req->cond_wait_timeout.timeout = timeout;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
}
void SIMIX_req_cond_broadcast(smx_cond_t cond)
req->call = REQ_COND_BROADCAST;
req->cond_broadcast.cond = cond;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
}
req->call = REQ_SEM_INIT;
req->sem_init.capacity = capacity;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->sem_init.result;
}
req->call = REQ_SEM_DESTROY;
req->sem_destroy.sem = sem;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
}
void SIMIX_req_sem_release(smx_sem_t sem)
req->call = REQ_SEM_RELEASE;
req->sem_release.sem = sem;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
}
int SIMIX_req_sem_would_block(smx_sem_t sem)
req->call = REQ_SEM_WOULD_BLOCK;
req->sem_would_block.sem = sem;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->sem_would_block.result;
}
req->call = REQ_SEM_ACQUIRE;
req->sem_acquire.sem = sem;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
}
void SIMIX_req_sem_acquire_timeout(smx_sem_t sem, double timeout)
{
+ xbt_assert(isfinite(timeout), "timeout is not finite!");
+
smx_req_t req = SIMIX_req_mine();
req->call = REQ_SEM_ACQUIRE_TIMEOUT;
req->sem_acquire_timeout.sem = sem;
req->sem_acquire_timeout.timeout = timeout;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
}
int SIMIX_req_sem_get_capacity(smx_sem_t sem)
req->call = REQ_SEM_GET_CAPACITY;
req->sem_get_capacity.sem = sem;
- SIMIX_request_push();
+ SIMIX_request_push(req->issuer);
return req->sem_get_capacity.result;
}
+
+void SIMIX_req_file_read(char* name)
+{
+ smx_req_t req = SIMIX_req_mine();
+
+ req->call = REQ_FILE_READ;
+ req->file_read.name = name;
+ SIMIX_request_push(req->issuer);
+
+}
+
/* ************************************************************************** */
/** @brief returns a printable string representing the request kind */
