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
MSG_getClock is a stupid name.
[simgrid.git]
/
src
/
msg
/
global.c
diff --git
a/src/msg/global.c
b/src/msg/global.c
index
885ca40
..
2d000f4
100644
(file)
--- a/
src/msg/global.c
+++ b/
src/msg/global.c
@@
-32,8
+32,7
@@
void MSG_global_init(void)
int argc=0;
char **argv=NULL;
int argc=0;
char **argv=NULL;
- CRITICAL0("Please stop using this function. Use MSG_global_init_args instead.");
- DIE_IMPOSSIBLE;
+ CRITICAL0("Function MSG_global_init() is deprecated by MSG_global_init_args().");
MSG_global_init_args(&argc,argv);
}
MSG_global_init_args(&argc,argv);
}
@@
-43,9
+42,10
@@
void MSG_global_init(void)
void MSG_global_init_args(int *argc, char **argv)
{
if (!msg_global) {
void MSG_global_init_args(int *argc, char **argv)
{
if (!msg_global) {
+ surf_init(argc, argv); /* Initialize some common structures. Warning, it sets msg_global=NULL */
+
msg_global = xbt_new0(s_MSG_Global_t,1);
msg_global = xbt_new0(s_MSG_Global_t,1);
- surf_init(argc, argv); /* Initialize some common structures */
xbt_context_init();
msg_global->host = xbt_fifo_new();
msg_global->process_to_run = xbt_fifo_new();
xbt_context_init();
msg_global->host = xbt_fifo_new();
msg_global->process_to_run = xbt_fifo_new();
@@
-199,7
+199,7
@@
void MSG_paje_output(const char *filename)
int len;
xbt_assert0(msg_global, "Initialize MSG first\n");
int len;
xbt_assert0(msg_global, "Initialize MSG first\n");
- xbt_assert0(!msg_global->paje_output, "Paje output al
l
ready defined\n");
+ xbt_assert0(!msg_global->paje_output, "Paje output already defined\n");
xbt_assert0(filename, "Need a real file name\n");
len = strlen(filename);
xbt_assert0(filename, "Need a real file name\n");
len = strlen(filename);
@@
-208,8
+208,6
@@
void MSG_paje_output(const char *filename)
filename,ext);
}
filename,ext);
}
- xbt_assert0(filename, "Need a real file name\n");
-
msg_global->paje_output=fopen(filename,"w");
xbt_assert1(msg_global->paje_output, "Failed to open %s \n",filename);
msg_global->paje_output=fopen(filename,"w");
xbt_assert1(msg_global->paje_output, "Failed to open %s \n",filename);
@@
-228,7
+226,7
@@
void MSG_paje_output(const char *filename)
*/
void MSG_set_verbosity(MSG_outputmode_t mode)
{
*/
void MSG_set_verbosity(MSG_outputmode_t mode)
{
- CRITICAL0("MSG_set_verbosity :
Not implemented yet
.");
+ CRITICAL0("MSG_set_verbosity :
Deprecated function. Use the XBT logging interface
.");
}
/** \defgroup m_channel_management Understanding channels
}
/** \defgroup m_channel_management Understanding channels
@@
-532,7
+530,7
@@
MSG_error_t MSG_clean(void)
fclose(msg_global->paje_output);
msg_global->paje_output = NULL;
}
fclose(msg_global->paje_output);
msg_global->paje_output = NULL;
}
-
xbt_
free(msg_global);
+ free(msg_global);
surf_finalize();
return MSG_OK;
surf_finalize();
return MSG_OK;
@@
-541,8
+539,16
@@
MSG_error_t MSG_clean(void)
/** \ingroup msg_easier_life
* \brief A clock (in second).
/** \ingroup msg_easier_life
* \brief A clock (in second).
+ * \deprecated Use MSG_get_clock
*/
double MSG_getClock(void) {
return surf_get_clock();
}
*/
double MSG_getClock(void) {
return surf_get_clock();
}
+/** \ingroup msg_easier_life
+ * \brief A clock (in second).
+ */
+double MSG_get_clock(void) {
+ return surf_get_clock();
+}
+