#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"
#include "smurf_private.h"
#include "synchro_private.h"
+#include "simix/context.h"
/********************************** Simix Global ******************************/
-typedef struct s_smx_context_factory *smx_context_factory_t;
typedef struct s_smx_global {
smx_context_factory_t context_factory;
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_TRACING
- long long int counter; /* simix action unique identifier for instrumentation */
char *category; /* simix action category for instrumentation */
#endif
} s_smx_action_t;
}
}
-/******************************** Context *************************************/
-
-/* The following function pointer types describe the interface that any context
- factory should implement */
-
-
-typedef smx_context_t(*smx_pfn_context_factory_create_context_t)
- (xbt_main_func_t, int, char **, void_pfn_smxprocess_t, void* data);
-typedef int (*smx_pfn_context_factory_finalize_t) (smx_context_factory_t*);
-typedef void (*smx_pfn_context_free_t) (smx_context_t);
-typedef void (*smx_pfn_context_start_t) (smx_context_t);
-typedef void (*smx_pfn_context_stop_t) (smx_context_t);
-typedef void (*smx_pfn_context_suspend_t) (smx_context_t context);
-typedef void (*smx_pfn_context_runall_t) (xbt_swag_t processes);
-typedef smx_context_t (*smx_pfn_context_self_t) (void);
-typedef void* (*smx_pfn_context_get_data_t) (smx_context_t context);
-
-/* interface of the context factories */
-typedef struct s_smx_context_factory {
- const char *name;
- smx_pfn_context_factory_create_context_t create_context;
- smx_pfn_context_factory_finalize_t finalize;
- smx_pfn_context_free_t free;
- smx_pfn_context_stop_t stop;
- smx_pfn_context_suspend_t suspend;
- smx_pfn_context_runall_t runall;
- smx_pfn_context_self_t self;
- smx_pfn_context_get_data_t get_data;
-} s_smx_context_factory_t;
void SIMIX_context_mod_init(void);
*/
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;
}
/**