Improving debug informations.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@2192 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/src/msg/global.c b/src/msg/global.c
index 171b93e..d9ec509 100644 (file)
--- a/src/msg/global.c
+++ b/src/msg/global.c
@@ -330,9 +330,9 @@ MSG_error_t MSG_main(void)
       }
       
       if(!state_modifications) {
       }
       
       if(!state_modifications) {

-       DEBUG1("%g : Calling surf_solve",MSG_get_clock());
+       DEBUG1("%f : Calling surf_solve",MSG_get_clock());

        elapsed_time = surf_solve();
        elapsed_time = surf_solve();

-       DEBUG1("Elapsed_time %g",elapsed_time);
+       DEBUG1("Elapsed_time %f",elapsed_time);

        
        if (elapsed_time<0.0) {
          /*       fprintf(stderr, "We're done %g\n",elapsed_time); */
        
        if (elapsed_time<0.0) {
          /*       fprintf(stderr, "We're done %g\n",elapsed_time); */

diff --git a/src/msg/gos.c b/src/msg/gos.c
index 024a4a1..0d75ce0 100644 (file)
--- a/src/msg/gos.c
+++ b/src/msg/gos.c
@@ -65,10 +65,11 @@ static MSG_error_t __MSG_task_get_with_time_out_from_host(m_task_t * task,
        MSG_RETURN(MSG_OK);
       }
     }
        MSG_RETURN(MSG_OK);
       }
     }

-    xbt_assert2(!(h_simdata->sleeping[channel]),
-               "A process (%s(%d)) is already blocked on this channel",
+    xbt_assert3(!(h_simdata->sleeping[channel]),
+               "A process (%s(%d)) is already blocked on channel %d",

                h_simdata->sleeping[channel]->name,
                h_simdata->sleeping[channel]->name,

-               h_simdata->sleeping[channel]->simdata->PID);
+               h_simdata->sleeping[channel]->simdata->PID,
+               channel);

     h_simdata->sleeping[channel] = process; /* I'm waiting. Wake me up when you're ready */
     if(max_duration>0) {
       __MSG_process_block(max_duration);
     h_simdata->sleeping[channel] = process; /* I'm waiting. Wake me up when you're ready */
     if(max_duration>0) {
       __MSG_process_block(max_duration);