X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f7623851a023484d8ba1d5c26134ee7850bac134..4bd1f48f0bf1ad1703be680ec2a38d626c6a2668:/src/msg/msg_private.h diff --git a/src/msg/msg_private.h b/src/msg/msg_private.h index e3f98d88da..33d241fb35 100644 --- a/src/msg/msg_private.h +++ b/src/msg/msg_private.h @@ -62,11 +62,6 @@ private: void reportMultipleUse() const; } s_simdata_task_t; -/********************************* File **************************************/ -typedef struct simdata_file { - smx_file_t smx_file; -} s_simdata_file_t; - /******************************* Process *************************************/ namespace simgrid { @@ -106,13 +101,9 @@ SG_BEGIN_DECL() XBT_PUBLIC_DATA(MSG_Global_t) msg_global; /*************************************************************/ - -XBT_PRIVATE msg_host_t __MSG_host_create(sg_host_t host); -XBT_PRIVATE void __MSG_file_destroy(msg_file_t file); - XBT_PRIVATE void MSG_process_cleanup_from_SIMIX(smx_actor_t smx_proc); XBT_PRIVATE smx_actor_t MSG_process_create_from_SIMIX(const char* name, std::function code, void* data, - sg_host_t host, xbt_dict_t properties, + sg_host_t host, std::map* properties, smx_actor_t parent_process); XBT_PRIVATE void MSG_comm_copy_data_from_SIMIX(smx_activity_t comm, void* buff, size_t buff_size); @@ -134,7 +125,7 @@ XBT_PRIVATE void TRACE_msg_task_put_end(); /* 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 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);