A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
I forgot to update my tree before commiting (once again), and got conflicts as punishment
[simgrid.git]
/
src
/
simix
/
smx_smurf_private.h
diff --git
a/src/simix/smx_smurf_private.h
b/src/simix/smx_smurf_private.h
index 07385e95ddc83a265d15face7ca6f9ebe8ec3f67..13233a778ba387f4bacb6db653e9b831f21d3fd4 100644
(file)
--- 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;
xbt_main_func_t code;
void *data;
const char *hostname;
+ double kill_time;
int argc;
char **argv;
xbt_dict_t properties;
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;
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;
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;
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;
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;
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;
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;
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;
smx_action_t result;
} comm_irecv;
@@
-540,9
+541,8
@@
typedef struct s_smx_simcall {
struct {
const char* storage;
struct {
const char* storage;
- int fd;
- //Next should be struct stat* buf
- void* buf;
+ smx_file_t fd;
+ s_file_stat_t buf;
int result;
} file_stat;
int result;
} file_stat;