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
kill dead code
[simgrid.git]
/
src
/
simix
/
smx_smurf_private.h
diff --git
a/src/simix/smx_smurf_private.h
b/src/simix/smx_smurf_private.h
index
4c6c382
..
b8640da
100644
(file)
--- a/
src/simix/smx_smurf_private.h
+++ b/
src/simix/smx_smurf_private.h
@@
-12,7
+12,7
@@
SG_BEGIN_DECL()
/********************************* Simcalls *********************************/
XBT_PUBLIC(const char*) simcall_names[]; /* Name of each simcall */
/********************************* Simcalls *********************************/
XBT_PUBLIC(const char*) simcall_names[]; /* Name of each simcall */
-#include "s
imcalls_generated_enum.h" /* All possible simcalls (generated)
*/
+#include "s
mx_popping_enum.h" /* Definition of e_smx_simcall_t, with one value per simcall
*/
typedef int (*simix_match_func_t)(void *, void *, smx_action_t);
typedef void (*simix_copy_data_func_t)(smx_action_t, void*, size_t);
typedef int (*simix_match_func_t)(void *, void *, smx_action_t);
typedef void (*simix_copy_data_func_t)(smx_action_t, void*, size_t);
@@
-51,14
+51,6
@@
typedef struct s_smx_simcall {
#endif
union u_smx_scalar args[11];
union u_smx_scalar result;
#endif
union u_smx_scalar args[11];
union u_smx_scalar result;
- union {
- struct {
- const char* param1;
- double param2;
- int result;
- } new_api;
-
- };
} s_smx_simcall_t, *smx_simcall_t;
#if HAVE_MC
} s_smx_simcall_t, *smx_simcall_t;
#if HAVE_MC
@@
-69,27
+61,17
@@
typedef struct s_smx_simcall {
#define SIMCALL_GET_MC_VALUE(simcall) 0
#endif
#define SIMCALL_GET_MC_VALUE(simcall) 0
#endif
-#include "simcalls_generated_res_getter_setter.h"
-#include "simcalls_generated_args_getter_setter.h"
+#include "smx_popping_accessors.h"
/******************************** General *************************************/
/******************************** General *************************************/
-void SIMIX_simcall_push(smx_process_t self);
void SIMIX_simcall_answer(smx_simcall_t);
void SIMIX_simcall_enter(smx_simcall_t, int);
void SIMIX_simcall_exit(smx_action_t);
void SIMIX_simcall_answer(smx_simcall_t);
void SIMIX_simcall_enter(smx_simcall_t, int);
void SIMIX_simcall_exit(smx_action_t);
-smx_simcall_t SIMIX_simcall_mine(void);
const char *SIMIX_simcall_name(e_smx_simcall_t kind);
//FIXME put it in a better place
xbt_dict_t SIMIX_pre_asr_get_properties(smx_simcall_t simcall, const char *name);
const char *SIMIX_simcall_name(e_smx_simcall_t kind);
//FIXME put it in a better place
xbt_dict_t SIMIX_pre_asr_get_properties(smx_simcall_t simcall, const char *name);
-/*************************** New simcall interface ****************************/
-
-typedef smx_action_t (*simcall_handler_t)(u_smx_scalar_t *);
-
-extern const char *simcall_types[];
-extern simcall_handler_t simcall_table[];
-
SG_END_DECL()
#endif
SG_END_DECL()
#endif