#ifndef _SIMIX_PRIVATE_H
#define _SIMIX_PRIVATE_H
-#include "simix/simix.h"
+#include "simgrid/simix.h"
#include "surf/surf.h"
#include "xbt/fifo.h"
#include "xbt/swag.h"
#include "xbt/dict.h"
#include "xbt/mallocator.h"
#include "xbt/config.h"
+#include "xbt/xbt_os_time.h"
#include "xbt/function_types.h"
#include "xbt/ex_interface.h"
#include "instr/instr_private.h"
#include "smx_network_private.h"
#include "smx_smurf_private.h"
#include "smx_synchro_private.h"
-#include "simix/context.h"
/* Define only for SimGrid benchmarking purposes */
-#undef TIME_BENCH
+//#define TIME_BENCH_PER_SR /* this aims at measuring the time spent in each scheduling round per each thread. The code is thus run in sequential to bench separately each SSR */
+//#define TIME_BENCH_AMDAHL /* this aims at measuring the porting of time that could be parallelized at maximum (to get the optimal speedup by applying the amdahl law). */
/********************************** Simix Global ******************************/
typedef struct s_smx_global {
smx_process_t maestro_process;
xbt_dict_t registered_functions;
smx_creation_func_t create_process_function;
- void_pfn_smxprocess_t kill_process_function;
+ void_pfn_smxprocess_t_smxprocess_t kill_process_function;
void_pfn_smxprocess_t cleanup_process_function;
xbt_mallocator_t action_mallocator;
+ void_pfn_smxhost_t autorestart;
+
+#ifdef TIME_BENCH_AMDAHL
+ xbt_os_timer_t timer_seq; /* used to bench the sequential and parallel parts of the simulation, if requested to */
+ xbt_os_timer_t timer_par;
+#endif
} s_smx_global_t, *smx_global_t;
extern smx_global_t simix_global;
extern unsigned long simix_process_maxpid;
+extern xbt_dict_t watched_hosts_lib;
+
/******************************** Exceptions *********************************/
#define SMX_EXCEPTION(issuer, c, v, m) \
int detached; /* If detached or not */
void (*clean_fun)(void*); /* Function to clean the detached src_buf if something goes wrong */
+ int (*match_fun)(void*,void*,smx_action_t); /* Filter function used by the other side. It is used when
+ looking if a given communication matches my needs. For that, myself must match the
+ expectations of the other side, too. See */
/* Surf action data */
surf_action_t surf_comm; /* The Surf communication action encapsulated */
void *dst_buff;
size_t src_buff_size;
size_t *dst_buff_size;
- char copied;
+ unsigned copied:1; /* whether the data were already copied */
- void* src_data; /* User data associated to communication */
+ void* src_data; /* User data associated to communication */
void* dst_data;
} comm;
*/
static XBT_INLINE smx_context_t SIMIX_context_self(void)
{
- if (simix_global && simix_global->context_factory != NULL) {
+ if (simix_global && simix_global->context_factory) {
return simix_global->context_factory->self();
}
}
XBT_PUBLIC(int) SIMIX_process_get_maxpid(void);
+
+void SIMIX_post_create_environment(void);
+
#endif