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
Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot//simgrid/simgrid
[simgrid.git]
/
src
/
simix
/
smx_private.h
diff --git
a/src/simix/smx_private.h
b/src/simix/smx_private.h
index 13dca2f9a229e8d23027bf4fa455af8ad5a4e7b1..2e3ca93616b393954857c77a4bd3e228b2ce430e 100644
(file)
--- a/
src/simix/smx_private.h
+++ b/
src/simix/smx_private.h
@@
-7,7
+7,7
@@
#ifndef _SIMIX_PRIVATE_H
#define _SIMIX_PRIVATE_H
#ifndef _SIMIX_PRIVATE_H
#define _SIMIX_PRIVATE_H
-#include "sim
ix
/simix.h"
+#include "sim
grid
/simix.h"
#include "surf/surf.h"
#include "xbt/fifo.h"
#include "xbt/swag.h"
#include "surf/surf.h"
#include "xbt/fifo.h"
#include "xbt/swag.h"
@@
-23,7
+23,6
@@
#include "smx_network_private.h"
#include "smx_smurf_private.h"
#include "smx_synchro_private.h"
#include "smx_network_private.h"
#include "smx_smurf_private.h"
#include "smx_synchro_private.h"
-#include "simix/context.h"
/* Define only for SimGrid benchmarking purposes */
#undef TIME_BENCH
/* Define only for SimGrid benchmarking purposes */
#undef TIME_BENCH
@@
-57,6
+56,15
@@
extern unsigned long simix_process_maxpid;
#define SMX_THROW() RETHROW
#define SMX_THROW() RETHROW
+/* ******************************** File ************************************ */
+typedef struct s_smx_file {
+ surf_file_t surf_file;
+} s_smx_file_t;
+
+typedef struct s_smx_stat {
+ s_file_stat_t surf_stat;
+} s_smx_stat_t;
+
/*********************************** Time ************************************/
/** @brief Timer datatype */
/*********************************** Time ************************************/
/** @brief Timer datatype */
@@
-84,6
+92,13
@@
typedef enum {
SIMIX_COMM_DONE
} e_smx_comm_type_t;
SIMIX_COMM_DONE
} e_smx_comm_type_t;
+typedef enum {
+ SIMIX_IO_OPEN,
+ SIMIX_IO_WRITE,
+ SIMIX_IO_READ,
+ SIMIX_IO_STAT
+} e_smx_io_type_t;
+
/** @brief Action datatype */
typedef struct s_smx_action {
/** @brief Action datatype */
typedef struct s_smx_action {
@@
-107,6
+122,9
@@
typedef struct s_smx_action {
int detached; /* If detached or not */
void (*clean_fun)(void*); /* Function to clean the detached src_buf if something goes wrong */
int detached; /* If detached or not */
void (*clean_fun)(void*); /* Function to clean the detached src_buf if something goes wrong */
+ int (*match_fun)(void*,void*,smx_action_t); /* Filter function used by the other side. It is used when
+ looking if a given communication matches my needs. For that, myself must match the
+ expectations of the other side, too. See */
/* Surf action data */
surf_action_t surf_comm; /* The Surf communication action encapsulated */
/* Surf action data */
surf_action_t surf_comm; /* The Surf communication action encapsulated */