From: navarro Date: Fri, 3 Feb 2012 14:49:06 +0000 (+0100) Subject: Put #ifdef MSG_USE_DEPRECATED for all functions with channel mecanism. X-Git-Tag: exp_20120216~65^2 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/b070d7cc294509944f728b688883fbc05db17346?hp=cb8c69ffa2625f5d14255ede0a59d9ab964bffab Put #ifdef MSG_USE_DEPRECATED for all functions with channel mecanism. --- diff --git a/include/msg/datatypes.h b/include/msg/datatypes.h index 020605076b..edb9b7366f 100644 --- a/include/msg/datatypes.h +++ b/include/msg/datatypes.h @@ -106,6 +106,7 @@ typedef struct msg_comm *msg_comm_t; typedef struct s_smx_process *m_process_t; /** @} */ +#ifdef MSG_USE_DEPRECATED /* ********************************* Channel ******************************** */ /** @brief Channel datatype @ingroup m_datatypes_management @@ -116,6 +117,7 @@ typedef struct s_smx_process *m_process_t; @{ */ typedef int m_channel_t; /** @} */ +#endif /* ******************************** Mailbox ************************************ */ diff --git a/include/msg/msg.h b/include/msg/msg.h index c8691f0b4c..4a5c6e9344 100644 --- a/include/msg/msg.h +++ b/include/msg/msg.h @@ -19,8 +19,6 @@ SG_BEGIN_DECL() XBT_PUBLIC(void) MSG_config(const char *name, ...); XBT_PUBLIC(void) MSG_global_init(int *argc, char **argv); XBT_PUBLIC(void) MSG_global_init_args(int *argc, char **argv); -XBT_PUBLIC(MSG_error_t) MSG_set_channel_number(int number); -XBT_PUBLIC(int) MSG_get_channel_number(void); XBT_PUBLIC(MSG_error_t) MSG_main(void); XBT_PUBLIC(MSG_error_t) MSG_main_stateful(void); XBT_PUBLIC(MSG_error_t) MSG_main_liveness(xbt_automaton_t a, char *prgm); @@ -119,7 +117,6 @@ XBT_PUBLIC(MSG_error_t) MSG_process_resume(m_process_t process); XBT_PUBLIC(int) MSG_process_is_suspended(m_process_t process); /************************** Task handling ************************************/ - XBT_PUBLIC(m_task_t) MSG_task_create(const char *name, double compute_duration, double message_size, void *data); @@ -140,36 +137,13 @@ XBT_PUBLIC(void) MSG_task_set_name(m_task_t task, const char *name); XBT_PUBLIC(MSG_error_t) MSG_task_cancel(m_task_t task); XBT_PUBLIC(MSG_error_t) MSG_task_destroy(m_task_t task); -XBT_PUBLIC(MSG_error_t) MSG_task_get(m_task_t * task, m_channel_t channel); -XBT_PUBLIC(MSG_error_t) MSG_task_get_with_timeout(m_task_t * task, - m_channel_t channel, - double max_duration); -XBT_PUBLIC(MSG_error_t) MSG_task_get_from_host(m_task_t * task, - int channel, m_host_t host); MSG_error_t MSG_task_receive_from_host(m_task_t * task, const char *alias, m_host_t host); -XBT_PUBLIC(MSG_error_t) MSG_task_get_ext(m_task_t * task, int channel, - double max_duration, - m_host_t host); - -XBT_PUBLIC(MSG_error_t) MSG_task_put(m_task_t task, m_host_t dest, - m_channel_t channel); -XBT_PUBLIC(MSG_error_t) MSG_task_put_bounded(m_task_t task, - m_host_t dest, - m_channel_t channel, - double max_rate); -XBT_PUBLIC(MSG_error_t) MSG_task_put_with_timeout(m_task_t task, - m_host_t dest, - m_channel_t channel, - double max_duration); XBT_PUBLIC(MSG_error_t) MSG_task_execute(m_task_t task); XBT_PUBLIC(MSG_error_t) MSG_parallel_task_execute(m_task_t task); XBT_PUBLIC(void) MSG_task_set_priority(m_task_t task, double priority); -XBT_PUBLIC(int) MSG_task_Iprobe(m_channel_t channel); -XBT_PUBLIC(int) MSG_task_probe_from(m_channel_t channel); -XBT_PUBLIC(int) MSG_task_probe_from_host(int channel, m_host_t host); XBT_PUBLIC(MSG_error_t) MSG_process_sleep(double nb_sec); XBT_PUBLIC(double) MSG_task_get_compute_duration(m_task_t task); @@ -252,6 +226,32 @@ MSG_error_t MSG_action_trace_run(char *path); #define MSG_process_change_host(h) MSG_process_migrate(MSG_process_self(),h); XBT_PUBLIC(MSG_error_t) MSG_get_errno(void); + +XBT_PUBLIC(MSG_error_t) MSG_task_get(m_task_t * task, m_channel_t channel); +XBT_PUBLIC(MSG_error_t) MSG_task_get_with_timeout(m_task_t * task, + m_channel_t channel, + double max_duration); +XBT_PUBLIC(MSG_error_t) MSG_task_get_from_host(m_task_t * task, + int channel, m_host_t host); +XBT_PUBLIC(MSG_error_t) MSG_task_get_ext(m_task_t * task, int channel, + double max_duration, + m_host_t host); +XBT_PUBLIC(MSG_error_t) MSG_task_put(m_task_t task, m_host_t dest, + m_channel_t channel); +XBT_PUBLIC(MSG_error_t) MSG_task_put_bounded(m_task_t task, + m_host_t dest, + m_channel_t channel, + double max_rate); +XBT_PUBLIC(MSG_error_t) MSG_task_put_with_timeout(m_task_t task, + m_host_t dest, + m_channel_t channel, + double max_duration); +XBT_PUBLIC(int) MSG_task_Iprobe(m_channel_t channel); +XBT_PUBLIC(int) MSG_task_probe_from(m_channel_t channel); +XBT_PUBLIC(int) MSG_task_probe_from_host(int channel, m_host_t host); + +XBT_PUBLIC(MSG_error_t) MSG_set_channel_number(int number); +XBT_PUBLIC(int) MSG_get_channel_number(void); #endif #include "instr/instr.h" diff --git a/src/msg/msg_global.c b/src/msg/msg_global.c index 7b0c29e6ac..1cfcfa3ccf 100644 --- a/src/msg/msg_global.c +++ b/src/msg/msg_global.c @@ -64,7 +64,9 @@ void MSG_global_init(int *argc, char **argv) msg_global = xbt_new0(s_MSG_Global_t, 1); +#ifdef MSG_USE_DEPRECATED msg_global->max_channel = 0; +#endif msg_global->PID = 1; msg_global->sent_msg = 0; msg_global->task_copy_callback = NULL; @@ -85,6 +87,7 @@ void MSG_global_init(int *argc, char **argv) MSG_HOST_LEVEL = xbt_lib_add_level(host_lib, (void_f_pvoid_t) __MSG_host_destroy); } +#ifdef MSG_USE_DEPRECATED /** \defgroup m_channel_management Understanding channels * \brief This section briefly describes the channel notion of MSG * (#m_channel_t). @@ -138,6 +141,7 @@ int MSG_get_channel_number(void) return msg_global->max_channel; } +#endif /** \ingroup msg_simulation * \brief Launch the MSG simulation diff --git a/src/msg/msg_gos.c b/src/msg/msg_gos.c index d02ffa72cf..c97838ae78 100644 --- a/src/msg/msg_gos.c +++ b/src/msg/msg_gos.c @@ -247,91 +247,6 @@ MSG_error_t MSG_process_sleep(double nb_sec) } } -/** \ingroup msg_gos_functions - * \brief Listen on \a channel and waits for receiving a task from \a host. - * - * It takes three parameters. - * \param task a memory location for storing a #m_task_t. It will - hold a task when this function will return. Thus \a task should not - be equal to \c NULL and \a *task should be equal to \c NULL. If one of - those two condition does not hold, there will be a warning message. - * \param channel the channel on which the agent should be - listening. This value has to be >=0 and < than the maximal - number of channels fixed with MSG_set_channel_number(). - * \param host the host that is to be watched. - * \return a #MSG_error_t indicating whether the operation was successful (#MSG_OK), or why it failed otherwise. - */ -MSG_error_t -MSG_task_get_from_host(m_task_t * task, m_channel_t channel, m_host_t host) -{ - XBT_WARN("DEPRECATED! Now use MSG_task_receive_from_host"); - return MSG_task_get_ext(task, channel, -1, host); -} - -/** \ingroup msg_gos_functions - * \brief Listen on a channel and wait for receiving a task. - * - * It takes two parameters. - * \param task a memory location for storing a #m_task_t. It will - hold a task when this function will return. Thus \a task should not - be equal to \c NULL and \a *task should be equal to \c NULL. If one of - those two condition does not hold, there will be a warning message. - * \param channel the channel on which the agent should be - listening. This value has to be >=0 and < than the maximal - number of channels fixed with MSG_set_channel_number(). - * \return a #MSG_error_t indicating whether the operation was successful (#MSG_OK), or why it failed otherwise. - */ -MSG_error_t MSG_task_get(m_task_t * task, m_channel_t channel) -{ - XBT_WARN("DEPRECATED! Now use MSG_task_receive"); - return MSG_task_get_with_timeout(task, channel, -1); -} - -/** \ingroup msg_gos_functions - * \brief Listen on a channel and wait for receiving a task with a timeout. - * - * It takes three parameters. - * \param task a memory location for storing a #m_task_t. It will - hold a task when this function will return. Thus \a task should not - be equal to \c NULL and \a *task should be equal to \c NULL. If one of - those two condition does not hold, there will be a warning message. - * \param channel the channel on which the agent should be - listening. This value has to be >=0 and < than the maximal - number of channels fixed with MSG_set_channel_number(). - * \param max_duration the maximum time to wait for a task before giving - up. In such a case, #MSG_TRANSFER_FAILURE will be returned, \a task - will not be modified and will still be - equal to \c NULL when returning. - * \return a #MSG_error_t indicating whether the operation was successful (#MSG_OK), or why it failed otherwise. - */ -MSG_error_t -MSG_task_get_with_timeout(m_task_t * task, m_channel_t channel, - double max_duration) -{ - XBT_WARN("DEPRECATED! Now use MSG_task_receive_with_timeout"); - return MSG_task_get_ext(task, channel, max_duration, NULL); -} - -/** \defgroup msg_gos_functions MSG Operating System Functions - * \brief This section describes the functions that can be used - * by an agent for handling some task. - */ - -MSG_error_t -MSG_task_get_ext(m_task_t * task, m_channel_t channel, double timeout, - m_host_t host) -{ - XBT_WARN("DEPRECATED! Now use MSG_task_receive_ext"); - xbt_assert((channel >= 0) - && (channel < msg_global->max_channel), "Invalid channel %d", - channel); - - return - MSG_mailbox_get_task_ext(MSG_mailbox_get_by_channel - (MSG_host_self(), channel), task, host, - timeout); -} - MSG_error_t MSG_task_receive_from_host(m_task_t * task, const char *alias, m_host_t host) @@ -781,6 +696,69 @@ void MSG_comm_copy_data_from_SIMIX(smx_action_t comm, void* buff, size_t buff_si } } +MSG_error_t MSG_task_send(m_task_t task, const char *alias) +{ + XBT_DEBUG("MSG_task_send: Trying to send a message on mailbox '%s'", alias); + return MSG_task_send_with_timeout(task, alias, -1); +} + + +MSG_error_t +MSG_task_send_bounded(m_task_t task, const char *alias, double maxrate) +{ + task->simdata->rate = maxrate; + return MSG_task_send(task, alias); +} + + +MSG_error_t +MSG_task_send_with_timeout(m_task_t task, const char *alias, + double timeout) +{ + return MSG_mailbox_put_with_timeout(MSG_mailbox_get_by_alias(alias), + task, timeout); +} + +int MSG_task_listen(const char *alias) +{ + CHECK_HOST(); + + return !MSG_mailbox_is_empty(MSG_mailbox_get_by_alias(alias)); +} + +int MSG_task_listen_from_host(const char *alias, m_host_t host) +{ + CHECK_HOST(); + + return + MSG_mailbox_get_count_host_waiting_tasks(MSG_mailbox_get_by_alias + (alias), host); +} + +int MSG_task_listen_from(const char *alias) +{ + m_task_t task; + + CHECK_HOST(); + + if (NULL == + (task = MSG_mailbox_get_head(MSG_mailbox_get_by_alias(alias)))) + return -1; + + return MSG_process_get_PID(task->simdata->sender); +} + +#ifdef MSG_USE_DEPRECATED +/** \ingroup msg_gos_functions + * + * \brief Return the last value returned by a MSG function (except + * MSG_get_errno...). + */ +MSG_error_t MSG_get_errno(void) +{ + return PROCESS_GET_ERRNO(); +} + /** \ingroup msg_gos_functions * \brief Put a task on a channel of an host and waits for the end of the * transmission. @@ -870,34 +848,33 @@ MSG_task_put_with_timeout(m_task_t task, m_host_t dest, (dest, channel), task, timeout); } -MSG_error_t MSG_task_send(m_task_t task, const char *alias) -{ - XBT_DEBUG("MSG_task_send: Trying to send a message on mailbox '%s'", alias); - return MSG_task_send_with_timeout(task, alias, -1); -} - - -MSG_error_t -MSG_task_send_bounded(m_task_t task, const char *alias, double maxrate) +/** \ingroup msg_gos_functions + * \brief Test whether there is a pending communication on a channel, and who sent it. + * + * It takes one parameter. + * \param channel the channel on which the agent should be + listening. This value has to be >=0 and < than the maximal + number of channels fixed with MSG_set_channel_number(). + * \return -1 if there is no pending communication and the PID of the process who sent it otherwise + */ +int MSG_task_probe_from(m_channel_t channel) { - task->simdata->rate = maxrate; - return MSG_task_send(task, alias); -} + XBT_WARN("DEPRECATED! Now use MSG_task_listen_from"); + m_task_t task; + CHECK_HOST(); -MSG_error_t -MSG_task_send_with_timeout(m_task_t task, const char *alias, - double timeout) -{ - return MSG_mailbox_put_with_timeout(MSG_mailbox_get_by_alias(alias), - task, timeout); -} + xbt_assert((channel >= 0) + && (channel < msg_global->max_channel), "Invalid channel %d", + channel); -int MSG_task_listen(const char *alias) -{ - CHECK_HOST(); + if (NULL == + (task = + MSG_mailbox_get_head(MSG_mailbox_get_by_channel + (MSG_host_self(), channel)))) + return -1; - return !MSG_mailbox_is_empty(MSG_mailbox_get_by_alias(alias)); + return MSG_process_get_PID(task->simdata->sender); } /** \ingroup msg_gos_functions @@ -952,65 +929,89 @@ int MSG_task_probe_from_host(int channel, m_host_t host) } -int MSG_task_listen_from_host(const char *alias, m_host_t host) +/** \ingroup msg_gos_functions + * \brief Listen on \a channel and waits for receiving a task from \a host. + * + * It takes three parameters. + * \param task a memory location for storing a #m_task_t. It will + hold a task when this function will return. Thus \a task should not + be equal to \c NULL and \a *task should be equal to \c NULL. If one of + those two condition does not hold, there will be a warning message. + * \param channel the channel on which the agent should be + listening. This value has to be >=0 and < than the maximal + number of channels fixed with MSG_set_channel_number(). + * \param host the host that is to be watched. + * \return a #MSG_error_t indicating whether the operation was successful (#MSG_OK), or why it failed otherwise. + */ +MSG_error_t +MSG_task_get_from_host(m_task_t * task, m_channel_t channel, m_host_t host) { - CHECK_HOST(); + XBT_WARN("DEPRECATED! Now use MSG_task_receive_from_host"); + return MSG_task_get_ext(task, channel, -1, host); +} - return - MSG_mailbox_get_count_host_waiting_tasks(MSG_mailbox_get_by_alias - (alias), host); +/** \ingroup msg_gos_functions + * \brief Listen on a channel and wait for receiving a task. + * + * It takes two parameters. + * \param task a memory location for storing a #m_task_t. It will + hold a task when this function will return. Thus \a task should not + be equal to \c NULL and \a *task should be equal to \c NULL. If one of + those two condition does not hold, there will be a warning message. + * \param channel the channel on which the agent should be + listening. This value has to be >=0 and < than the maximal + number of channels fixed with MSG_set_channel_number(). + * \return a #MSG_error_t indicating whether the operation was successful (#MSG_OK), or why it failed otherwise. + */ +MSG_error_t MSG_task_get(m_task_t * task, m_channel_t channel) +{ + XBT_WARN("DEPRECATED! Now use MSG_task_receive"); + return MSG_task_get_with_timeout(task, channel, -1); } /** \ingroup msg_gos_functions - * \brief Test whether there is a pending communication on a channel, and who sent it. + * \brief Listen on a channel and wait for receiving a task with a timeout. * - * It takes one parameter. + * It takes three parameters. + * \param task a memory location for storing a #m_task_t. It will + hold a task when this function will return. Thus \a task should not + be equal to \c NULL and \a *task should be equal to \c NULL. If one of + those two condition does not hold, there will be a warning message. * \param channel the channel on which the agent should be listening. This value has to be >=0 and < than the maximal number of channels fixed with MSG_set_channel_number(). - * \return -1 if there is no pending communication and the PID of the process who sent it otherwise + * \param max_duration the maximum time to wait for a task before giving + up. In such a case, #MSG_TRANSFER_FAILURE will be returned, \a task + will not be modified and will still be + equal to \c NULL when returning. + * \return a #MSG_error_t indicating whether the operation was successful (#MSG_OK), or why it failed otherwise. */ -int MSG_task_probe_from(m_channel_t channel) +MSG_error_t +MSG_task_get_with_timeout(m_task_t * task, m_channel_t channel, + double max_duration) { - XBT_WARN("DEPRECATED! Now use MSG_task_listen_from"); - m_task_t task; + XBT_WARN("DEPRECATED! Now use MSG_task_receive_with_timeout"); + return MSG_task_get_ext(task, channel, max_duration, NULL); +} - CHECK_HOST(); +/** \defgroup msg_gos_functions MSG Operating System Functions + * \brief This section describes the functions that can be used + * by an agent for handling some task. + */ +MSG_error_t +MSG_task_get_ext(m_task_t * task, m_channel_t channel, double timeout, + m_host_t host) +{ + XBT_WARN("DEPRECATED! Now use MSG_task_receive_ext"); xbt_assert((channel >= 0) && (channel < msg_global->max_channel), "Invalid channel %d", channel); - if (NULL == - (task = - MSG_mailbox_get_head(MSG_mailbox_get_by_channel - (MSG_host_self(), channel)))) - return -1; - - return MSG_process_get_PID(task->simdata->sender); -} - -int MSG_task_listen_from(const char *alias) -{ - m_task_t task; - - CHECK_HOST(); - - if (NULL == - (task = MSG_mailbox_get_head(MSG_mailbox_get_by_alias(alias)))) - return -1; - - return MSG_process_get_PID(task->simdata->sender); + return + MSG_mailbox_get_task_ext(MSG_mailbox_get_by_channel + (MSG_host_self(), channel), task, host, + timeout); } -#ifdef MSG_USE_DEPRECATED -/** \ingroup msg_gos_functions - * - * \brief Return the last value returned by a MSG function (except - * MSG_get_errno...). - */ -MSG_error_t MSG_get_errno(void) -{ - return PROCESS_GET_ERRNO(); -} #endif diff --git a/src/msg/msg_host.c b/src/msg/msg_host.c index 1723408379..b2a53eb2af 100644 --- a/src/msg/msg_host.c +++ b/src/msg/msg_host.c @@ -31,9 +31,6 @@ m_host_t __MSG_host_create(smx_host_t workstation, void *data) const char *name; simdata_host_t simdata = xbt_new0(s_simdata_host_t, 1); m_host_t host = xbt_new0(s_m_host_t, 1); - int i; - - char alias[MAX_ALIAS_NAME + 1] = { 0 }; /* buffer used to build the key of the mailbox */ name = SIMIX_host_get_name(workstation); /* Host structure */ @@ -43,6 +40,10 @@ m_host_t __MSG_host_create(smx_host_t workstation, void *data) simdata->smx_host = workstation; +#ifdef MSG_USE_DEPRECATED + int i; + char alias[MAX_ALIAS_NAME + 1] = { 0 }; /* buffer used to build the key of the mailbox */ + if (msg_global->max_channel > 0) simdata->mailboxes = xbt_new0(msg_mailbox_t, msg_global->max_channel); @@ -53,6 +54,7 @@ m_host_t __MSG_host_create(smx_host_t workstation, void *data) simdata->mailboxes[i] = MSG_mailbox_new(alias); memset(alias, 0, MAX_ALIAS_NAME + 1); } +#endif simcall_host_set_data(workstation, host); xbt_lib_set(host_lib,name,MSG_HOST_LEVEL,host); @@ -133,8 +135,10 @@ void __MSG_host_destroy(m_host_t host) /* Clean simulator data */ simdata = (host)->simdata; +#ifdef MSG_USE_DEPRECATED if (msg_global->max_channel > 0) free(simdata->mailboxes); +#endif free(simdata); diff --git a/src/msg/msg_mailbox.c b/src/msg/msg_mailbox.c index 22917b66d1..199b7c423f 100644 --- a/src/msg/msg_mailbox.c +++ b/src/msg/msg_mailbox.c @@ -55,18 +55,6 @@ msg_mailbox_t MSG_mailbox_get_by_alias(const char *alias) return mailbox; } -msg_mailbox_t MSG_mailbox_get_by_channel(m_host_t host, - m_channel_t channel) -{ - XBT_WARN("DEPRECATED! Now use MSG_mailbox_get_by_alias"); - xbt_assert((host != NULL), "Invalid host"); - xbt_assert((channel >= 0) - && (channel < msg_global->max_channel), "Invalid channel %d", - channel); - - return host->simdata->mailboxes[(size_t) channel]; -} - MSG_error_t MSG_mailbox_get_task_ext(msg_mailbox_t mailbox, m_task_t * task, m_host_t host, double timeout) @@ -195,3 +183,17 @@ MSG_mailbox_put_with_timeout(msg_mailbox_t mailbox, m_task_t task, #endif MSG_RETURN(ret); } + +#ifdef MSG_USE_DEPRECATED +msg_mailbox_t MSG_mailbox_get_by_channel(m_host_t host, + m_channel_t channel) +{ + XBT_WARN("DEPRECATED! Now use MSG_mailbox_get_by_alias"); + xbt_assert((host != NULL), "Invalid host"); + xbt_assert((channel >= 0) + && (channel < msg_global->max_channel), "Invalid channel %d", + channel); + + return host->simdata->mailboxes[(size_t) channel]; +} +#endif diff --git a/src/msg/msg_mailbox.h b/src/msg/msg_mailbox.h index aa1ab44775..5ec804bf0a 100644 --- a/src/msg/msg_mailbox.h +++ b/src/msg/msg_mailbox.h @@ -52,22 +52,6 @@ void MSG_mailbox_free(void *mailbox); XBT_PUBLIC(msg_mailbox_t) MSG_mailbox_get_by_alias(const char *alias); -/* \brief MSG_mailbox_get_by_channel - get a mailbox of the specified host from its channel. - * - * The function MSG_mailbox_get_by_channel returns the mailbox of the - * specified host from the channel specified by the parameter - * channel. If the mailbox does not exists, the function fails. - * - * \param host The host containing he mailbox to get. - * \param channel The channel used to identify the mailbox. - * - * \return The mailbox of the specified host associated the channel - * specified as parameter. - * - */ -XBT_PUBLIC(msg_mailbox_t) - MSG_mailbox_get_by_channel(m_host_t host, m_channel_t channel); - /*! \brief MSG_mailbox_is_empty - test if a mailbox is empty. * * The function MSG_mailbox_is_empty tests if a mailbox is empty @@ -108,6 +92,23 @@ XBT_PUBLIC(int) MSG_mailbox_get_count_host_waiting_tasks(msg_mailbox_t mailbox, m_host_t host); +#ifdef MSG_USE_DEPRECATED +/* \brief MSG_mailbox_get_by_channel - get a mailbox of the specified host from its channel. + * + * The function MSG_mailbox_get_by_channel returns the mailbox of the + * specified host from the channel specified by the parameter + * channel. If the mailbox does not exists, the function fails. + * + * \param host The host containing he mailbox to get. + * \param channel The channel used to identify the mailbox. + * + * \return The mailbox of the specified host associated the channel + * specified as parameter. + * + */ +XBT_PUBLIC(msg_mailbox_t) + MSG_mailbox_get_by_channel(m_host_t host, m_channel_t channel); +#endif SG_END_DECL() #endif /* !SMX_MAILBOX_H */ diff --git a/src/msg/msg_private.h b/src/msg/msg_private.h index 1c5a83fff8..b45fd87399 100644 --- a/src/msg/msg_private.h +++ b/src/msg/msg_private.h @@ -52,7 +52,9 @@ typedef struct simdata_process { int PID; /* used for debugging purposes */ int PPID; /* The parent PID */ m_host_t put_host; /* used for debugging purposes */ +#ifdef MSG_USE_DEPRECATED m_channel_t put_channel; /* used for debugging purposes */ +#endif smx_action_t waiting_action; m_task_t waiting_task; char **argv; /* arguments table if any */ @@ -81,7 +83,9 @@ typedef struct msg_comm { /************************** Global variables ********************************/ typedef struct MSG_Global { xbt_fifo_t host; +#ifdef MSG_USE_DEPRECATED int max_channel; +#endif int PID; int session; unsigned long int sent_msg; /* Total amount of messages sent during the simulation */