-/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2007-2010, 2012-2014. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
#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"
+/* ****************************************************************************************** */
+/* TUTORIAL: New API */
+/* ****************************************************************************************** */
+#include "smx_new_api_private.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) \
/* ******************************** File ************************************ */
typedef struct s_smx_file {
surf_file_t surf_file;
+ void* data; /**< @brief user data */
} s_smx_file_t;
-typedef struct s_smx_stat {
- s_file_stat_t surf_stat;
-} s_smx_stat_t;
-
/*********************************** Time ************************************/
/** @brief Timer datatype */
SIMIX_ACTION_COMMUNICATE,
SIMIX_ACTION_SLEEP,
SIMIX_ACTION_SYNCHRO,
- SIMIX_ACTION_IO
+ SIMIX_ACTION_IO,
+ /* ****************************************************************************************** */
+ /* TUTORIAL: New API */
+ /* ****************************************************************************************** */
+ SIMIX_ACTION_NEW_API
} e_smx_action_type_t;
typedef enum {
struct {
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 */
+
+#ifdef HAVE_MC
+ smx_rdv_t rdv_cpy; /* Copy of the rendez-vous where the comm is queued, MC needs it for DPOR
+ (comm.rdv set to NULL when the communication is removed from the mailbox
+ (used as garbage collector)) */
+#endif
int refcount; /* Number of processes involved in the cond */
int detached; /* If detached or not */
smx_host_t host;
surf_action_t surf_io;
} io;
+
+ /* ****************************************************************************************** */
+ /* TUTORIAL: New API */
+ /* ****************************************************************************************** */
+ struct {
+ surf_action_t surf_new_api;
+ } new_api;
};
#ifdef HAVE_LATENCY_BOUND_TRACKING
#endif
} s_smx_action_t;
-/* FIXME: check if we can delete this function */
-static XBT_INLINE e_smx_state_t SIMIX_action_map_state(e_surf_action_state_t state)
-{
- switch (state) {
- case SURF_ACTION_READY:
- return SIMIX_READY;
- case SURF_ACTION_RUNNING:
- return SIMIX_RUNNING;
- case SURF_ACTION_FAILED:
- return SIMIX_FAILED;
- case SURF_ACTION_DONE:
- return SIMIX_DONE;
- default:
- xbt_die("Unexpected SURF action state");
- }
-}
-
void SIMIX_context_mod_init(void);
void SIMIX_context_mod_exit(void);
+/* We are using the bottom of the stack to save some information, like the
+ * valgrind_stack_id. Define smx_context_usable_stack_size to give the remaining
+ * size for the stack. */
+#ifdef HAVE_VALGRIND_VALGRIND_H
+# define smx_context_usable_stack_size \
+ (smx_context_stack_size - sizeof(unsigned int)) /* for valgrind_stack_id */
+#else
+# define smx_context_usable_stack_size smx_context_stack_size
+#endif
+
+void *SIMIX_context_stack_new(void);
+void SIMIX_context_stack_delete(void *stack);
+
void SIMIX_context_set_current(smx_context_t context);
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);
void_pfn_smxprocess_t cleanup_func,
smx_process_t simix_process)
{
-
+ if (!simix_global)
+ xbt_die("simix is not initialized, please call MSG_init first");
return simix_global->context_factory->create_context(code,
argc, argv,
cleanup_func,
*/
static XBT_INLINE void SIMIX_context_runall(void)
{
- simix_global->context_factory->runall();
+ if (!xbt_dynar_is_empty(simix_global->process_to_run)) {
+ simix_global->context_factory->runall();
+ }
}
/**
if (simix_global && simix_global->context_factory) {
return simix_global->context_factory->self();
}
-
return NULL;
}
/**
- \brief returns the data associated to a context
+ \brief returns the SIMIX process associated to a context
\param context The context
- \return The data
+ \return The SIMIX process
*/
-static XBT_INLINE void* SIMIX_context_get_data(smx_context_t context)
+static XBT_INLINE smx_process_t SIMIX_context_get_process(smx_context_t context)
{
- return simix_global->context_factory->get_data(context);
+ return simix_global->context_factory->get_process(context);
}
XBT_PUBLIC(int) SIMIX_process_get_maxpid(void);
+
+void SIMIX_post_create_environment(void);
+
#endif
