remove an useless pimple around exceptions

[simgrid.git] / src / simix / smx_private.h

diff --git a/src/simix/smx_private.h b/src/simix/smx_private.h
index fa5ffdd..0e542ca 100644 (file)
--- a/src/simix/smx_private.h
+++ b/src/simix/smx_private.h
@@ -56,16 +56,6 @@ typedef struct s_smx_context_factory *smx_context_factory_t;
 
 SG_BEGIN_DECL()
 
-/* 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 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
-XBT_PRIVATE void smx_ctx_raw_new_sr(void);
-#endif
-
 /********************************** Simix Global ******************************/
 typedef struct s_smx_global {
   smx_context_factory_t context_factory;
@@ -81,11 +71,6 @@ typedef struct s_smx_global {
   void_pfn_smxprocess_t cleanup_process_function;
   xbt_mallocator_t synchro_mallocator;
 
-#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
-
   xbt_os_mutex_t mutex;
 } s_smx_global_t, *smx_global_t;
 
@@ -103,8 +88,6 @@ XBT_PUBLIC(void) SIMIX_clean(void);
     _smx_throw_issuer->doexception = 1;                                 \
   } else ((void)0)
 
-#define SMX_THROW() RETHROW
-
 /* ******************************** File ************************************ */
 typedef struct s_smx_file {
   surf_file_t surf_file;