-/* 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 "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 */
-//#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). */
+//#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). */
+//#define ADAPTIVE_THRESHOLD /* this is to enable the adaptive threshold algorithm in raw contexts*/
+//#define TIME_BENCH_ENTIRE_SRS /* more general benchmark than TIME_BENCH_PER_SR. It aims to measure the total time spent in a whole scheduling round (including synchro costs)*/
+#ifdef TIME_BENCH_PER_SR
+void smx_ctx_raw_new_sr(void);
+#endif
/********************************** Simix Global ******************************/
typedef struct s_smx_global {
smx_context_factory_t context_factory;
extern xbt_dict_t watched_hosts_lib;
-/******************************** Exceptions *********************************/
+#ifdef __cplusplus
+extern "C" {
+#endif
+XBT_PUBLIC(void) SIMIX_clean(void);
+#ifdef __cplusplus
+}
+#endif
-#define SMX_EXCEPTION(issuer, c, v, m) \
+/******************************** Exceptions *********************************/
+/** @brief Ask to the provided simix process to raise the provided exception */
+#define SMX_EXCEPTION(issuer, cat, val, msg) \
if (1) { \
- smx_process_t _smx_throw_issuer = (issuer); \
- THROW_PREPARE(_smx_throw_issuer->running_ctx, (c), (v), xbt_strdup(m)); \
+ smx_process_t _smx_throw_issuer = (issuer); /* evaluate only once */\
+ THROW_PREPARE(_smx_throw_issuer->running_ctx, (cat), (val), xbt_strdup(msg)); \
_smx_throw_issuer->doexception = 1; \
} else ((void)0)
void* data; /**< @brief user data */
} s_smx_file_t;
-/* ******************************** Storage ************************************ */
-typedef struct s_smx_storage {
- surf_storage_t surf_storage;
-} s_smx_storage_t;
-
/*********************************** Time ************************************/
/** @brief Timer datatype */
SIMIX_ACTION_EXECUTE,
SIMIX_ACTION_PARALLEL_EXECUTE,
SIMIX_ACTION_COMMUNICATE,
+ SIMIX_ACTION_JOIN,
SIMIX_ACTION_SLEEP,
SIMIX_ACTION_SYNCHRO,
SIMIX_ACTION_IO,
- /* ****************************************************************************************** */
- /* TUTORIAL: New API */
- /* ****************************************************************************************** */
- SIMIX_ACTION_NEW_API
} e_smx_action_type_t;
typedef enum {
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
+ 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 (*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 */
+ void (*copy_data_fun) (smx_action_t, void*, size_t);
/* Surf action data */
surf_action_t surf_comm; /* The Surf communication action encapsulated */
void* src_data; /* User data associated to communication */
void* dst_data;
- } comm;
+ } comm;
struct {
smx_host_t host; /* The host that is sleeping */
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);
+#ifndef WIN32
+XBT_PUBLIC_DATA(char sigsegv_stack[SIGSTKSZ]);
+#endif
+
+/* 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);
/* Scenario for the end of a context:
*
* CASE 1: death after end of the main function
- * the context_wrapper, called internally by the context module, calls
- * SIMIX_context_stop after user code stops, smx_context_stop calls user
+ * the context_wrapper, called internally by the context module, calls
+ * SIMIX_context_stop after user code stops, smx_context_stop calls user
* cleanup_func if any (in context settings), add current process to trashbin
* and yields back to maestro.
* From time to time, maestro calls SIMIX_context_empty_trash, which destroy
- * all the process and context data structures, and frees the memory
+ * all the process and context data structures, and frees the memory
*
* CASE 2: brutal death
* SIMIX_process_kill (from any process) set process->iwannadie = 1 and then
}
/**
- * \brief destroy a context
+ * \brief destroy a context
* \param context the context to destroy
* Argument must be stopped first -- runs in maestro context
*/
}
/**
- \brief returns the current running context
+ \brief returns the current running context
*/
static XBT_INLINE smx_context_t SIMIX_context_self(void)
{
}
/**
- \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);
