- Add SIMIX_context_get_thread_id to the context factory interface.

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

diff --git a/src/simix/private.h b/src/simix/private.h
index fda2af9..5aadc79 100644 (file)
--- a/src/simix/private.h
+++ b/src/simix/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;
@@ -37,13 +37,10 @@ typedef struct s_smx_global {
   smx_creation_func_t create_process_function;
   void_f_pvoid_t kill_process_function;
   void_pfn_smxprocess_t cleanup_process_function;
-#ifdef HAVE_LATENCY_BOUND_TRACKING
-  xbt_dict_t latency_limited_dict;
-#endif
 } s_smx_global_t, *smx_global_t;
 
 extern smx_global_t simix_global;
-
+extern unsigned long simix_process_maxpid;
 
 /*********************************** Time ************************************/
 
@@ -92,6 +89,7 @@ typedef struct s_smx_action {
       e_smx_comm_type_t type;         /* Type of the communication (SIMIX_COMM_SEND or SIMIX_COMM_RECEIVE) */
       smx_rdv_t rdv;                  /* Rendez-vous where the comm is queued */
       int refcount;                   /* Number of processes involved in the cond */
+      int detached;                   /* If detached or not */
 
       /* Surf action data */
       surf_action_t surf_comm;        /* The Surf communication action encapsulated */
@@ -124,6 +122,10 @@ typedef struct s_smx_action {
 
   };
 
+#ifdef HAVE_LATENCY_BOUND_TRACKING
+  int latency_limited;
+#endif
+
 #ifdef HAVE_TRACING
   char *category;                     /* simix action category for instrumentation */
 #endif
@@ -155,6 +157,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 +229,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);
 }
@@ -255,4 +258,14 @@ static XBT_INLINE void* SIMIX_context_get_data(smx_context_t context)
   return (*(simix_global->context_factory->get_data))(context);
 }
 
+/**
+ \brief returns the thread's pid running the current context
+ \return The pid
+ */
+static XBT_INLINE int SIMIX_context_get_thread_id(void)
+{
+  return (*(simix_global->context_factory->get_thread_id))();
+}
+
+XBT_PUBLIC(int) SIMIX_process_get_maxpid(void);
 #endif