Cleaner detection of using model-checking.

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

diff --git a/src/simix/private.h b/src/simix/private.h
index 53f20eb..3ac7fd1 100644 (file)
--- a/src/simix/private.h
+++ b/src/simix/private.h
@@ -22,13 +22,11 @@
 #include "smurf_private.h"
 #include "synchro_private.h"
 
-extern int _surf_do_model_check;
-
 /********************************** Simix Global ******************************/
 
 typedef struct s_smx_context_factory *smx_context_factory_t;
 
-typedef struct SIMIX_Global {
+typedef struct s_smx_global {
   smx_context_factory_t context_factory;
   xbt_dict_t host;
   xbt_swag_t process_to_run;
@@ -42,9 +40,9 @@ typedef struct SIMIX_Global {
 #ifdef HAVE_LATENCY_BOUND_TRACKING
   xbt_dict_t latency_limited_dict;
 #endif
-} s_SIMIX_Global_t, *SIMIX_Global_t;
+} s_smx_global_t, *smx_global_t;
 
-extern SIMIX_Global_t simix_global;
+extern smx_global_t simix_global;
 
 
 /*********************************** Time ************************************/
@@ -122,7 +120,7 @@ typedef struct s_smx_action {
     struct {
       surf_action_t sleep;
     } synchro;
-    
+
   };
 
 #ifdef HAVE_TRACING
@@ -155,9 +153,8 @@ static XBT_INLINE e_smx_state_t SIMIX_action_map_state(e_surf_action_state_t sta
 
 
 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
-                                                   *);
+  (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);
@@ -181,13 +178,12 @@ typedef struct s_smx_context_factory {
 
 
 void SIMIX_context_mod_init(void);
-
 void SIMIX_context_mod_exit(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_thread_factory_init(smx_context_factory_t *factory);
+void SIMIX_ctx_sysv_factory_init(smx_context_factory_t *factory);
 
 /* ****************************** */
 /* context manipulation functions */
@@ -278,6 +274,7 @@ static XBT_INLINE smx_context_t SIMIX_context_self(void)
   return (*(simix_global->context_factory->self))();
 }
 
+<<<<<<< HEAD
 /**
  \brief returns the data associated to a context
  \param context The context
@@ -289,4 +286,6 @@ static XBT_INLINE void* SIMIX_context_get_data(smx_context_t context)
 }
 
 
+=======
+>>>>>>> Clean indentation and coding style in SIMIX
 #endif