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 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
5571160
..
28cbd06
100644
(file)
--- a/
src/simix/smx_private.h
+++ b/
src/simix/smx_private.h
@@
-57,6
+57,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, *smx_stat_t;
+
/*********************************** Time ************************************/
/** @brief Timer datatype */
/*********************************** Time ************************************/
/** @brief Timer datatype */
@@
-84,6
+93,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 {
@@
-253,7
+269,7
@@
static XBT_INLINE void SIMIX_context_suspend(smx_context_t context)
/**
\brief Executes all the processes to run (in parallel if possible).
*/
/**
\brief Executes all the processes to run (in parallel if possible).
*/
-static XBT_INLINE void SIMIX_context_runall()
+static XBT_INLINE void SIMIX_context_runall(
void
)
{
simix_global->context_factory->runall();
}
{
simix_global->context_factory->runall();
}