Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

diff --git a/examples/msg/io/file.c b/examples/msg/io/file.c
index c490eb0..ed5ed3a 100644 (file)
--- a/examples/msg/io/file.c
+++ b/examples/msg/io/file.c
@@ -21,10 +21,10 @@ int host(int argc, char *argv[])
   XBT_INFO("Host '%s' open %p",MSG_host_get_name(MSG_host_self()), file);
 
   size_t read = MSG_file_read(NULL,0,0,file);
-  XBT_INFO("Host '%s' read %ld",MSG_host_get_name(MSG_host_self()),read);
+  XBT_INFO("Host '%s' read %zu", MSG_host_get_name(MSG_host_self()), read);
 
   size_t write = MSG_file_write(NULL,0,0,file);
-  XBT_INFO("Host '%s' write %ld",MSG_host_get_name(MSG_host_self()), write);
+  XBT_INFO("Host '%s' write %zu", MSG_host_get_name(MSG_host_self()), write);
 
   int res = MSG_file_stat(0,NULL);
   XBT_INFO("Host '%s' stat %d",MSG_host_get_name(MSG_host_self()), res);

diff --git a/examples/smpi/CMakeLists.txt b/examples/smpi/CMakeLists.txt
index 2b248f3..19e4c29 100644 (file)
--- a/examples/smpi/CMakeLists.txt
+++ b/examples/smpi/CMakeLists.txt
@@ -47,6 +47,7 @@ target_link_libraries(dsend m simgrid smpi )
 target_link_libraries(mvmul m simgrid smpi )
 target_link_libraries(smpi_sendrecv m simgrid smpi )
 target_link_libraries(smpi_traced m simgrid smpi )
+target_link_libraries(smpi_traced_simple m simgrid smpi )
 target_link_libraries(ttest01 m simgrid smpi )
 target_link_libraries(mc_bugged1 m simgrid smpi )
 target_link_libraries(mc_bugged2 m simgrid smpi )

diff --git a/include/xbt/automaton.h b/include/xbt/automaton.h
index f140ed2..33acf99 100644 (file)
--- a/include/xbt/automaton.h
+++ b/include/xbt/automaton.h
@@ -28,7 +28,9 @@ typedef struct xbt_automaton {
 typedef struct xbt_automaton* xbt_automaton_t;
 
 typedef struct xbt_exp_label{
-  enum{or=0, and=1, not=2, predicat=3, one=4} type;
+  /* fixme: "or", "and", and "not" are reserved keywords in C++ */
+  /* enum{or=0, and=1, not=2, predicat=3, one=4} type; */
+  int type;
   union{
     struct{
       struct xbt_exp_label* left_exp;

diff --git a/src/msg/msg_gos.c b/src/msg/msg_gos.c
index c97b980..d02ffa7 100644 (file)
--- a/src/msg/msg_gos.c
+++ b/src/msg/msg_gos.c
@@ -410,6 +410,7 @@ XBT_INLINE msg_comm_t MSG_task_isend_with_matching(m_task_t task, const char *al
               "This task is still being used somewhere else. You cannot send it now. Go fix your code!");
 
   t_simdata->isused = 1;
+  t_simdata->comm = NULL;
   msg_global->sent_msg++;
 
   /* Send it by calling SIMIX network layer */
@@ -461,6 +462,7 @@ void MSG_task_dsend(m_task_t task, const char *alias, void_f_pvoid_t cleanup)
               "This task is still being used somewhere else. You cannot send it now. Go fix your code!");
 
   t_simdata->isused = 1;
+  t_simdata->comm = NULL;
   msg_global->sent_msg++;
 
   /* Send it by calling SIMIX network layer */

diff --git a/src/msg/msg_mailbox.c b/src/msg/msg_mailbox.c
index 4eb5053..22917b6 100644 (file)
--- a/src/msg/msg_mailbox.c
+++ b/src/msg/msg_mailbox.c
@@ -147,6 +147,7 @@ MSG_mailbox_put_with_timeout(msg_mailbox_t mailbox, m_task_t task,
               "This task is still being used somewhere else. You cannot send it now. Go fix your code!");
 
   t_simdata->isused=1;
+  t_simdata->comm = NULL;
   msg_global->sent_msg++;