Merge s4u wait_any

[simgrid.git] / src / simix / Synchro.h

diff --git a/src/simix/Synchro.h b/src/simix/Synchro.h
index b9720fe..6421d5c 100644 (file)
--- a/src/simix/Synchro.h
+++ b/src/simix/Synchro.h
@@ -6,6 +6,9 @@
 #ifndef _SIMIX_SYNCHRO_HPP
 #define _SIMIX_SYNCHRO_HPP
 
+#include <string>
+#include <list>
+
 #include <xbt/base.h>
 #include "simgrid/forward.h"
 
@@ -20,10 +23,9 @@ namespace simix {
   public:
     Synchro();
     virtual ~Synchro();
-    e_smx_state_t state;               /* State of the synchro */
-    char *name = nullptr;              /* synchro name if any */
-    xbt_fifo_t simcalls;               /* List of simcalls waiting for this synchro */
-    char *category = nullptr;          /* For instrumentation */
+    e_smx_state_t state = SIMIX_WAITING; /* State of the synchro */
+    std::string name;                  /* synchro name if any */
+    std::list<smx_simcall_t> simcalls; /* List of simcalls waiting for this synchro */
 
     virtual void suspend()=0;
     virtual void resume()=0;
@@ -32,7 +34,7 @@ namespace simix {
     void ref();
     void unref();
   private:
-    int refcount=1;
+    int refcount = 1;
   };
 }} // namespace simgrid::simix
 #else /* not C++ */