It's amazing how a well-placed ! can make such a difference. :)

[simgrid.git] / src / msg / gos.c

diff --git a/src/msg/gos.c b/src/msg/gos.c
index b6c1235..cb2890e 100644 (file)
--- a/src/msg/gos.c
+++ b/src/msg/gos.c
@@ -233,7 +233,7 @@ MSG_error_t MSG_channel_select_from(m_channel_t channel, double max_duration,
     h_simdata = h->simdata;
     
     DEBUG2("Probing on channel %d (%s)", channel,h->name);
-    while((item = xbt_fifo_getFirstItem(h->simdata->mbox[channel]))) {
+    while(!(item = xbt_fifo_getFirstItem(h->simdata->mbox[channel]))) {
       if(max_duration>0) {
        if(!first_time) {
          MSG_RETURN(MSG_OK);
@@ -505,7 +505,7 @@ static int MSG_get_msgload(void)
    
   CHECK_HOST();
   
-  xbt_abort(0, "This function is still to be specified correctly (what do you mean by 'load', exactly?). In the meantime, please don't use it");
+  xbt_assert0(0, "This function is still to be specified correctly (what do you mean by 'load', exactly?). In the meantime, please don't use it");
   process = MSG_process_self();
   return xbt_fifo_size(process->simdata->host->simdata->process_list);
 }