these are already defined in public simix.h or surf.h files

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

diff --git a/src/simix/smx_private.h b/src/simix/smx_private.h
index 7e975d4..dbd51ad 100644 (file)
--- a/src/simix/smx_private.h
+++ b/src/simix/smx_private.h
@@ -50,7 +50,7 @@ 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 */
@@ -63,8 +63,6 @@ typedef struct s_smx_global {
 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 *********************************/
@@ -131,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 */
 
@@ -174,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;
 
@@ -183,7 +181,7 @@ typedef struct s_smx_synchro {
     } synchro;
 
     struct {
-      smx_host_t host;
+      sg_host_t host;
       surf_action_t surf_io;
     } io;
   };
@@ -327,6 +325,8 @@ static XBT_INLINE smx_process_t SIMIX_context_get_process(smx_context_t context)
   return simix_global->context_factory->get_process(context);
 }
 
+XBT_PUBLIC(int) SIMIX_process_get_maxpid(void);
+
 void SIMIX_post_create_environment(void);
 
 SG_END_DECL()