These functions in SIMIX should return 0, and that function in actions should return...

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

diff --git a/src/simix/private.h b/src/simix/private.h
index b797887..676d923 100644 (file)
--- a/src/simix/private.h
+++ b/src/simix/private.h
@@ -12,6 +12,7 @@
 #include "xbt/fifo.h"
 #include "xbt/swag.h"
 #include "xbt/dict.h"
+#include "xbt/mallocator.h"
 #include "xbt/config.h"
 #include "xbt/function_types.h"
 #include "xbt/ex_interface.h"
@@ -23,9 +24,10 @@
 #include "synchro_private.h"
 #include "simix/context.h"
 
-/********************************** Simix Global ******************************/
-
+/* Define only for SimGrid benchmarking purposes */
+#undef TIME_BENCH
 
+/********************************** Simix Global ******************************/
 typedef struct s_smx_global {
   smx_context_factory_t context_factory;
   xbt_dict_t host;
@@ -35,8 +37,9 @@ typedef struct s_smx_global {
   smx_process_t maestro_process;
   xbt_dict_t registered_functions;
   smx_creation_func_t create_process_function;
-  void_f_pvoid_t kill_process_function;
+  void_pfn_smxprocess_t kill_process_function;
   void_pfn_smxprocess_t cleanup_process_function;
+  xbt_mallocator_t action_mallocator;
 } s_smx_global_t, *smx_global_t;
 
 extern smx_global_t simix_global;
@@ -89,6 +92,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 */
@@ -257,5 +261,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