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

diff --git a/src/msg/msg_gos.c b/src/msg/msg_gos.c
index c0cce18..061ddf4 100644 (file)
--- a/src/msg/msg_gos.c
+++ b/src/msg/msg_gos.c
@@ -625,7 +625,8 @@ void MSG_comm_destroy(msg_comm_t comm)
  *
  * It takes two parameters.
  * \param comm the communication to wait.
- * \param timeout Wait until the communication terminates or the timeout occurs
+ * \param timeout Wait until the communication terminates or the timeout 
+occurs. You can provide a -1 timeout to obtain an infinite timeout.
  * \return MSG_error_t
  */
 MSG_error_t MSG_comm_wait(msg_comm_t comm, double timeout)

diff --git a/src/msg/msg_vm.c b/src/msg/msg_vm.c
index f940a20..bda366c 100644 (file)
--- a/src/msg/msg_vm.c
+++ b/src/msg/msg_vm.c
@@ -166,9 +166,9 @@ void MSG_vm_destroy(msg_vm_t vm) {
        unsigned int cpt;
        m_process_t process;
        xbt_dynar_foreach(vm->processes,cpt,process) {
-               //FIXME: Slow ?
-               simdata_process_t simdata = simcall_process_get_data(process);
-               simdata->vm = NULL;
+         //FIXME: Slow ?
+         simdata_process_t simdata = simcall_process_get_data(process);
+         simdata->vm = NULL;
        }
        xbt_dynar_free(&vm->processes);
        xbt_free(vm);