API changed.

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

diff --git a/src/simix/private.h b/src/simix/private.h
index 630a5b0..2a15d93 100644 (file)
--- a/src/simix/private.h
+++ b/src/simix/private.h
@@ -9,6 +9,7 @@
 #ifndef SIMIX_PRIVATE_H
 #define SIMIX_PRIVATE_H
 
+#include <stdio.h>
 #include "simix/simix.h"
 #include "surf/surf.h"
 #include "xbt/fifo.h"
@@ -22,10 +23,10 @@
 
 /********************************** Host ************************************/
 
-typedef struct s_simdata_host {
+typedef struct s_smx_simdata_host {
   void *host;                  /* SURF modeling */
   xbt_swag_t process_list;
-} s_simdata_host_t;
+} s_smx_simdata_host_t;
 
 /********************************* Simix Global ******************************/
 
@@ -36,13 +37,15 @@ typedef struct SIMIX_Global {
 
   smx_process_t current_process;
   xbt_dict_t registered_functions;
+       void* (*create_process_function) ();
+       void* (*kill_process_function)();
 } s_SIMIX_Global_t, *SIMIX_Global_t;
 
 extern SIMIX_Global_t simix_global;
 
 /******************************* Process *************************************/
 
-typedef struct s_simdata_process {
+typedef struct s_smx_simdata_process {
   smx_host_t host;                /* the host on which the process is running */
   xbt_context_t context;               /* the context that executes the scheduler fonction */
   int blocked;
@@ -51,13 +54,13 @@ typedef struct s_simdata_process {
   smx_cond_t cond;             /* cond on which the process is blocked  */
   int argc;                     /* arguments number if any */
   char **argv;                  /* arguments table if any */
-} s_simdata_process_t;
+} s_smx_simdata_process_t;
 
 typedef struct process_arg {
   const char *name;
   smx_process_code_t code;
   void *data;
-  smx_host_t host;
+  char *hostname;
   int argc;
   char **argv;
   double kill_time;
@@ -80,13 +83,12 @@ typedef struct s_smx_cond {
 
 /********************************* Action **************************************/
 
-typedef struct s_simdata_action {
+typedef struct s_smx_simdata_action {
   surf_action_t surf_action;   /* SURF modeling of computation  */
   
-  xbt_fifo_t cond_list;                /* conditional variables that must be signaled when the action finish. */
   smx_host_t source; 
 
-} s_simdata_action_t;
+} s_smx_simdata_action_t;
 
 
 
@@ -112,4 +114,5 @@ void __SIMIX_cond_wait(smx_cond_t cond);
 void __SIMIX_display_process_status(void);
 
 
+
 #endif