Fixed the function that returns if a flows is limited by latency.

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

diff --git a/src/simix/private.h b/src/simix/private.h
index c62284d..0630a01 100644 (file)
--- a/src/simix/private.h
+++ b/src/simix/private.h
@@ -15,7 +15,7 @@
 #include "xbt/config.h"
 #include "xbt/function_types.h"
 #include "xbt/ex_interface.h"
-#include "instr/private.h"
+#include "instr/instr_private.h"
 #include "process_private.h"
 #include "host_private.h"
 #include "network_private.h"
@@ -29,7 +29,7 @@
 typedef struct s_smx_global {
   smx_context_factory_t context_factory;
   xbt_dict_t host;
-  xbt_swag_t process_to_run;
+  xbt_dynar_t process_to_run;
   xbt_swag_t process_list;
   xbt_swag_t process_to_destroy;
   smx_process_t maestro_process;
@@ -109,7 +109,8 @@ typedef struct s_smx_action {
       size_t *dst_buff_size;
       char copied;
 
-      void *data;                     /* User data associated to communication */
+      void* src_data;                     /* User data associated to communication */
+      void* dst_data;
     } comm;    
 
     struct {
@@ -123,8 +124,11 @@ typedef struct s_smx_action {
 
   };
 
+#ifdef HAVE_LATENCY_BOUND_TRACKING
+  int latency_limited;
+#endif
+
 #ifdef HAVE_TRACING
-  long long int counter;              /* simix action unique identifier for instrumentation */
   char *category;                     /* simix action category for instrumentation */
 #endif
 } s_smx_action_t;
@@ -155,6 +159,7 @@ void SIMIX_context_mod_exit(void);
 /* All factories init */
 void SIMIX_ctx_thread_factory_init(smx_context_factory_t *factory);
 void SIMIX_ctx_sysv_factory_init(smx_context_factory_t *factory);
+void SIMIX_ctx_raw_factory_init(smx_context_factory_t *factory);
 
 /* ****************************** */
 /* context manipulation functions */
@@ -226,9 +231,9 @@ static XBT_INLINE void SIMIX_context_suspend(smx_context_t context)
 
 /**
  \brief executes all the processes (in parallel if possible)
- \param processes the swag of processes to execute
+ \param processes the dynar of processes to execute
  */
-static XBT_INLINE void SIMIX_context_runall(xbt_swag_t processes)
+static XBT_INLINE void SIMIX_context_runall(xbt_dynar_t processes)
 {
   (*(simix_global->context_factory->runall)) (processes);
 }
@@ -238,11 +243,11 @@ static XBT_INLINE void SIMIX_context_runall(xbt_swag_t processes)
  */
 static XBT_INLINE smx_context_t SIMIX_context_self(void)
 {
-  if (simix_global->context_factory == NULL) {
-    return NULL;
+  if (simix_global && simix_global->context_factory != NULL) {
+    return (*(simix_global->context_factory->self))();
   }
 
-  return (*(simix_global->context_factory->self))();
+  return NULL;
 }
 
 /**
@@ -255,4 +260,5 @@ static XBT_INLINE void* SIMIX_context_get_data(smx_context_t context)
   return (*(simix_global->context_factory->get_data))(context);
 }
 
+XBT_PUBLIC(int) SIMIX_process_get_maxpid(void);
 #endif