X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e276e9953a9ab5894bbb623fc17ec79512efab5d..806504b9602a886e391b54e458b2c1f7f42d3afb:/src/simix/private.h

diff --git a/src/simix/private.h b/src/simix/private.h
index 34cac50243..fda2af9aa8 100644
--- a/src/simix/private.h
+++ b/src/simix/private.h
@@ -15,20 +15,18 @@
 #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"
-
-extern int _surf_do_model_check;
+#include "simix/context.h"
 
 /********************************** 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 ************************************/
@@ -111,7 +109,8 @@ typedef struct s_smx_action {
       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 {
@@ -126,7 +125,6 @@ typedef struct s_smx_action {
   };
 
 #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;
@@ -148,35 +146,6 @@ static XBT_INLINE e_smx_state_t SIMIX_action_map_state(e_surf_action_state_t sta
   }
 }
 
-/******************************** 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);
@@ -269,14 +238,13 @@ static XBT_INLINE void SIMIX_context_runall(xbt_swag_t processes)
  */
 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;
 }
 
-<<<<<<< HEAD
 /**
  \brief returns the data associated to a context
  \param context The context
@@ -287,7 +255,4 @@ static XBT_INLINE void* SIMIX_context_get_data(smx_context_t context)
   return (*(simix_global->context_factory->get_data))(context);
 }
 
-
-=======
->>>>>>> Clean indentation and coding style in SIMIX
 #endif