A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change variable waiting_task to waiting_action on msg process control.
[simgrid.git]
/
src
/
msg
/
global.c
diff --git
a/src/msg/global.c
b/src/msg/global.c
index
7109a43
..
3870712
100644
(file)
--- a/
src/msg/global.c
+++ b/
src/msg/global.c
@@
-11,17
+11,18
@@
#include "xbt/sysdep.h"
#include "xbt/log.h"
#include "xbt/virtu.h"
#include "xbt/sysdep.h"
#include "xbt/log.h"
#include "xbt/virtu.h"
-#include "xbt/ex.h" /* ex_backtrace_display */
+#include "xbt/ex.h" /* ex_backtrace_display */
+#include "mailbox.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_kernel, msg,
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_kernel, msg,
- "Logging specific to MSG (kernel)");
+
"Logging specific to MSG (kernel)");
MSG_Global_t msg_global = NULL;
/** \defgroup msg_simulation MSG simulation Functions
* \brief This section describes the functions you need to know to
MSG_Global_t msg_global = NULL;
/** \defgroup msg_simulation MSG simulation Functions
* \brief This section describes the functions you need to know to
- * set up a simulation. You should have a look at \ref MSG_examples
+ * set up a simulation. You should have a look at \ref MSG_examples
* to have an overview of their usage.
*/
/** @addtogroup msg_simulation
* to have an overview of their usage.
*/
/** @addtogroup msg_simulation
@@
-38,13
+39,25
@@
void MSG_global_init_args(int *argc, char **argv)
MSG_global_init(argc, argv);
}
MSG_global_init(argc, argv);
}
+
+XBT_LOG_EXTERNAL_CATEGORY(msg_gos);
+XBT_LOG_EXTERNAL_CATEGORY(msg_kernel);
+XBT_LOG_EXTERNAL_CATEGORY(msg_mailbox);
+XBT_LOG_EXTERNAL_CATEGORY(msg_process);
+
/** \ingroup msg_simulation
* \brief Initialize some MSG internal data.
*/
void MSG_global_init(int *argc, char **argv)
{
/** \ingroup msg_simulation
* \brief Initialize some MSG internal data.
*/
void MSG_global_init(int *argc, char **argv)
{
- xbt_getpid =
&
MSG_process_self_PID;
+ xbt_getpid = MSG_process_self_PID;
if (!msg_global) {
if (!msg_global) {
+ /* Connect our log channels: that must be done manually under windows */
+ XBT_LOG_CONNECT(msg_gos, msg);
+ XBT_LOG_CONNECT(msg_kernel, msg);
+ XBT_LOG_CONNECT(msg_mailbox, msg);
+ XBT_LOG_CONNECT(msg_process, msg);
+
SIMIX_global_init(argc, argv);
msg_global = xbt_new0(s_MSG_Global_t, 1);
SIMIX_global_init(argc, argv);
msg_global = xbt_new0(s_MSG_Global_t, 1);
@@
-53,6
+66,13
@@
void MSG_global_init(int *argc, char **argv)
msg_global->process_list = xbt_fifo_new();
msg_global->max_channel = 0;
msg_global->PID = 1;
msg_global->process_list = xbt_fifo_new();
msg_global->max_channel = 0;
msg_global->PID = 1;
+ msg_global->sent_msg = 0;
+
+ /* initialization of the mailbox module */
+ MSG_mailbox_mod_init();
+
+ /* initialization of the action module */
+ _MSG_action_init();
SIMIX_function_register_process_create(_MSG_process_create_from_SIMIX);
SIMIX_function_register_process_cleanup(__MSG_process_cleanup);
SIMIX_function_register_process_create(_MSG_process_create_from_SIMIX);
SIMIX_function_register_process_cleanup(__MSG_process_cleanup);
@@
-75,7
+95,7
@@
void MSG_paje_output(const char *filename)
*/
/** @addtogroup m_channel_management
* \htmlonly <!-- DOXYGEN_NAVBAR_LABEL="Channels" --> \endhtmlonly
*/
/** @addtogroup m_channel_management
* \htmlonly <!-- DOXYGEN_NAVBAR_LABEL="Channels" --> \endhtmlonly
- *
+ *
*
* For convenience, the simulator provides the notion of channel
* that is close to the tag notion in MPI. A channel is not a
*
* For convenience, the simulator provides the notion of channel
* that is close to the tag notion in MPI. A channel is not a
@@
-97,8
+117,8
@@
void MSG_paje_output(const char *filename)
MSG_error_t MSG_set_channel_number(int number)
{
xbt_assert0((msg_global)
MSG_error_t MSG_set_channel_number(int number)
{
xbt_assert0((msg_global)
- && (msg_global->max_channel == 0),
- "Channel number already set!");
+
&& (msg_global->max_channel == 0),
+
"Channel number already set!");
msg_global->max_channel = number;
msg_global->max_channel = number;
@@
-108,50
+128,32
@@
MSG_error_t MSG_set_channel_number(int number)
/** \ingroup m_channel_management
* \brief Return the number of channel in the simulation.
*
/** \ingroup m_channel_management
* \brief Return the number of channel in the simulation.
*
- * This function has to be called once the number of channel is fixed. I can't
+ * This function has to be called once the number of channel is fixed. I can't
figure out a reason why anyone would like to call this function but nevermind.
* \return the number of channel in the simulation.
*/
int MSG_get_channel_number(void)
{
xbt_assert0((msg_global)
figure out a reason why anyone would like to call this function but nevermind.
* \return the number of channel in the simulation.
*/
int MSG_get_channel_number(void)
{
xbt_assert0((msg_global)
- && (msg_global->max_channel != 0),
- "Channel number not set yet!");
+
&& (msg_global->max_channel != 0),
+
"Channel number not set yet!");
return msg_global->max_channel;
}
return msg_global->max_channel;
}
-void __MSG_display_process_status(void)
-{
-}
-
-
-/* FIXME: Yeah, I'll do it in a portable maner one day [Mt] */
-#include <signal.h>
-
-static void _XBT_CALL inthandler(int ignored)
-{
- INFO0("CTRL-C pressed. Displaying status and bailing out");
- __MSG_display_process_status();
- exit(1);
-}
-
/** \ingroup msg_simulation
* \brief Launch the MSG simulation
*/
MSG_error_t MSG_main(void)
{
/** \ingroup msg_simulation
* \brief Launch the MSG simulation
*/
MSG_error_t MSG_main(void)
{
- smx_cond_t cond = NULL;
smx_action_t smx_action;
xbt_fifo_t actions_done = xbt_fifo_new();
xbt_fifo_t actions_failed = xbt_fifo_new();
smx_action_t smx_action;
xbt_fifo_t actions_done = xbt_fifo_new();
xbt_fifo_t actions_failed = xbt_fifo_new();
- /* Prepare to display some more info when dying on Ctrl-C pressing */
- signal(SIGINT, inthandler);
-
/* Clean IO before the run */
fflush(stdout);
fflush(stderr);
/* Clean IO before the run */
fflush(stdout);
fflush(stderr);
+ SIMIX_init();
//surf_solve(); /* Takes traces into account. Returns 0.0 */
/* xbt_fifo_size(msg_global->process_to_run) */
//surf_solve(); /* Takes traces into account. Returns 0.0 */
/* xbt_fifo_size(msg_global->process_to_run) */
@@
-159,24
+161,13
@@
MSG_error_t MSG_main(void)
while (SIMIX_solve(actions_done, actions_failed) != -1.0) {
while ((smx_action = xbt_fifo_pop(actions_failed))) {
while (SIMIX_solve(actions_done, actions_failed) != -1.0) {
while ((smx_action = xbt_fifo_pop(actions_failed))) {
-
-
- DEBUG1("** %s failed **", smx_action->name);
- while ((cond = xbt_fifo_pop(smx_action->cond_list))) {
- SIMIX_cond_broadcast(cond);
- }
- /* action finished, destroy it */
- // SIMIX_action_destroy(smx_action);
+ DEBUG1("** %s failed **", SIMIX_action_get_name(smx_action));
+ SIMIX_action_signal_all(smx_action);
}
while ((smx_action = xbt_fifo_pop(actions_done))) {
}
while ((smx_action = xbt_fifo_pop(actions_done))) {
-
- DEBUG1("** %s done **", smx_action->name);
- while ((cond = xbt_fifo_pop(smx_action->cond_list))) {
- SIMIX_cond_broadcast(cond);
- }
- /* action finished, destroy it */
- //SIMIX_action_destroy(smx_action);
+ DEBUG1("** %s done **", SIMIX_action_get_name(smx_action));
+ SIMIX_action_signal_all(smx_action);
}
}
xbt_fifo_free(actions_failed);
}
}
xbt_fifo_free(actions_failed);
@@
-232,6
+223,10
@@
MSG_error_t MSG_clean(void)
free(msg_global);
msg_global = NULL;
free(msg_global);
msg_global = NULL;
+
+ /* cleanup all resources in the mailbox module */
+ MSG_mailbox_mod_exit();
+
SIMIX_clean();
return MSG_OK;
SIMIX_clean();
return MSG_OK;
@@
-245,3
+240,8
@@
double MSG_get_clock(void)
{
return SIMIX_get_clock();
}
{
return SIMIX_get_clock();
}
+
+unsigned long int MSG_get_sent_msg()
+{
+ return msg_global->sent_msg;
+}