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 missing #include
[simgrid.git]
/
src
/
simix
/
smx_private.h
diff --git
a/src/simix/smx_private.h
b/src/simix/smx_private.h
index
f161b9a
..
caca310
100644
(file)
--- a/
src/simix/smx_private.h
+++ b/
src/simix/smx_private.h
@@
-7,6
+7,7
@@
#ifndef _SIMIX_PRIVATE_H
#define _SIMIX_PRIVATE_H
#ifndef _SIMIX_PRIVATE_H
#define _SIMIX_PRIVATE_H
+#include "src/internal_config.h"
#include "simgrid/simix.h"
#include "surf/surf.h"
#include "xbt/base.h"
#include "simgrid/simix.h"
#include "surf/surf.h"
#include "xbt/base.h"
@@
-26,6
+27,8
@@
#include "popping_private.h"
#include "smx_synchro_private.h"
#include "popping_private.h"
#include "smx_synchro_private.h"
+#include <signal.h>
+
#ifdef __cplusplus
#include <simgrid/simix.hpp>
#ifdef __cplusplus
#include <simgrid/simix.hpp>
@@
-77,7
+80,6
@@
typedef struct s_smx_global {
/** 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;
- void_pfn_sghost_t autorestart;
#ifdef TIME_BENCH_AMDAHL
xbt_os_timer_t timer_seq; /* used to bench the sequential and parallel parts of the simulation, if requested to */
#ifdef TIME_BENCH_AMDAHL
xbt_os_timer_t timer_seq; /* used to bench the sequential and parallel parts of the simulation, if requested to */
@@
-153,10
+155,10
@@
typedef struct s_smx_synchro {
struct {
e_smx_comm_type_t type; /* Type of the communication (SIMIX_COMM_SEND or SIMIX_COMM_RECEIVE) */
struct {
e_smx_comm_type_t type; /* Type of the communication (SIMIX_COMM_SEND or SIMIX_COMM_RECEIVE) */
- smx_
rdv
_t rdv; /* Rendez-vous where the comm is queued */
+ smx_
mailbox
_t rdv; /* Rendez-vous where the comm is queued */
-#if
def
HAVE_MC
- smx_
rdv
_t rdv_cpy; /* Copy of the rendez-vous where the comm is queued, MC needs it for DPOR
+#if HAVE_MC
+ smx_
mailbox
_t rdv_cpy; /* Copy of the rendez-vous where the comm is queued, MC needs it for DPOR
(comm.rdv set to NULL when the communication is removed from the mailbox
(used as garbage collector)) */
#endif
(comm.rdv set to NULL when the communication is removed from the mailbox
(used as garbage collector)) */
#endif
@@
-204,16
+206,17
@@
typedef struct s_smx_synchro {
} io;
};
} io;
};
-#ifdef HAVE_LATENCY_BOUND_TRACKING
- int latency_limited;
-#endif
-
char *category; /* simix action category for instrumentation */
} s_smx_synchro_t;
XBT_PRIVATE void SIMIX_context_mod_init(void);
XBT_PRIVATE void SIMIX_context_mod_exit(void);
char *category; /* simix action category for instrumentation */
} s_smx_synchro_t;
XBT_PRIVATE void SIMIX_context_mod_init(void);
XBT_PRIVATE void SIMIX_context_mod_exit(void);
+XBT_PRIVATE smx_context_t SIMIX_context_new(
+ xbt_main_func_t code, int argc, char **argv,
+ void_pfn_smxprocess_t cleanup_func,
+ smx_process_t simix_process);
+
#ifndef WIN32
XBT_PUBLIC_DATA(char sigsegv_stack[SIGSTKSZ]);
#endif
#ifndef WIN32
XBT_PUBLIC_DATA(char sigsegv_stack[SIGSTKSZ]);
#endif
@@
-221,7
+224,7
@@
XBT_PUBLIC_DATA(char sigsegv_stack[SIGSTKSZ]);
/* We are using the bottom of the stack to save some information, like the
* valgrind_stack_id. Define smx_context_usable_stack_size to give the remaining
* size for the stack. */
/* We are using the bottom of the stack to save some information, like the
* valgrind_stack_id. Define smx_context_usable_stack_size to give the remaining
* size for the stack. */
-#if
def HAVE_VALGRIND
_VALGRIND_H
+#if
HAVE
_VALGRIND_H
# define smx_context_usable_stack_size \
(smx_context_stack_size - sizeof(unsigned int)) /* for valgrind_stack_id */
#else
# define smx_context_usable_stack_size \
(smx_context_stack_size - sizeof(unsigned int)) /* for valgrind_stack_id */
#else