X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4a6b0a991a67e6f2f67c03fed43529e078da7115..64ea8dcf1daac53da58d65aa91b7452aae8b13b7:/src/msg/msg_private.h diff --git a/src/msg/msg_private.h b/src/msg/msg_private.h index fdca8f17c1..bb771f3ed1 100644 --- a/src/msg/msg_private.h +++ b/src/msg/msg_private.h @@ -7,6 +7,8 @@ #ifndef METASIMGRID_PRIVATE_H #define METASIMGRID_PRIVATE_H +#include + #include "simgrid/msg.h" #include "simgrid/simix.h" #include "src/include/surf/surf.h" @@ -17,13 +19,15 @@ #include "xbt/dict.h" #include "xbt/config.h" #include "src/instr/instr_private.h" + +#include "src/simix/SynchroExec.hpp" +#include "src/simix/SynchroComm.hpp" + SG_BEGIN_DECL() /**************** datatypes **********************************/ /********************************* Task **************************************/ - - #define MSG_BT(ptr, m) \ do {xbt_ex_t *_xbt_ex_t = xbt_new0(xbt_ex_t, 1); \ /* build the exception */ \ @@ -34,14 +38,14 @@ SG_BEGIN_DECL() _xbt_ex_t->pid = xbt_getpid(); \ _xbt_ex_t->file = (char*)__FILE__; \ _xbt_ex_t->line = __LINE__; \ - _xbt_ex_t->func = (char*)_XBT_FUNCTION; \ + _xbt_ex_t->func = (char*)__func__; \ _xbt_ex_t->bt_strings = NULL; \ xbt_backtrace_current(_xbt_ex_t); \ ptr = _xbt_ex_t; } while(0) typedef struct simdata_task { - smx_synchro_t compute; /* SIMIX modeling of computation */ - smx_synchro_t comm; /* SIMIX modeling of communication */ + simgrid::simix::Exec *compute; /* SIMIX modeling of computation */ + simgrid::simix::Comm *comm; /* SIMIX modeling of communication */ double bytes_amount; /* Data size */ double flops_amount; /* Computation size */ msg_process_t sender; @@ -70,15 +74,6 @@ typedef struct simdata_file { XBT_PRIVATE int __MSG_host_get_file_descriptor_id(msg_host_t host); XBT_PRIVATE void __MSG_host_release_file_descriptor_id(msg_host_t host, int id); -/*************** Begin GPU ***************/ -typedef struct simdata_gpu_task { - double flops_amount; /* Computation size */ - double dispatch_latency; - double collect_latency; - int isused; /* Indicates whether the task is used in SIMIX currently */ -} s_simdata_gpu_task_t; -/*************** End GPU ***************/ - /******************************* Process *************************************/ typedef struct simdata_process { @@ -86,8 +81,6 @@ typedef struct simdata_process { msg_host_t put_host; /* used for debugging purposes */ smx_synchro_t waiting_action; msg_task_t waiting_task; - char **argv; /* arguments table if any */ - int argc; /* arguments number if any */ msg_error_t last_errno; /* the last value returned by a MSG_function */ void* data; /* user data */ @@ -110,7 +103,6 @@ typedef struct msg_comm { msg_error_t status; /* status of the communication once finished */ } s_msg_comm_t; - /******************************* VM *************************************/ typedef struct dirty_page { double prev_clock; @@ -137,9 +129,7 @@ typedef struct MSG_Global { /*extern MSG_Global_t msg_global;*/ XBT_PUBLIC_DATA(MSG_Global_t) msg_global; - /*************************************************************/ - // FIXME: KILLME # define MSG_RETURN(val) return(val) @@ -151,9 +141,8 @@ XBT_PRIVATE void __MSG_file_destroy(msg_file_priv_t host); XBT_PRIVATE void MSG_process_cleanup_from_SIMIX(smx_process_t smx_proc); XBT_PRIVATE smx_process_t MSG_process_create_from_SIMIX(const char *name, - xbt_main_func_t code, void *data, + std::function code, void *data, const char *hostname, double kill_time, - int argc, char **argv, xbt_dict_t properties, int auto_restart, smx_process_t parent_process); XBT_PRIVATE void MSG_comm_copy_data_from_SIMIX(smx_synchro_t comm, void* buff, size_t buff_size); @@ -178,8 +167,7 @@ XBT_PRIVATE void TRACE_msg_task_put_end(void); /* declaration of instrumentation functions from msg_process_instr.c */ XBT_PRIVATE char *instr_process_id (msg_process_t proc, char *str, int len); XBT_PRIVATE char *instr_process_id_2 (const char *process_name, int process_pid, char *str, int len); -XBT_PRIVATE void TRACE_msg_process_change_host(msg_process_t process, msg_host_t old_host, - msg_host_t new_host); +XBT_PRIVATE void TRACE_msg_process_change_host(msg_process_t process, msg_host_t old_host, msg_host_t new_host); XBT_PRIVATE void TRACE_msg_process_create (const char *process_name, int process_pid, msg_host_t host); XBT_PRIVATE void TRACE_msg_process_destroy (const char *process_name, int process_pid); XBT_PRIVATE void TRACE_msg_process_kill(smx_process_exit_status_t status, msg_process_t process); @@ -191,8 +179,7 @@ XBT_PRIVATE void TRACE_msg_process_sleep_out(msg_process_t process); /* declaration of instrumentation functions from instr_msg_vm.c */ XBT_PRIVATE char *instr_vm_id(msg_vm_t vm, char *str, int len); XBT_PRIVATE char *instr_vm_id_2(const char *vm_name, char *str, int len); -XBT_PRIVATE void TRACE_msg_vm_change_host(msg_vm_t vm, msg_host_t old_host, - msg_host_t new_host); +XBT_PRIVATE void TRACE_msg_vm_change_host(msg_vm_t vm, msg_host_t old_host, msg_host_t new_host); XBT_PRIVATE void TRACE_msg_vm_start(msg_vm_t vm); XBT_PRIVATE void TRACE_msg_vm_create(const char *vm_name, msg_host_t host); XBT_PRIVATE void TRACE_msg_vm_kill(msg_vm_t process); @@ -203,4 +190,9 @@ XBT_PRIVATE void TRACE_msg_vm_restore(msg_vm_t vm); XBT_PRIVATE void TRACE_msg_vm_end(msg_vm_t vm); SG_END_DECL() + +XBT_PUBLIC(msg_process_t) MSG_process_create_with_environment( + const char *name, std::function code, void *data, + msg_host_t host, xbt_dict_t properties); + #endif