X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/127880536a17bd02faba5e25df542b50c9fe72cc..d6fc96fb24bb0006584d44bee70df5f67b37f5fb:/src/simix/smx_user.c diff --git a/src/simix/smx_user.c b/src/simix/smx_user.c index 1f5f4b4f1a..3331b4610b 100644 --- a/src/simix/smx_user.c +++ b/src/simix/smx_user.c @@ -1,33 +1,26 @@ /* smx_user.c - public interface to simix */ -/* Copyright (c) 2010, 2011. Da SimGrid team. All rights reserved. */ +/* Copyright (c) 2010-2012. 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 "smx_private.h" #include "mc/mc.h" +#include "xbt/ex.h" +#include /* isfinite() */ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix); static const char* simcall_names[] = { #undef SIMCALL_ENUM_ELEMENT -#define SIMCALL_ENUM_ELEMENT(x) #x /* generate strings from the enumeration values */ +#define SIMCALL_ENUM_ELEMENT(x,y) #x /* generate strings from the enumeration values */ SIMCALL_LIST #undef SIMCALL_ENUM_ELEMENT }; /** + * \ingroup simix_host_management * \brief Returns a host given its name. * * \param name The name of the host to get @@ -39,11 +32,14 @@ smx_host_t simcall_host_get_by_name(const char *name) simcall->call = SIMCALL_HOST_GET_BY_NAME; simcall->host_get_by_name.name = name; + if(MC_is_active()) /* Initialize result to NULL for snapshot comparison done during simcall */ + simcall->host_get_by_name.result = NULL; SIMIX_simcall_push(simcall->issuer); return simcall->host_get_by_name.result; } /** + * \ingroup simix_host_management * \brief Returns the name of a host. * * \param host A SIMIX host @@ -55,11 +51,14 @@ const char* simcall_host_get_name(smx_host_t host) simcall->call = SIMCALL_HOST_GET_NAME; simcall->host_get_name.host = host; + if(MC_is_active()) /* Initialize result to NULL for snapshot comparison done during simcall */ + simcall->host_get_name.result = NULL; SIMIX_simcall_push(simcall->issuer); return simcall->host_get_name.result; } /** + * \ingroup simix_host_management * \brief Returns a dict of the properties assigned to a host. * * \param host A host @@ -71,11 +70,34 @@ xbt_dict_t simcall_host_get_properties(smx_host_t host) simcall->call = SIMCALL_HOST_GET_PROPERTIES; simcall->host_get_properties.host = host; + if(MC_is_active()) /* Initialize result to NULL for snapshot comparison done during simcall */ + simcall->host_get_properties.result = NULL; SIMIX_simcall_push(simcall->issuer); return simcall->host_get_properties.result; } /** + * \ingroup simix_host_management + * \brief Returns a dict of the properties assigned to a router or AS. + * + * \param name The name of the router or AS + * \return The properties + */ +xbt_dict_t simcall_asr_get_properties(const char *name) +{ + smx_simcall_t simcall = SIMIX_simcall_mine(); + + simcall->call = SIMCALL_ASR_GET_PROPERTIES; + simcall->asr_get_properties.name = name; + if(MC_is_active()) /* Initialize result to NULL for snapshot comparison done during simcall */ + simcall->asr_get_properties.result = NULL; + SIMIX_simcall_push(simcall->issuer); + return simcall->asr_get_properties.result; +} + + +/** + * \ingroup simix_host_management * \brief Returns the speed of the processor. * * The speed returned does not take into account the current load on the machine. @@ -88,11 +110,14 @@ double simcall_host_get_speed(smx_host_t host) simcall->call = SIMCALL_HOST_GET_SPEED; simcall->host_get_speed.host = host; + if(MC_is_active()) /* Initialize result to a default value for snapshot comparison done during simcall */ + simcall->host_get_speed.result = 0.0; SIMIX_simcall_push(simcall->issuer); return simcall->host_get_speed.result; } /** + * \ingroup simix_host_management * \brief Returns the available speed of the processor. * * \return Speed currently available (in Mflop/s) @@ -103,11 +128,14 @@ double simcall_host_get_available_speed(smx_host_t host) simcall->call = SIMCALL_HOST_GET_AVAILABLE_SPEED; simcall->host_get_available_speed.host = host; + if(MC_is_active()) /* Initialize result to a default value for snapshot comparison done during simcall */ + simcall->host_get_available_speed.result = 0.0; SIMIX_simcall_push(simcall->issuer); return simcall->host_get_available_speed.result; } /** + * \ingroup simix_host_management * \brief Returns the state of a host. * * Two states are possible: 1 if the host is active or 0 if it has crashed. @@ -120,11 +148,14 @@ int simcall_host_get_state(smx_host_t host) simcall->call = SIMCALL_HOST_GET_STATE; simcall->host_get_state.host = host; + if(MC_is_active()) /* Initialize result to a default value for snapshot comparison done during simcall */ + simcall->host_get_state.result = -1; SIMIX_simcall_push(simcall->issuer); return simcall->host_get_state.result; } /** + * \ingroup simix_host_management * \brief Returns the user data associated to a host. * * \param host SIMIX host @@ -136,15 +167,18 @@ void* simcall_host_get_data(smx_host_t host) simcall->call = SIMCALL_HOST_GET_DATA; simcall->host_get_data.host = host; + if(MC_is_active()) /* Initialize result to NULL for snapshot comparison done during simcall */ + simcall->host_get_data.result = NULL; SIMIX_simcall_push(simcall->issuer); return simcall->host_get_data.result; } /** + * \ingroup simix_host_management * \brief Sets the user data associated to a host. * * The host must not have previous user data associated to it. - * \param A host SIMIX host + * \param host A SIMIX host * \param data The user data to set */ void simcall_host_set_data(smx_host_t host, void *data) @@ -157,16 +191,20 @@ void simcall_host_set_data(smx_host_t host, void *data) SIMIX_simcall_push(simcall->issuer); } -/** \brief Creates an action that executes some computation of an host. +/** + * \ingroup simix_host_management + * \brief Creates an action that executes some computation of an host. * * This function creates a SURF action and allocates the data necessary * to create the SIMIX action. It can raise a host_error exception if the host crashed. * * \param name Name of the execution action to create * \param host SIMIX host where the action will be executed - * \param amount Computation amount (in bytes) + * \param computation_amount amount Computation amount (in bytes) + * \param priority computation priority * \return A new SIMIX execution action */ + smx_action_t simcall_host_execute(const char *name, smx_host_t host, double computation_amount, double priority) @@ -182,11 +220,18 @@ smx_action_t simcall_host_execute(const char *name, smx_host_t host, simcall->host_execute.host = host; simcall->host_execute.computation_amount = computation_amount; simcall->host_execute.priority = priority; - SIMIX_simcall_push(simcall->issuer); + + if(MC_is_active()) /* Initialize result to NULL for snapshot comparison done during simcall */ + simcall->host_execute.result = NULL; + + SIMIX_simcall(SIMCALL_HOST_EXECUTE, PTR(name), PTR(host), DOUBLE(computation_amount), DOUBLE(priority)); + return simcall->host_execute.result; } -/** \brief Creates an action that may involve parallel computation on +/** + * \ingroup simix_host_management + * \brief Creates an action that may involve parallel computation on * several hosts and communication between them. * * \param name Name of the execution action to create @@ -213,7 +258,7 @@ smx_action_t simcall_host_parallel_execute(const char *name, 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); + "communication_amount[%d+%d*%d] is not finite!", i, host_nb, j); } } @@ -230,15 +275,18 @@ smx_action_t simcall_host_parallel_execute(const char *name, simcall->host_parallel_execute.communication_amount = communication_amount; simcall->host_parallel_execute.amount = amount; simcall->host_parallel_execute.rate = rate; + if(MC_is_active()) /* Initialize result to NULL for snapshot comparison done during simcall */ + simcall->host_parallel_execute.result = NULL; SIMIX_simcall_push(simcall->issuer); return simcall->host_parallel_execute.result; } /** + * \ingroup simix_host_management * \brief Destroys an execution action. * * Destroys an action, freing its memory. This function cannot be called if there are a conditional waiting for it. - * \param action The execution action to destroy + * \param execution The execution action to destroy */ void simcall_host_execution_destroy(smx_action_t execution) { @@ -250,10 +298,11 @@ void simcall_host_execution_destroy(smx_action_t execution) } /** + * \ingroup simix_host_management * \brief Cancels an execution action. * * This functions stops the execution. It calls a surf function. - * \param action The execution action to cancel + * \param execution The execution action to cancel */ void simcall_host_execution_cancel(smx_action_t execution) { @@ -265,9 +314,10 @@ void simcall_host_execution_cancel(smx_action_t execution) } /** + * \ingroup simix_host_management * \brief Returns how much of an execution action remains to be done. * - * \param Action The execution action + * \param execution The execution action * \return The remaining amount */ double simcall_host_execution_get_remains(smx_action_t execution) @@ -276,11 +326,14 @@ double simcall_host_execution_get_remains(smx_action_t execution) simcall->call = SIMCALL_HOST_EXECUTION_GET_REMAINS; simcall->host_execution_get_remains.execution = execution; + if(MC_is_active()) /* Initializeialize result to a default value for snapshot comparison done during simcall */ + simcall->host_execution_get_remains.result = 0.0; SIMIX_simcall_push(simcall->issuer); return simcall->host_execution_get_remains.result; } /** + * \ingroup simix_host_management * \brief Returns the state of an execution action. * * \param execution The execution action @@ -292,11 +345,13 @@ e_smx_state_t simcall_host_execution_get_state(smx_action_t execution) simcall->call = SIMCALL_HOST_EXECUTION_GET_STATE; simcall->host_execution_get_state.execution = execution; + simcall->host_execution_get_state.result = -1; SIMIX_simcall_push(simcall->issuer); return simcall->host_execution_get_state.result; } /** + * \ingroup simix_host_management * \brief Changes the priority of an execution action. * * This functions changes the priority only. It calls a surf function. @@ -317,6 +372,7 @@ void simcall_host_execution_set_priority(smx_action_t execution, double priority } /** + * \ingroup simix_host_management * \brief Waits for the completion of an execution action and destroy it. * * \param execution The execution action @@ -327,11 +383,18 @@ e_smx_state_t simcall_host_execution_wait(smx_action_t execution) simcall->call = SIMCALL_HOST_EXECUTION_WAIT; simcall->host_execution_wait.execution = execution; - SIMIX_simcall_push(simcall->issuer); + simcall->host_execution_wait.simcall = simcall; + + SIMIX_simcall(SIMCALL_HOST_EXECUTION_WAIT, PTR(simcall), PTR(execution)); + + if(MC_is_active()) /* Initialize result to a default value for snapshot comparison done during simcall */ + simcall->host_execution_wait.result = -1; + return simcall->host_execution_wait.result; } /** + * \ingroup simix_process_management * \brief Creates and runs a new SIMIX process. * * The structure and the corresponding thread are created and put in the list of ready processes. @@ -342,16 +405,20 @@ e_smx_state_t simcall_host_execution_wait(smx_action_t execution) * \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. * It can be retrieved with the function \ref simcall_process_get_data. * \param hostname name of the host where the new agent is executed. + * \param kill_time time when the process is killed * \param argc first argument passed to \a code * \param argv second argument passed to \a code * \param properties the properties of the process + * \param auto_restart either it is autorestarting or not. */ void simcall_process_create(smx_process_t *process, const char *name, xbt_main_func_t code, void *data, const char *hostname, + double kill_time, int argc, char **argv, - xbt_dict_t properties) + xbt_dict_t properties, + int auto_restart) { smx_simcall_t simcall = SIMIX_simcall_mine(); @@ -361,13 +428,17 @@ void simcall_process_create(smx_process_t *process, const char *name, simcall->process_create.code = code; simcall->process_create.data = data; simcall->process_create.hostname = hostname; + simcall->process_create.kill_time = kill_time; simcall->process_create.argc = argc; simcall->process_create.argv = argv; simcall->process_create.properties = properties; + simcall->process_create.auto_restart = auto_restart; SIMIX_simcall_push(simcall->issuer); } -/** \brief Kills a SIMIX process. +/** + * \ingroup simix_process_management + * \brief Kills a SIMIX process. * * This function simply kills a process. * @@ -382,7 +453,9 @@ void simcall_process_kill(smx_process_t process) SIMIX_simcall_push(simcall->issuer); } -/** \brief Kills all SIMIX processes. +/** + * \ingroup simix_process_management + * \brief Kills all SIMIX processes. */ void simcall_process_killall(void) { @@ -392,7 +465,9 @@ void simcall_process_killall(void) SIMIX_simcall_push(simcall->issuer); } -/** \brief Cleans up a SIMIX process. +/** + * \ingroup simix_process_management + * \brief Cleans up a SIMIX process. * \param process poor victim (must have already been killed) */ void simcall_process_cleanup(smx_process_t process) @@ -405,12 +480,12 @@ void simcall_process_cleanup(smx_process_t 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 source name of the previous host * \param dest name of the new host */ void simcall_process_change_host(smx_process_t process, smx_host_t dest) @@ -424,6 +499,7 @@ void simcall_process_change_host(smx_process_t process, smx_host_t dest) } /** + * \ingroup simix_process_management * \brief Suspends a process. * * This function suspends the process by suspending the action @@ -443,6 +519,7 @@ void simcall_process_suspend(smx_process_t process) } /** + * \ingroup simix_process_management * \brief Resumes a suspended process. * * This function resumes a suspended process by resuming the action @@ -460,6 +537,7 @@ void simcall_process_resume(smx_process_t process) } /** + * \ingroup simix_process_management * \brief Returns the amount of SIMIX processes in the system * * Maestro internal process is not counted, only user code processes are @@ -469,11 +547,14 @@ int simcall_process_count(void) smx_simcall_t simcall = SIMIX_simcall_mine(); simcall->call = SIMCALL_PROCESS_COUNT; + if(MC_is_active()) /* Initialize result to a default value for snapshot comparison done during simcall */ + simcall->process_count.result = -1; SIMIX_simcall_push(simcall->issuer); return simcall->process_count.result; } /** + * \ingroup simix_process_management * \brief Return the user data of a #smx_process_t. * \param process a SIMIX process * \return the user data of this process @@ -489,14 +570,17 @@ void* simcall_process_get_data(smx_process_t process) simcall->call = SIMCALL_PROCESS_GET_DATA; simcall->process_get_data.process = process; + if(MC_is_active()) /* Initialize result to NULL for snapshot comparison done during simcall */ + simcall->process_get_data.result = NULL; SIMIX_simcall_push(simcall->issuer); return simcall->process_get_data.result; } /** - * \brief Set the user data of a #m_process_t. + * \ingroup simix_process_management + * \brief Set the user data of a #smx_process_t. * - * This functions checks whether \a process is a valid pointer or not and set the user data associated to \a process if it is possible. + * This functions sets the user data associated to \a process. * \param process SIMIX process * \param data User data */ @@ -518,9 +602,29 @@ void simcall_process_set_data(smx_process_t process, void *data) } /** + * \ingroup simix_process_management + * \brief Set the kill time of a process. + * \param process a process + * \param kill_time a double + */ +void simcall_process_set_kill_time(smx_process_t process, double kill_time) +{ + + 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); + SIMIX_timer_set(kill_time, simix_global->kill_process_function, process); + } + } +} + +/** + * \ingroup simix_process_management * \brief Return the location on which an agent is running. * - * This functions checks whether \a process is a valid pointer or not and return the m_host_t corresponding to the location on which \a process is running. + * This functions returns the smx_host_t corresponding to the location on which + * \a process is running. * \param process SIMIX process * \return SIMIX host */ @@ -530,11 +634,14 @@ smx_host_t simcall_process_get_host(smx_process_t process) simcall->call = SIMCALL_PROCESS_GET_HOST; simcall->process_get_host.process = process; + if(MC_is_active()) /* Initialize result to NULL for snapshot comparison done during simcall */ + simcall->process_get_host.result = NULL; SIMIX_simcall_push(simcall->issuer); return simcall->process_get_host.result; } /** + * \ingroup simix_process_management * \brief Return the name of an agent. * * This functions checks whether \a process is a valid pointer or not and return its name. @@ -552,11 +659,14 @@ const char* simcall_process_get_name(smx_process_t process) simcall->call = SIMCALL_PROCESS_GET_NAME; simcall->process_get_name.process = process; + if(MC_is_active()) /* Initialize result to NULL for snapshot comparison done during simcall */ + simcall->process_get_name.result = NULL; SIMIX_simcall_push(simcall->issuer); return simcall->process_get_name.result; } /** + * \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. @@ -569,11 +679,14 @@ int simcall_process_is_suspended(smx_process_t process) simcall->call = SIMCALL_PROCESS_IS_SUSPENDED; simcall->process_is_suspended.process = process; + if(MC_is_active()) /* Initialize result to a default value for snapshot comparison done during simcall */ + simcall->process_is_suspended.result = -1; SIMIX_simcall_push(simcall->issuer); return simcall->process_is_suspended.result; } -/** \ingroup m_process_management +/** + * \ingroup simix_process_management * \brief Return the properties * * This functions returns the properties associated with this process @@ -584,18 +697,71 @@ xbt_dict_t simcall_process_get_properties(smx_process_t process) simcall->call = SIMCALL_PROCESS_GET_PROPERTIES; simcall->process_get_properties.process = process; + if(MC_is_active()) /* Initialize result to NULL for snapshot comparison done during simcall */ + simcall->process_get_properties.result = NULL; SIMIX_simcall_push(simcall->issuer); return simcall->process_get_properties.result; } +/** + * \ingroup simix_process_management + * \brief Add an on_exit function + * Add an on_exit function which will be executed when the process exits/is killed. + */ +XBT_PUBLIC(void) simcall_process_on_exit(smx_process_t process, int_f_pvoid_t fun, void *data) +{ + smx_simcall_t simcall = SIMIX_simcall_mine(); + + simcall->call = SIMCALL_PROCESS_ON_EXIT; + simcall->process_on_exit.process = process; + simcall->process_on_exit.fun = fun; + simcall->process_on_exit.data = data; + + SIMIX_simcall_push(simcall->issuer); +} +/** + * \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. + */ -/** \brief Creates a new sleep SIMIX action. +XBT_PUBLIC(void) simcall_process_auto_restart_set(smx_process_t process, int auto_restart) +{ + smx_simcall_t simcall = SIMIX_simcall_mine(); + + simcall->call = SIMCALL_PROCESS_AUTO_RESTART_SET; + simcall->process_auto_restart.process = process; + simcall->process_auto_restart.auto_restart = auto_restart; + + SIMIX_simcall_push(simcall->issuer); +} + +/** + * \ingroup simix_process_management + * \brief Restarts the process, killing it and starting it again from scratch. + */ +XBT_PUBLIC(smx_process_t) simcall_process_restart(smx_process_t process) +{ + smx_simcall_t simcall = SIMIX_simcall_mine(); + + simcall->call = SIMCALL_PROCESS_RESTART; + simcall->process_restart.process = process; + if(MC_is_active()) /* Initialize result to NULL for snapshot comparison done during simcall */ + simcall->process_restart.result = NULL; + + SIMIX_simcall_push(simcall->issuer); + + return simcall->process_restart.result; +} +/** + * \ingroup simix_process_management + * \brief Creates a new sleep SIMIX action. * * This function creates a SURF action and allocates the data necessary * to create the SIMIX action. It can raise a host_error exception if the * host crashed. The default SIMIX name of the action is "sleep". * - * \param duration Time duration of the sleep. - * \return A result telling whether the sleep was successful + * \param duration Time duration of the sleep. + * \return A result telling whether the sleep was successful */ e_smx_state_t simcall_process_sleep(double duration) { @@ -606,11 +772,14 @@ e_smx_state_t simcall_process_sleep(double duration) simcall->call = SIMCALL_PROCESS_SLEEP; simcall->process_sleep.duration = duration; + if(MC_is_active()) /* Initialize result to a default value for snapshot comparison done during simcall */ + simcall->process_sleep.result = -1; SIMIX_simcall_push(simcall->issuer); return simcall->process_sleep.result; } /** + * \ingroup simix_rdv_management * \brief Creates a new rendez-vous point * \param name The name of the rendez-vous point * \return The created rendez-vous point @@ -621,6 +790,8 @@ smx_rdv_t simcall_rdv_create(const char *name) simcall->call = SIMCALL_RDV_CREATE; simcall->rdv_create.name = name; + if(MC_is_active()) /* Initialize result to NULL for snapshot comparison done during simcall */ + simcall->rdv_create.result = NULL; SIMIX_simcall_push(simcall->issuer); return simcall->rdv_create.result; @@ -628,8 +799,9 @@ smx_rdv_t simcall_rdv_create(const char *name) /** + * \ingroup simix_rdv_management * \brief Destroy a rendez-vous point - * \param name The rendez-vous point to destroy + * \param rdv The rendez-vous point to destroy */ void simcall_rdv_destroy(smx_rdv_t rdv) { @@ -640,7 +812,10 @@ void simcall_rdv_destroy(smx_rdv_t rdv) SIMIX_simcall_push(simcall->issuer); } - +/** + * \ingroup simix_rdv_management + * \brief Returns a rendez-vous point knowing its name + */ smx_rdv_t simcall_rdv_get_by_name(const char *name) { xbt_assert(name != NULL, "Invalid parameter for simcall_rdv_get_by_name (name is NULL)"); @@ -660,6 +835,7 @@ smx_rdv_t simcall_rdv_get_by_name(const char *name) } /** + * \ingroup simix_rdv_management * \brief Counts the number of communication actions of a given host pending * on a rendez-vous point. * \param rdv The rendez-vous point @@ -673,12 +849,15 @@ int simcall_rdv_comm_count_by_host(smx_rdv_t rdv, smx_host_t host) simcall->call = SIMCALL_RDV_COMM_COUNT_BY_HOST; simcall->rdv_comm_count_by_host.rdv = rdv; simcall->rdv_comm_count_by_host.host = host; + if(MC_is_active()) /* Initialize result to a default value for snapshot comparison done during simcall */ + simcall->rdv_comm_count_by_host.result = -1; SIMIX_simcall_push(simcall->issuer); return simcall->rdv_comm_count_by_host.result; } /** + * \ingroup simix_rdv_management * \brief returns the communication at the head of the rendez-vous * \param rdv The rendez-vous point * \return The communication or NULL if empty @@ -689,14 +868,43 @@ smx_action_t simcall_rdv_get_head(smx_rdv_t rdv) simcall->call = SIMCALL_RDV_GET_HEAD; simcall->rdv_get_head.rdv = rdv; + if(MC_is_active()) /* Initialize result to NULL for snapshot comparison done during simcall */ + simcall->rdv_get_head.result = NULL; SIMIX_simcall_push(simcall->issuer); return simcall->rdv_get_head.result; } +void simcall_rdv_set_receiver(smx_rdv_t rdv , smx_process_t process) +{ + smx_simcall_t simcall = SIMIX_simcall_mine(); + + simcall->call = SIMCALL_RDV_SET_RECV; + simcall->rdv_set_rcv_proc.rdv = rdv; + simcall->rdv_set_rcv_proc.receiver = process; + + SIMIX_simcall_push(simcall->issuer); +} + +smx_process_t simcall_rdv_get_receiver(smx_rdv_t rdv) +{ + smx_simcall_t simcall = SIMIX_simcall_mine(); + + simcall->call = SIMCALL_RDV_GET_RECV; + simcall->rdv_get_rcv_proc.rdv = rdv; + if(MC_is_active()) /* Initialize result to NULL for snapshot comparison done during simcall */ + simcall->rdv_get_rcv_proc.result = NULL; + + SIMIX_simcall_push(simcall->issuer); + return simcall->rdv_get_rcv_proc.result; +} + +/** + * \ingroup simix_comm_management + */ void simcall_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, + int (*match_fun)(void *, void *, smx_action_t), void *data, double timeout) { /* checking for infinite values */ @@ -706,7 +914,7 @@ void simcall_comm_send(smx_rdv_t rdv, double task_size, double rate, xbt_assert(rdv, "No rendez-vous point defined for send"); - if (MC_IS_ENABLED) { + if (MC_is_active()) { /* the model-checker wants two separate simcalls */ smx_action_t comm = simcall_comm_isend(rdv, task_size, rate, src_buff, src_buff_size, match_fun, NULL, data, 0); @@ -728,10 +936,12 @@ void simcall_comm_send(smx_rdv_t rdv, double task_size, double rate, SIMIX_simcall_push(simcall->issuer); } } - +/** + * \ingroup simix_comm_management + */ smx_action_t simcall_comm_isend(smx_rdv_t rdv, double task_size, double rate, void *src_buff, size_t src_buff_size, - int (*match_fun)(void *, void *), + int (*match_fun)(void *, void *, smx_action_t), void (*clean_fun)(void *), void *data, int detached) @@ -754,18 +964,22 @@ smx_action_t simcall_comm_isend(smx_rdv_t rdv, double task_size, double rate, simcall->comm_isend.clean_fun = clean_fun; simcall->comm_isend.data = data; simcall->comm_isend.detached = detached; + if(MC_is_active()) /* Initialize result to NULL for snapshot comparison done during simcall */ + simcall->comm_isend.result = NULL; SIMIX_simcall_push(simcall->issuer); return simcall->comm_isend.result; } - +/** + * \ingroup simix_comm_management + */ void simcall_comm_recv(smx_rdv_t rdv, void *dst_buff, size_t * dst_buff_size, - int (*match_fun)(void *, void *), void *data, double timeout) + int (*match_fun)(void *, void *, smx_action_t), 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) { + if (MC_is_active()) { /* the model-checker wants two separate simcalls */ smx_action_t comm = simcall_comm_irecv(rdv, dst_buff, dst_buff_size, match_fun, data); @@ -785,9 +999,11 @@ void simcall_comm_recv(smx_rdv_t rdv, void *dst_buff, size_t * dst_buff_size, SIMIX_simcall_push(simcall->issuer); } } - +/** + * \ingroup simix_comm_management + */ smx_action_t simcall_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 *, smx_action_t), void *data) { xbt_assert(rdv, "No rendez-vous point defined for irecv"); @@ -799,11 +1015,36 @@ smx_action_t simcall_comm_irecv(smx_rdv_t rdv, void *dst_buff, size_t * dst_buff simcall->comm_irecv.dst_buff_size = dst_buff_size; simcall->comm_irecv.match_fun = match_fun; simcall->comm_irecv.data = data; + if(MC_is_active()) /* Initialize result to NULL for snapshot comparison done during simcall */ + simcall->comm_irecv.result = NULL; SIMIX_simcall_push(simcall->issuer); return simcall->comm_irecv.result; } + +/** + * \ingroup simix_comm_management + */ +smx_action_t simcall_comm_iprobe(smx_rdv_t rdv, int src, int tag, + int (*match_fun)(void *, void *, smx_action_t), void *data) +{ + xbt_assert(rdv, "No rendez-vous point defined for iprobe"); + + smx_simcall_t simcall = SIMIX_simcall_mine(); + + simcall->call = SIMCALL_COMM_IPROBE; + simcall->comm_iprobe.rdv = rdv; + simcall->comm_iprobe.src = src; + simcall->comm_iprobe.match_fun = match_fun; + simcall->comm_iprobe.data = data; + if(MC_is_active()) /* Initialize result to NULL for snapshot comparison done during simcall */ + simcall->comm_iprobe.result = NULL; + SIMIX_simcall_push(simcall->issuer); + return simcall->comm_iprobe.result; +} + + void simcall_comm_destroy(smx_action_t comm) { xbt_assert(comm, "Invalid parameter"); @@ -819,7 +1060,9 @@ void simcall_comm_destroy(smx_action_t comm) SIMIX_simcall_push(simcall->issuer); */ } - +/** + * \ingroup simix_comm_management + */ void simcall_comm_cancel(smx_action_t comm) { smx_simcall_t simcall = SIMIX_simcall_mine(); @@ -829,18 +1072,24 @@ void simcall_comm_cancel(smx_action_t comm) SIMIX_simcall_push(simcall->issuer); } - +/** + * \ingroup simix_comm_management + */ unsigned int simcall_comm_waitany(xbt_dynar_t comms) { smx_simcall_t simcall = SIMIX_simcall_mine(); simcall->call = SIMCALL_COMM_WAITANY; simcall->comm_waitany.comms = comms; + if(MC_is_active()) /* Initialize result to a default value for snapshot comparison done during simcall */ + simcall->comm_waitany.result = -1; SIMIX_simcall_push(simcall->issuer); return simcall->comm_waitany.result; } - +/** + * \ingroup simix_comm_management + */ int simcall_comm_testany(xbt_dynar_t comms) { smx_simcall_t simcall = SIMIX_simcall_mine(); @@ -849,11 +1098,15 @@ int simcall_comm_testany(xbt_dynar_t comms) simcall->call = SIMCALL_COMM_TESTANY; simcall->comm_testany.comms = comms; + if(MC_is_active()) /* Initialize result to a default value for snapshot comparison done during simcall */ + simcall->comm_testany.result = -1; SIMIX_simcall_push(simcall->issuer); return simcall->comm_testany.result; } - +/** + * \ingroup simix_comm_management + */ void simcall_comm_wait(smx_action_t comm, double timeout) { xbt_assert(isfinite(timeout), "timeout is not finite!"); @@ -890,79 +1143,114 @@ void simcall_set_category(smx_action_t action, const char *category) SIMIX_simcall_push(simcall->issuer); } #endif - +/** + * \ingroup simix_comm_management + * + */ int simcall_comm_test(smx_action_t comm) { smx_simcall_t simcall = SIMIX_simcall_mine(); simcall->call = SIMCALL_COMM_TEST; simcall->comm_test.comm = comm; + if(MC_is_active()) /* Initialize result to a default value for snapshot comparison done during simcall */ + simcall->comm_test.result = -1; SIMIX_simcall_push(simcall->issuer); return simcall->comm_test.result; } - +/** + * \ingroup simix_comm_management + * + */ double simcall_comm_get_remains(smx_action_t comm) { smx_simcall_t simcall = SIMIX_simcall_mine(); simcall->call = SIMCALL_COMM_GET_REMAINS; simcall->comm_get_remains.comm = comm; + if(MC_is_active()) /* Initialize result to a default value for snapshot comparison done during simcall */ + simcall->comm_get_remains.result = 0.0; SIMIX_simcall_push(simcall->issuer); return simcall->comm_get_remains.result; } - +/** + * \ingroup simix_comm_management + * + */ e_smx_state_t simcall_comm_get_state(smx_action_t comm) { smx_simcall_t simcall = SIMIX_simcall_mine(); simcall->call = SIMCALL_COMM_GET_STATE; simcall->comm_get_state.comm = comm; + if(MC_is_active()) /* Initialize result to a default value for snapshot comparison done during simcall */ + simcall->comm_get_state.result = -1; SIMIX_simcall_push(simcall->issuer); return simcall->comm_get_state.result; } - +/** + * \ingroup simix_comm_management + * + */ void *simcall_comm_get_src_data(smx_action_t comm) { smx_simcall_t simcall = SIMIX_simcall_mine(); simcall->call = SIMCALL_COMM_GET_SRC_DATA; simcall->comm_get_src_data.comm = comm; + if(MC_is_active()) /* Initialize result to NULL for snapshot comparison done during simcall */ + simcall->comm_get_src_data.result = NULL; SIMIX_simcall_push(simcall->issuer); return simcall->comm_get_src_data.result; } - +/** + * \ingroup simix_comm_management + * + */ void *simcall_comm_get_dst_data(smx_action_t comm) { smx_simcall_t simcall = SIMIX_simcall_mine(); simcall->call = SIMCALL_COMM_GET_DST_DATA; simcall->comm_get_dst_data.comm = comm; + if(MC_is_active()) /* Initialize result to NULL for snapshot comparison done during simcall */ + simcall->comm_get_dst_data.result = NULL; SIMIX_simcall_push(simcall->issuer); return simcall->comm_get_dst_data.result; } - +/** + * \ingroup simix_comm_management + * + */ smx_process_t simcall_comm_get_src_proc(smx_action_t comm) { smx_simcall_t simcall = SIMIX_simcall_mine(); simcall->call = SIMCALL_COMM_GET_SRC_PROC; simcall->comm_get_src_proc.comm = comm; + if(MC_is_active()) /* Initialize result to NULL for snapshot comparison done during simcall */ + simcall->comm_get_src_proc.result = NULL; SIMIX_simcall_push(simcall->issuer); return simcall->comm_get_src_proc.result; } - +/** + * \ingroup simix_comm_management + * + */ smx_process_t simcall_comm_get_dst_proc(smx_action_t comm) { smx_simcall_t simcall = SIMIX_simcall_mine(); simcall->call = SIMCALL_COMM_GET_DST_PROC; simcall->comm_get_dst_proc.comm = comm; + if(MC_is_active()) /* Initialize result to NULL for snapshot comparison done during simcall */ + simcall->comm_get_dst_proc.result = NULL; SIMIX_simcall_push(simcall->issuer); return simcall->comm_get_dst_proc.result; @@ -975,22 +1263,36 @@ int simcall_comm_is_latency_bounded(smx_action_t comm) simcall->call = SIMCALL_COMM_IS_LATENCY_BOUNDED; simcall->comm_is_latency_bounded.comm = comm; + if(MC_is_active()) /* Initialize result to a default value for snapshot comparison done during simcall */ + simcall->comm_is_latency_bounded.result = -1; SIMIX_simcall_push(simcall->issuer); return simcall->comm_is_latency_bounded.result; } #endif - +/** + * \ingroup simix_synchro_management + * + */ smx_mutex_t simcall_mutex_init(void) { + if(!simix_global) { + fprintf(stderr,"You must run MSG_init before using MSG\n"); // We can't use xbt_die since we may get there before the initialization + xbt_abort(); + } smx_simcall_t simcall = SIMIX_simcall_mine(); simcall->call = SIMCALL_MUTEX_INIT; + if(MC_is_active()) /* Initialize result to NULL for snapshot comparison done during simcall */ + simcall->mutex_init.result = NULL; SIMIX_simcall_push(simcall->issuer); return simcall->mutex_init.result; } - +/** + * \ingroup simix_synchro_management + * + */ void simcall_mutex_destroy(smx_mutex_t mutex) { smx_simcall_t simcall = SIMIX_simcall_mine(); @@ -1000,7 +1302,10 @@ void simcall_mutex_destroy(smx_mutex_t mutex) SIMIX_simcall_push(simcall->issuer); } - +/** + * \ingroup simix_synchro_management + * + */ void simcall_mutex_lock(smx_mutex_t mutex) { smx_simcall_t simcall = SIMIX_simcall_mine(); @@ -1010,18 +1315,26 @@ void simcall_mutex_lock(smx_mutex_t mutex) SIMIX_simcall_push(simcall->issuer); } - +/** + * \ingroup simix_synchro_management + * + */ int simcall_mutex_trylock(smx_mutex_t mutex) { smx_simcall_t simcall = SIMIX_simcall_mine(); simcall->call = SIMCALL_MUTEX_TRYLOCK; simcall->mutex_trylock.mutex = mutex; + if(MC_is_active()) /* Initialize result to a default value for snapshot comparison done during simcall */ + simcall->mutex_trylock.result = -1; SIMIX_simcall_push(simcall->issuer); return simcall->mutex_trylock.result; } - +/** + * \ingroup simix_synchro_management + * + */ void simcall_mutex_unlock(smx_mutex_t mutex) { smx_simcall_t simcall = SIMIX_simcall_mine(); @@ -1031,18 +1344,25 @@ void simcall_mutex_unlock(smx_mutex_t mutex) SIMIX_simcall_push(simcall->issuer); } - - +/** + * \ingroup simix_synchro_management + * + */ smx_cond_t simcall_cond_init(void) { smx_simcall_t simcall = SIMIX_simcall_mine(); simcall->call = SIMCALL_COND_INIT; + if(MC_is_active()) /* Initialize result to NULL for snapshot comparison done during simcall */ + simcall->cond_init.result = NULL; SIMIX_simcall_push(simcall->issuer); return simcall->cond_init.result; } - +/** + * \ingroup simix_synchro_management + * + */ void simcall_cond_destroy(smx_cond_t cond) { smx_simcall_t simcall = SIMIX_simcall_mine(); @@ -1052,7 +1372,10 @@ void simcall_cond_destroy(smx_cond_t cond) SIMIX_simcall_push(simcall->issuer); } - +/** + * \ingroup simix_synchro_management + * + */ void simcall_cond_signal(smx_cond_t cond) { smx_simcall_t simcall = SIMIX_simcall_mine(); @@ -1062,7 +1385,10 @@ void simcall_cond_signal(smx_cond_t cond) SIMIX_simcall_push(simcall->issuer); } - +/** + * \ingroup simix_synchro_management + * + */ void simcall_cond_wait(smx_cond_t cond, smx_mutex_t mutex) { smx_simcall_t simcall = SIMIX_simcall_mine(); @@ -1073,7 +1399,10 @@ void simcall_cond_wait(smx_cond_t cond, smx_mutex_t mutex) SIMIX_simcall_push(simcall->issuer); } - +/** + * \ingroup simix_synchro_management + * + */ void simcall_cond_wait_timeout(smx_cond_t cond, smx_mutex_t mutex, double timeout) @@ -1089,7 +1418,10 @@ void simcall_cond_wait_timeout(smx_cond_t cond, SIMIX_simcall_push(simcall->issuer); } - +/** + * \ingroup simix_synchro_management + * + */ void simcall_cond_broadcast(smx_cond_t cond) { smx_simcall_t simcall = SIMIX_simcall_mine(); @@ -1099,19 +1431,26 @@ void simcall_cond_broadcast(smx_cond_t cond) SIMIX_simcall_push(simcall->issuer); } - - +/** + * \ingroup simix_synchro_management + * + */ smx_sem_t simcall_sem_init(int capacity) { smx_simcall_t simcall = SIMIX_simcall_mine(); simcall->call = SIMCALL_SEM_INIT; simcall->sem_init.capacity = capacity; + if(MC_is_active()) /* Initialize result to NULL for snapshot comparison done during simcall */ + simcall->sem_init.result = NULL; SIMIX_simcall_push(simcall->issuer); return simcall->sem_init.result; } - +/** + * \ingroup simix_synchro_management + * + */ void simcall_sem_destroy(smx_sem_t sem) { smx_simcall_t simcall = SIMIX_simcall_mine(); @@ -1121,7 +1460,10 @@ void simcall_sem_destroy(smx_sem_t sem) SIMIX_simcall_push(simcall->issuer); } - +/** + * \ingroup simix_synchro_management + * + */ void simcall_sem_release(smx_sem_t sem) { smx_simcall_t simcall = SIMIX_simcall_mine(); @@ -1131,18 +1473,26 @@ void simcall_sem_release(smx_sem_t sem) SIMIX_simcall_push(simcall->issuer); } - +/** + * \ingroup simix_synchro_management + * + */ int simcall_sem_would_block(smx_sem_t sem) { smx_simcall_t simcall = SIMIX_simcall_mine(); simcall->call = SIMCALL_SEM_WOULD_BLOCK; simcall->sem_would_block.sem = sem; + if(MC_is_active()) /* Initialize result to a default value for snapshot comparison done during simcall */ + simcall->sem_would_block.result = -1; SIMIX_simcall_push(simcall->issuer); return simcall->sem_would_block.result; } - +/** + * \ingroup simix_synchro_management + * + */ void simcall_sem_acquire(smx_sem_t sem) { smx_simcall_t simcall = SIMIX_simcall_mine(); @@ -1152,7 +1502,10 @@ void simcall_sem_acquire(smx_sem_t sem) SIMIX_simcall_push(simcall->issuer); } - +/** + * \ingroup simix_synchro_management + * + */ void simcall_sem_acquire_timeout(smx_sem_t sem, double timeout) { xbt_assert(isfinite(timeout), "timeout is not finite!"); @@ -1165,79 +1518,105 @@ void simcall_sem_acquire_timeout(smx_sem_t sem, double timeout) SIMIX_simcall_push(simcall->issuer); } - +/** + * \ingroup simix_synchro_management + * + */ int simcall_sem_get_capacity(smx_sem_t sem) { smx_simcall_t simcall = SIMIX_simcall_mine(); simcall->call = SIMCALL_SEM_GET_CAPACITY; simcall->sem_get_capacity.sem = sem; + if(MC_is_active()) /* Initialize result to a default value for snapshot comparison done during simcall */ + simcall->sem_get_capacity.result = -1; SIMIX_simcall_push(simcall->issuer); return simcall->sem_get_capacity.result; } - -size_t simcall_file_read(const char* storage, void* ptr, size_t size, size_t nmemb, smx_file_t stream) +/** + * \ingroup simix_file_management + * + */ +double simcall_file_read(void* ptr, size_t size, size_t nmemb, smx_file_t stream) { smx_simcall_t simcall = SIMIX_simcall_mine(); simcall->call = SIMCALL_FILE_READ; - simcall->file_read.storage = storage; simcall->file_read.ptr = ptr; simcall->file_read.size = size; simcall->file_read.nmemb = nmemb; simcall->file_read.stream = stream; + if(MC_is_active()) /* Initialize result to a default value for snapshot comparison done during simcall */ + simcall->file_read.result = 0.0; SIMIX_simcall_push(simcall->issuer); return simcall->file_read.result; } - -size_t simcall_file_write(const char* storage, const void* ptr, size_t size, size_t nmemb, smx_file_t stream) +/** + * \ingroup simix_file_management + * + */ +size_t simcall_file_write(const void* ptr, size_t size, size_t nmemb, smx_file_t stream) { smx_simcall_t simcall = SIMIX_simcall_mine(); simcall->call = SIMCALL_FILE_WRITE; - simcall->file_write.storage = storage; simcall->file_write.ptr = ptr; simcall->file_write.size = size; simcall->file_write.nmemb = nmemb; simcall->file_write.stream = stream; + if(MC_is_active()) /* Initialize result to a default value for snapshot comparison done during simcall */ + simcall->file_write.result = 0; SIMIX_simcall_push(simcall->issuer); return simcall->file_write.result; } - -smx_file_t simcall_file_open(const char* storage, const char* path, const char* mode) +/** + * \ingroup simix_file_management + * \brief + */ +smx_file_t simcall_file_open(const char* mount, const char* path, const char* mode) { smx_simcall_t simcall = SIMIX_simcall_mine(); simcall->call = SIMCALL_FILE_OPEN; - simcall->file_open.storage = storage; + simcall->file_open.mount = mount; simcall->file_open.path = path; simcall->file_open.mode = mode; + if(MC_is_active()) /* Initialize result to NULL for snapshot comparison done during simcall */ + simcall->file_open.result = NULL; SIMIX_simcall_push(simcall->issuer); return simcall->file_open.result; } - -int simcall_file_close(const char* storage, smx_file_t fp) +/** + * \ingroup simix_file_management + * + */ +int simcall_file_close(smx_file_t fp) { smx_simcall_t simcall = SIMIX_simcall_mine(); simcall->call = SIMCALL_FILE_CLOSE; - simcall->file_close.storage = storage; simcall->file_close.fp = fp; + if(MC_is_active()) /* Initialize result to a default value for snapshot comparison done during simcall */ + simcall->file_close.result = -1; SIMIX_simcall_push(simcall->issuer); return simcall->file_close.result; } - -int simcall_file_stat(const char* storage, smx_file_t fd, s_file_stat_t *buf) +/** + * \ingroup simix_file_management + * + */ +int simcall_file_stat(smx_file_t fd, s_file_stat_t *buf) { smx_simcall_t simcall = SIMIX_simcall_mine(); simcall->call = SIMCALL_FILE_STAT; - simcall->file_stat.storage = storage; simcall->file_stat.fd = fd; + if(MC_is_active()) /* Initialize result to a default value for snapshot comparison done during simcall */ + simcall->file_stat.result = -1; SIMIX_simcall_push(simcall->issuer); @@ -1246,6 +1625,84 @@ int simcall_file_stat(const char* storage, smx_file_t fd, s_file_stat_t *buf) return simcall->file_stat.result; } +/** + * \ingroup simix_file_management + * + */ +int simcall_file_unlink(smx_file_t fd) +{ + smx_simcall_t simcall = SIMIX_simcall_mine(); + simcall->call = SIMCALL_FILE_UNLINK; + simcall->file_unlink.fd = fd; + if(MC_is_active()) /* Initialize result to a default value for snapshot comparison done during simcall */ + simcall->file_unlink.result = -1; + + SIMIX_simcall_push(simcall->issuer); + + return simcall->file_unlink.result; +} + +/** + * \ingroup simix_file_management + * + */ +xbt_dict_t simcall_file_ls(const char* mount, const char* path) +{ + smx_simcall_t simcall = SIMIX_simcall_mine(); + simcall->call = SIMCALL_FILE_LS; + simcall->file_ls.mount = mount; + simcall->file_ls.path = path; + if(MC_is_active()) /* Initialize result to a default value for snapshot comparison done during simcall */ + simcall->file_ls.result = NULL; + + SIMIX_simcall_push(simcall->issuer); + + return simcall->file_ls.result; +} + +#ifdef HAVE_MC + +void *simcall_mc_snapshot(void) +{ + smx_simcall_t simcall = SIMIX_simcall_mine(); + simcall->call = SIMCALL_MC_SNAPSHOT; + + SIMIX_simcall_push(simcall->issuer); + + return simcall->mc_snapshot.s; +} + +int simcall_mc_compare_snapshots(void *s1, void *s2){ + + smx_simcall_t simcall = SIMIX_simcall_mine(); + simcall->call = SIMCALL_MC_COMPARE_SNAPSHOTS; + simcall->mc_compare_snapshots.snapshot1 = s1; + simcall->mc_compare_snapshots.snapshot2 = s2; + + if(MC_is_active()) /* Initialize result to a default value for snapshot comparison done during simcall */ + simcall->mc_compare_snapshots.result = -1; + + SIMIX_simcall_push(simcall->issuer); + + return simcall->mc_compare_snapshots.result; +} + +#endif /* HAVE_MC */ + +/* ****************************************************************************************** */ +/* TUTORIAL: New API */ +/* All functions for simcall */ +/* ****************************************************************************************** */ +int simcall_new_api_fct(const char* param1, double param2){ + smx_simcall_t simcall = SIMIX_simcall_mine(); + simcall->call = SIMCALL_NEW_API_INIT; + simcall->new_api.param1 = param1; + simcall->new_api.param2 = param2; + + SIMIX_simcall_push(simcall->issuer); + return simcall->new_api.result; +} + /* ************************************************************************** */ /** @brief returns a printable string representing a simcall */