X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b65f44359644f1fdbe91077e7d379453a16f857a..b9d8ff0f5f0819d9103795c70ed49534d695f8ba:/src/simix/smx_user.c diff --git a/src/simix/smx_user.c b/src/simix/smx_user.c index 5b58220cc7..abc1d02ab6 100644 --- a/src/simix/smx_user.c +++ b/src/simix/smx_user.c @@ -1,6 +1,24 @@ +/* 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 /* isfinite() */ + #include "private.h" #include "mc/mc.h" + XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix); static const char* request_names[] = { @@ -22,7 +40,7 @@ smx_host_t SIMIX_req_host_get_by_name(const char *name) 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; } @@ -38,7 +56,7 @@ const char* SIMIX_req_host_get_name(smx_host_t host) 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; } @@ -54,7 +72,7 @@ xbt_dict_t SIMIX_req_host_get_properties(smx_host_t host) 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; } @@ -71,7 +89,7 @@ double SIMIX_req_host_get_speed(smx_host_t host) 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; } @@ -86,7 +104,7 @@ double SIMIX_req_host_get_available_speed(smx_host_t host) 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; } @@ -103,7 +121,7 @@ int SIMIX_req_host_get_state(smx_host_t host) 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; } @@ -119,7 +137,7 @@ void* SIMIX_req_host_get_data(smx_host_t host) 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; } @@ -137,7 +155,7 @@ void SIMIX_req_host_set_data(smx_host_t host, void *data) 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. @@ -154,6 +172,10 @@ smx_action_t SIMIX_req_host_execute(const char *name, smx_host_t host, 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; @@ -161,7 +183,7 @@ smx_action_t SIMIX_req_host_execute(const char *name, smx_host_t host, req->host_execute.host = host; req->host_execute.computation_amount = computation_amount; req->host_execute.priority = priority; - SIMIX_request_push(); + SIMIX_request_push(req->issuer); return req->host_execute.result; } @@ -186,6 +208,19 @@ smx_action_t SIMIX_req_host_parallel_execute(const char *name, 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; @@ -196,7 +231,7 @@ smx_action_t SIMIX_req_host_parallel_execute(const char *name, 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; } @@ -212,7 +247,7 @@ void SIMIX_req_host_execution_destroy(smx_action_t execution) req->call = REQ_HOST_EXECUTION_DESTROY; req->host_execution_destroy.execution = execution; - SIMIX_request_push(); + SIMIX_request_push(req->issuer); } /** @@ -227,7 +262,7 @@ void SIMIX_req_host_execution_cancel(smx_action_t execution) req->call = REQ_HOST_EXECUTION_CANCEL; req->host_execution_cancel.execution = execution; - SIMIX_request_push(); + SIMIX_request_push(req->issuer); } /** @@ -242,7 +277,7 @@ double SIMIX_req_host_execution_get_remains(smx_action_t execution) 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; } @@ -258,7 +293,7 @@ e_smx_state_t SIMIX_req_host_execution_get_state(smx_action_t execution) 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; } @@ -271,12 +306,15 @@ e_smx_state_t SIMIX_req_host_execution_get_state(smx_action_t execution) */ 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); } /** @@ -290,7 +328,7 @@ e_smx_state_t SIMIX_req_host_execution_wait(smx_action_t execution) 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; } @@ -327,7 +365,7 @@ void SIMIX_req_process_create(smx_process_t *process, const char *name, req->process_create.argc = argc; req->process_create.argv = argv; req->process_create.properties = properties; - SIMIX_request_push(); + SIMIX_request_push(req->issuer); } /** \brief Kills a SIMIX process. @@ -342,7 +380,7 @@ void SIMIX_req_process_kill(smx_process_t process) req->call = REQ_PROCESS_KILL; req->process_kill.process = process; - SIMIX_request_push(); + SIMIX_request_push(req->issuer); } /** \brief Kills all SIMIX processes. @@ -352,7 +390,7 @@ void SIMIX_req_process_killall(void) smx_req_t req = SIMIX_req_mine(); req->call = REQ_PROCESS_KILLALL; - SIMIX_request_push(); + SIMIX_request_push(req->issuer); } /** \brief Cleans up a SIMIX process. @@ -364,7 +402,7 @@ void SIMIX_req_process_cleanup(smx_process_t process) req->call = REQ_PROCESS_CLEANUP; req->process_cleanup.process = process; - SIMIX_request_push(); + SIMIX_request_push(req->issuer); } /** @@ -383,7 +421,7 @@ void SIMIX_req_process_change_host(smx_process_t process, smx_host_t dest) req->call = REQ_PROCESS_CHANGE_HOST; req->process_change_host.process = process; req->process_change_host.dest = dest; - SIMIX_request_push(); + SIMIX_request_push(req->issuer); } /** @@ -402,7 +440,7 @@ void SIMIX_req_process_suspend(smx_process_t process) req->call = REQ_PROCESS_SUSPEND; req->process_suspend.process = process; - SIMIX_request_push(); + SIMIX_request_push(req->issuer); } /** @@ -419,7 +457,7 @@ void SIMIX_req_process_resume(smx_process_t process) req->call = REQ_PROCESS_RESUME; req->process_resume.process = process; - SIMIX_request_push(); + SIMIX_request_push(req->issuer); } /** @@ -432,29 +470,27 @@ int SIMIX_req_process_count(void) 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_self_get_data(); + 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; } @@ -469,7 +505,7 @@ void SIMIX_req_process_set_data(smx_process_t process, void *data) { if (process == SIMIX_process_self()) { /* avoid a request if this function is called by the process itself */ - SIMIX_process_self_set_data(data); + SIMIX_process_self_set_data(process, data); } else { @@ -478,7 +514,7 @@ void SIMIX_req_process_set_data(smx_process_t process, void *data) req->call = REQ_PROCESS_SET_DATA; req->process_set_data.process = process; req->process_set_data.data = data; - SIMIX_request_push(); + SIMIX_request_push(req->issuer); } } @@ -495,7 +531,7 @@ smx_host_t SIMIX_req_process_get_host(smx_process_t process) 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; } @@ -517,7 +553,7 @@ const char* SIMIX_req_process_get_name(smx_process_t process) 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; } @@ -534,7 +570,7 @@ int SIMIX_req_process_is_suspended(smx_process_t process) 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; } @@ -549,7 +585,7 @@ xbt_dict_t SIMIX_req_process_get_properties(smx_process_t process) 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; } @@ -564,11 +600,14 @@ xbt_dict_t SIMIX_req_process_get_properties(smx_process_t process) */ 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; } @@ -584,7 +623,7 @@ smx_rdv_t SIMIX_req_rdv_create(const char *name) req->call = REQ_RDV_CREATE; req->rdv_create.name = name; - SIMIX_request_push(); + SIMIX_request_push(req->issuer); return req->rdv_create.result; } @@ -600,7 +639,7 @@ void SIMIX_req_rdv_destroy(smx_rdv_t rdv) 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) @@ -614,7 +653,7 @@ smx_rdv_t SIMIX_req_rdv_get_by_name(const char *name) smx_req_t req = SIMIX_req_mine(); req->call = REQ_RDV_GEY_BY_NAME; req->rdv_get_by_name.name = name; - SIMIX_request_push(); + SIMIX_request_push(req->issuer); return req->rdv_get_by_name.result;*/ return SIMIX_rdv_get_by_name(name); @@ -635,7 +674,7 @@ int SIMIX_req_rdv_comm_count_by_host(smx_rdv_t rdv, smx_host_t host) 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; } @@ -651,7 +690,7 @@ smx_action_t SIMIX_req_rdv_get_head(smx_rdv_t rdv) 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; } @@ -660,12 +699,17 @@ void SIMIX_req_comm_send(smx_rdv_t rdv, double task_size, double rate, 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, data, 0); + src_buff, src_buff_size, match_fun, NULL, data, 0); SIMIX_req_comm_wait(comm, timeout); } else { @@ -681,15 +725,21 @@ void SIMIX_req_comm_send(smx_rdv_t rdv, double task_size, double rate, req->comm_send.data = data; req->comm_send.timeout = timeout; - SIMIX_request_push(); + 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) { + /* 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"); smx_req_t req = SIMIX_req_mine(); @@ -701,16 +751,18 @@ smx_action_t SIMIX_req_comm_isend(smx_rdv_t rdv, double task_size, double rate, 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) { @@ -730,7 +782,7 @@ void SIMIX_req_comm_recv(smx_rdv_t rdv, void *dst_buff, size_t * dst_buff_size, req->comm_recv.data = data; req->comm_recv.timeout = timeout; - SIMIX_request_push(); + SIMIX_request_push(req->issuer); } } @@ -748,7 +800,7 @@ smx_action_t SIMIX_req_comm_irecv(smx_rdv_t rdv, void *dst_buff, size_t * dst_bu 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; } @@ -756,8 +808,7 @@ void SIMIX_req_comm_destroy(smx_action_t comm) { xbt_assert(comm, "Invalid parameter"); - /* FIXME remove this request type: comms are auto-destroyed now, - * but what happens with unfinished comms? */ + /* FIXME remove this request type: comms are auto-destroyed now */ /* smx_req_t req = SIMIX_req_mine(); @@ -765,7 +816,7 @@ void SIMIX_req_comm_destroy(smx_action_t comm) req->call = REQ_COMM_DESTROY; req->comm_destroy.comm = comm; - SIMIX_request_push(); + SIMIX_request_push(req->issuer); */ } @@ -776,7 +827,7 @@ 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) @@ -786,32 +837,34 @@ 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 @@ -834,7 +887,7 @@ void SIMIX_req_set_category(smx_action_t action, const char *category) req->set_category.action = action; req->set_category.category = category; - SIMIX_request_push(); + SIMIX_request_push(req->issuer); } #endif @@ -845,7 +898,7 @@ int SIMIX_req_comm_test(smx_action_t comm) req->call = REQ_COMM_TEST; req->comm_test.comm = comm; - SIMIX_request_push(); + SIMIX_request_push(req->issuer); return req->comm_test.result; } @@ -856,7 +909,7 @@ double SIMIX_req_comm_get_remains(smx_action_t comm) 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; } @@ -867,7 +920,7 @@ e_smx_state_t SIMIX_req_comm_get_state(smx_action_t comm) 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; } @@ -878,7 +931,7 @@ void *SIMIX_req_comm_get_src_data(smx_action_t comm) 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; } @@ -889,7 +942,7 @@ void *SIMIX_req_comm_get_dst_data(smx_action_t comm) 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; } @@ -900,7 +953,7 @@ smx_process_t SIMIX_req_comm_get_src_proc(smx_action_t comm) 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; } @@ -911,7 +964,7 @@ smx_process_t SIMIX_req_comm_get_dst_proc(smx_action_t comm) 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; } @@ -923,7 +976,7 @@ int SIMIX_req_comm_is_latency_bounded(smx_action_t comm) 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 @@ -934,7 +987,7 @@ smx_mutex_t SIMIX_req_mutex_init(void) req->call = REQ_MUTEX_INIT; - SIMIX_request_push(); + SIMIX_request_push(req->issuer); return req->mutex_init.result; } @@ -945,7 +998,7 @@ void SIMIX_req_mutex_destroy(smx_mutex_t mutex) 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) @@ -955,7 +1008,7 @@ 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) @@ -965,7 +1018,7 @@ 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; } @@ -976,7 +1029,7 @@ void SIMIX_req_mutex_unlock(smx_mutex_t mutex) req->call = REQ_MUTEX_UNLOCK; req->mutex_unlock.mutex = mutex; - SIMIX_request_push(); + SIMIX_request_push(req->issuer); } @@ -986,7 +1039,7 @@ smx_cond_t SIMIX_req_cond_init(void) req->call = REQ_COND_INIT; - SIMIX_request_push(); + SIMIX_request_push(req->issuer); return req->cond_init.result; } @@ -997,7 +1050,7 @@ void SIMIX_req_cond_destroy(smx_cond_t cond) 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) @@ -1007,7 +1060,7 @@ 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) @@ -1018,13 +1071,15 @@ 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; @@ -1032,7 +1087,7 @@ void SIMIX_req_cond_wait_timeout(smx_cond_t cond, 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) @@ -1042,7 +1097,7 @@ 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); } @@ -1053,7 +1108,7 @@ smx_sem_t SIMIX_req_sem_init(int capacity) req->call = REQ_SEM_INIT; req->sem_init.capacity = capacity; - SIMIX_request_push(); + SIMIX_request_push(req->issuer); return req->sem_init.result; } @@ -1064,7 +1119,7 @@ void SIMIX_req_sem_destroy(smx_sem_t sem) 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) @@ -1074,7 +1129,7 @@ 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) @@ -1084,7 +1139,7 @@ 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; } @@ -1095,18 +1150,20 @@ void SIMIX_req_sem_acquire(smx_sem_t sem) 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) @@ -1116,9 +1173,20 @@ 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 */