X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fa8e71be179a7a12e74bcc550fa6fe2c54b8446a..446516ef6cc8459883ad5b3a53cd724e24185c21:/src/simix/smx_smurf_private.h

diff --git a/src/simix/smx_smurf_private.h b/src/simix/smx_smurf_private.h
index a0888c152f..6ce40e26ac 100644
--- a/src/simix/smx_smurf_private.h
+++ b/src/simix/smx_smurf_private.h
@@ -223,6 +223,7 @@ typedef struct s_smx_simcall {
       xbt_main_func_t code;
       void *data;
       const char *hostname;
+      double kill_time;
       int argc;
       char **argv;
       xbt_dict_t properties;
@@ -319,7 +320,7 @@ typedef struct s_smx_simcall {
       double rate;
       void *src_buff;
       size_t src_buff_size;
-      int (*match_fun)(void *, void *);
+      int (*match_fun)(void *, void *, smx_action_t);
       void *data;
       double timeout;
     } comm_send;
@@ -330,7 +331,7 @@ typedef struct s_smx_simcall {
       double rate;
       void *src_buff;
       size_t src_buff_size;
-      int (*match_fun)(void *, void *);
+      int (*match_fun)(void *, void *, smx_action_t);
       void (*clean_fun)(void *);
       void *data;
       int detached;
@@ -341,7 +342,7 @@ typedef struct s_smx_simcall {
       smx_rdv_t rdv;
       void *dst_buff;
       size_t *dst_buff_size;
-      int (*match_fun)(void *, void *);
+      int (*match_fun)(void *, void *, smx_action_t);
       void *data;
       double timeout;
     } comm_recv;
@@ -350,8 +351,8 @@ typedef struct s_smx_simcall {
       smx_rdv_t rdv;
       void *dst_buff;
       size_t *dst_buff_size;
-      int (*match_fun)(void *, void *);
-          void *data;
+      int (*match_fun)(void *, void *, smx_action_t);
+      void *data;
       smx_action_t result;
     } comm_irecv;
 
@@ -508,7 +509,6 @@ typedef struct s_smx_simcall {
     } sem_get_capacity;
 
     struct {
-      const char* storage;
       void *ptr;
       size_t size;
       size_t nmemb;
@@ -517,7 +517,6 @@ typedef struct s_smx_simcall {
     } file_read;
 
     struct {
-      const char* storage;
       const void *ptr;
       size_t size;
       size_t nmemb;
@@ -526,20 +525,18 @@ typedef struct s_smx_simcall {
     } file_write;
 
     struct {
-      const char* storage;
+      const char* mount;
       const char* path;
       const char* mode;
       smx_file_t result;
     } file_open;
 
     struct {
-      const char* storage;
       smx_file_t fp;
       int result;
     } file_close;
 
     struct {
-      const char* storage;
       smx_file_t fd;
       s_file_stat_t buf;
       int result;