xbt_fifo -> std::list

diff --git a/src/simix/ActorImpl.cpp b/src/simix/ActorImpl.cpp
index 8f372df..bc0c3d2 100644 (file)
--- a/src/simix/ActorImpl.cpp
+++ b/src/simix/ActorImpl.cpp
@@ -74,7 +74,7 @@ smx_actor_t SIMIX_process_self()
  */
 int SIMIX_process_has_pending_comms(smx_actor_t process) {
 
-  return xbt_fifo_size(process->comms) > 0;
+  return process->comms.size() > 0;
 }
 
 /**
@@ -95,8 +95,8 @@ void SIMIX_process_cleanup(smx_actor_t process)
   xbt_os_mutex_acquire(simix_global->mutex);
 
   /* cancel non-blocking communications */
-  smx_activity_t synchro = static_cast<smx_activity_t>(xbt_fifo_pop(process->comms));
-  while (synchro != nullptr) {
+  smx_activity_t synchro = static_cast<smx_activity_t>(process->comms.front());
+  while (!process->comms.empty()) {
     simgrid::kernel::activity::Comm *comm = static_cast<simgrid::kernel::activity::Comm*>(synchro);
 
     /* make sure no one will finish the comm after this process is destroyed,
@@ -122,14 +122,15 @@ void SIMIX_process_cleanup(smx_actor_t process)
 
       if (comm->detached && comm->src_proc != nullptr) {
         /* the comm will be freed right now, remove it from the sender */
-        xbt_fifo_remove(comm->src_proc->comms, comm);
+        comm->src_proc->comms.remove(comm);
       }
       
       comm->unref();
     } else {
       xbt_die("Communication synchro %p is in my list but I'm not the sender nor the receiver", synchro);
     }
-    synchro = static_cast<smx_activity_t>(xbt_fifo_pop(process->comms));
+    process->comms.pop_front();
+    synchro = static_cast<smx_activity_t>(process->comms.front());
   }
 
   XBT_DEBUG("%p should not be run anymore",process);
@@ -166,8 +167,6 @@ ActorImpl::~ActorImpl()
   delete this->context;
   if (this->properties)
     xbt_dict_free(&this->properties);
-  if (this->comms != nullptr)
-    xbt_fifo_free(this->comms);
   if (this->on_exit)
     xbt_dynar_free(&this->on_exit);
 }
@@ -415,7 +414,7 @@ void SIMIX_process_kill(smx_actor_t process, smx_actor_t issuer) {
       exec->unref();
 
     } else if (comm != nullptr) {
-      xbt_fifo_remove(process->comms, process->waiting_synchro);
+      process->comms.remove(process->waiting_synchro);
       comm->cancel();
 
       // Remove first occurrence of &process->simcall:
@@ -476,7 +475,7 @@ void SIMIX_process_throw(smx_actor_t process, xbt_errcat_t cat, int value, const
 
     simgrid::kernel::activity::Comm *comm = dynamic_cast<simgrid::kernel::activity::Comm*>(process->waiting_synchro);
     if (comm != nullptr) {
-      xbt_fifo_remove(process->comms, comm);
+      process->comms.remove(comm);
       comm->cancel();
     }
 

diff --git a/src/simix/ActorImpl.hpp b/src/simix/ActorImpl.hpp
index aa24068..db307f1 100644 (file)
--- a/src/simix/ActorImpl.hpp
+++ b/src/simix/ActorImpl.hpp
@@ -8,8 +8,8 @@
 
 #include "simgrid/s4u/Actor.hpp"
 #include "src/simix/popping_private.h"
-#include "xbt/fifo.h"
 #include "xbt/swag.h"
+#include<list>
 
 typedef struct s_smx_process_exit_fun {
   int_f_pvoid_pvoid_t fun;
@@ -56,7 +56,7 @@ public:
 
   sg_host_t new_host            = nullptr; /* if not null, the host on which the process must migrate to */
   smx_activity_t waiting_synchro = nullptr; /* the current blocking synchro if any */
-  xbt_fifo_t comms               = xbt_fifo_new(); /* the current non-blocking communication synchros */
+  std::list<smx_activity_t> comms               ;           /* the current non-blocking communication synchros */
   xbt_dict_t properties         = nullptr;
   s_smx_simcall_t simcall;
   void *data          = nullptr; /* kept for compatibility, it should be replaced with moddata */

diff --git a/src/simix/smx_network.cpp b/src/simix/smx_network.cpp
index c17b27b..ce5f2a8 100644 (file)
--- a/src/simix/smx_network.cpp
+++ b/src/simix/smx_network.cpp
@@ -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) {
@@ -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);
       }
     }