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
d908a7d
..
6aa5775
100644
(file)
--- a/
src/simix/smx_private.h
+++ b/
src/simix/smx_private.h
@@
-17,8
+17,8
@@
#include "xbt/config.h"
#include "xbt/xbt_os_time.h"
#include "xbt/function_types.h"
#include "xbt/config.h"
#include "xbt/xbt_os_time.h"
#include "xbt/function_types.h"
-#include "xbt/ex_interface.h"
-#include "instr/instr_private.h"
+#include "
src/
xbt/ex_interface.h"
+#include "
src/
instr/instr_private.h"
#include "smx_process_private.h"
#include "smx_host_private.h"
#include "smx_io_private.h"
#include "smx_process_private.h"
#include "smx_host_private.h"
#include "smx_io_private.h"
@@
-47,7
+47,7
@@
typedef struct s_smx_global {
smx_process_t maestro_process;
xbt_dict_t registered_functions;
smx_creation_func_t create_process_function;
smx_process_t maestro_process;
xbt_dict_t registered_functions;
smx_creation_func_t create_process_function;
- void_pfn_smxprocess_t
_smxprocess_t
kill_process_function;
+ void_pfn_smxprocess_t kill_process_function;
/** Callback used when killing a SMX_process */
void_pfn_smxprocess_t cleanup_process_function;
xbt_mallocator_t synchro_mallocator;
/** Callback used when killing a SMX_process */
void_pfn_smxprocess_t cleanup_process_function;
xbt_mallocator_t synchro_mallocator;
@@
-83,15
+83,6
@@
typedef struct s_smx_file {
void* data; /**< @brief user data */
} s_smx_file_t;
void* data; /**< @brief user data */
} s_smx_file_t;
-/*********************************** Time ************************************/
-
-/** @brief Timer datatype */
-typedef struct s_smx_timer {
- double date;
- void* func;
- void* args;
-} s_smx_timer_t;
-
/********************************* synchro *************************************/
typedef enum {
/********************************* synchro *************************************/
typedef enum {