xbt_fifo are no longer used, remove the code

[simgrid.git] / src / simix / smx_network.cpp

diff --git a/src/simix/smx_network.cpp b/src/simix/smx_network.cpp
index c17b27b..89c5a5c 100644 (file)
--- a/src/simix/smx_network.cpp
+++ b/src/simix/smx_network.cpp
@@ -118,7 +118,7 @@ XBT_PRIVATE smx_activity_t simcall_HANDLER_comm_isend(smx_simcall_t simcall, smx
       other_comm->dst_proc=mbox->permanent_receiver.get();
       other_comm->ref();
       mbox->done_comm_queue.push_back(other_synchro);
-      XBT_DEBUG("pushing a message into the permanent receive fifo %p, comm %p", mbox, &(other_comm));
+      XBT_DEBUG("pushing a message into the permanent receive list %p, comm %p", mbox, &(other_comm));
 
     }else{
       mbox->push(this_synchro);
@@ -131,7 +131,7 @@ XBT_PRIVATE smx_activity_t simcall_HANDLER_comm_isend(smx_simcall_t simcall, smx
     other_comm->type = SIMIX_COMM_READY;
 
   }
-  xbt_fifo_push(src_proc->comms, other_synchro);
+  src_proc->comms.push_back(other_synchro);
 
 
   if (detached) {
@@ -191,15 +191,15 @@ smx_activity_t SIMIX_comm_irecv(smx_actor_t dst_proc, smx_mailbox_t mbox, void *
   simgrid::kernel::activity::Comm* this_synchro = new simgrid::kernel::activity::Comm(SIMIX_COMM_RECEIVE);
 
   smx_activity_t other_synchro;
-  //communication already done, get it inside the fifo of completed comms
+  //communication already done, get it inside the list of completed comms
   if (mbox->permanent_receiver != nullptr && ! mbox->done_comm_queue.empty()) {
 
     XBT_DEBUG("We have a comm that has probably already been received, trying to match it, to skip the communication");
-    //find a match in the already received fifo
+    //find a match in the list of already received comms
     other_synchro = _find_matching_comm(&mbox->done_comm_queue, SIMIX_COMM_SEND, match_fun, data, this_synchro,/*remove_matching*/true);
     //if not found, assume the receiver came first, register it to the mailbox in the classical way
     if (!other_synchro)  {
-      XBT_DEBUG("We have messages in the permanent receive list, but not the one we are looking for, pushing request into fifo");
+      XBT_DEBUG("We have messages in the permanent receive list, but not the one we are looking for, pushing request into list");
       other_synchro = this_synchro;
       mbox->push(this_synchro);
     } else {
@@ -234,7 +234,7 @@ smx_activity_t SIMIX_comm_irecv(smx_actor_t dst_proc, smx_mailbox_t mbox, void *
       other_comm->state = SIMIX_READY;
       other_comm->type = SIMIX_COMM_READY;
     }
-    xbt_fifo_push(dst_proc->comms, other_synchro);
+    dst_proc->comms.push_back(other_synchro);
   }
 
   /* Setup communication synchro */
@@ -633,21 +633,21 @@ void SIMIX_comm_finish(smx_activity_t synchro)
     }
 
     simcall->issuer->waiting_synchro = nullptr;
-    xbt_fifo_remove(simcall->issuer->comms, synchro);
+    simcall->issuer->comms.remove(synchro);
     if(comm->detached){
       if(simcall->issuer == comm->src_proc){
         if(comm->dst_proc)
-          xbt_fifo_remove(comm->dst_proc->comms, synchro);
+          comm->dst_proc->comms.remove(synchro);
       }
       else if(simcall->issuer == comm->dst_proc){
         if(comm->src_proc)
-          xbt_fifo_remove(comm->src_proc->comms, synchro);
+          comm->src_proc->comms.remove(synchro);
         //in case of a detached comm we have an extra ref to remove, as the sender won't do it
         destroy_count++;
       }
       else{
-        xbt_fifo_remove(comm->dst_proc->comms, synchro);
-        xbt_fifo_remove(comm->src_proc->comms, synchro);
+        comm->dst_proc->comms.remove(synchro);
+        comm->src_proc->comms.remove(synchro);
       }
     }