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
Add msg host on/off test
[simgrid.git]
/
src
/
simix
/
smx_private.h
diff --git
a/src/simix/smx_private.h
b/src/simix/smx_private.h
index
1130ff9
..
8462493
100644
(file)
--- a/
src/simix/smx_private.h
+++ b/
src/simix/smx_private.h
@@
-1,4
+1,4
@@
-/* Copyright (c) 2007
, 2008, 2009, 2010
. The SimGrid Team.
+/* Copyright (c) 2007
-2010, 2012-2014
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-73,6
+73,7
@@
extern xbt_dict_t watched_hosts_lib;
/* ******************************** File ************************************ */
typedef struct s_smx_file {
surf_file_t surf_file;
/* ******************************** File ************************************ */
typedef struct s_smx_file {
surf_file_t surf_file;
+ void* data; /**< @brief user data */
} s_smx_file_t;
/*********************************** Time ************************************/
} s_smx_file_t;
/*********************************** Time ************************************/
@@
-319,13
+320,13
@@
static XBT_INLINE smx_context_t SIMIX_context_self(void)
}
/**
}
/**
- \brief returns the
data
associated to a context
+ \brief returns the
SIMIX process
associated to a context
\param context The context
\param context The context
- \return The
data
+ \return The
SIMIX process
*/
*/
-static XBT_INLINE
void* SIMIX_context_get_data
(smx_context_t context)
+static XBT_INLINE
smx_process_t SIMIX_context_get_process
(smx_context_t context)
{
{
- return simix_global->context_factory->get_
data
(context);
+ return simix_global->context_factory->get_
process
(context);
}
XBT_PUBLIC(int) SIMIX_process_get_maxpid(void);
}
XBT_PUBLIC(int) SIMIX_process_get_maxpid(void);