cosmetics: mv tools/cmake/Scripts tools/cmake/scripts

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

diff --git a/src/simix/smx_private.h b/src/simix/smx_private.h
index 9576a92e2b3d891a5e4a468b0efe0f4527b166bb..dbd51adbf04492ab756b446f2f0577b2ce316ef6 100644 (file)
--- a/src/simix/smx_private.h
+++ b/src/simix/smx_private.h
@@ -50,19 +50,19 @@ typedef struct s_smx_global {
   /** Callback used when killing a SMX_process */
   void_pfn_smxprocess_t cleanup_process_function;
   xbt_mallocator_t synchro_mallocator;
-  void_pfn_smxhost_t autorestart;
+  void_pfn_sghost_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
+
+  xbt_os_mutex_t mutex;
 } s_smx_global_t, *smx_global_t;
 
 XBT_PUBLIC_DATA(smx_global_t) simix_global;
 extern unsigned long simix_process_maxpid;
 
-extern xbt_dict_t watched_hosts_lib;
-
 XBT_PUBLIC(void) SIMIX_clean(void);
 
 /******************************** Exceptions *********************************/
@@ -129,7 +129,7 @@ typedef struct s_smx_synchro {
   union {
 
     struct {
-      smx_host_t host;                /* The host where the execution takes place */
+      sg_host_t host;                /* The host where the execution takes place */
       surf_action_t surf_exec;        /* The Surf execution action encapsulated */
     } execution; /* Possibly parallel execution */
 
@@ -172,7 +172,7 @@ typedef struct s_smx_synchro {
     } comm;
 
     struct {
-      smx_host_t host;                /* The host that is sleeping */
+      sg_host_t host;                /* The host that is sleeping */
       surf_action_t surf_sleep;       /* The Surf sleeping action encapsulated */
     } sleep;
 
@@ -181,7 +181,7 @@ typedef struct s_smx_synchro {
     } synchro;
 
     struct {
-      smx_host_t host;
+      sg_host_t host;
       surf_action_t surf_io;
     } io;
   };