#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"
#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;
- xbt_swag_t process_to_run;
+ xbt_dynar_t process_to_run;
+ xbt_dynar_t process_that_ran;
xbt_swag_t process_list;
xbt_swag_t process_to_destroy;
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;
-#ifdef HAVE_LATENCY_BOUND_TRACKING
- xbt_dict_t latency_limited_dict;
-#endif
+ xbt_mallocator_t action_mallocator;
} s_smx_global_t, *smx_global_t;
extern smx_global_t simix_global;
-
+extern unsigned long simix_process_maxpid;
/*********************************** Time ************************************/
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 */
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 {
};
+#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;
}
}
-
-
void SIMIX_context_mod_init(void);
void SIMIX_context_mod_exit(void);
+XBT_INLINE void SIMIX_context_set_current(smx_context_t context);
+XBT_INLINE smx_context_t SIMIX_context_get_current(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 */
}
/**
- \brief executes all the processes (in parallel if possible)
- \param processes the swag of processes to execute
+ \brief Executes all the processes to run (in parallel if possible).
*/
-static XBT_INLINE void SIMIX_context_runall(xbt_swag_t processes)
+static XBT_INLINE void SIMIX_context_runall()
{
- (*(simix_global->context_factory->runall)) (processes);
+ (*(simix_global->context_factory->runall)) ();
}
/**
*/
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;
}
/**
return (*(simix_global->context_factory->get_data))(context);
}
+XBT_PUBLIC(int) SIMIX_process_get_maxpid(void);
#endif