X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/662f44287e3fd62ebdf93b4c8173603dde9693b7..b3b356352e87ae00a20f737c48e19b0c8413455a:/src/msg/msg_private.h diff --git a/src/msg/msg_private.h b/src/msg/msg_private.h index 1d2eb8f187..3740c6c24a 100644 --- a/src/msg/msg_private.h +++ b/src/msg/msg_private.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2004-2014. The SimGrid Team. +/* Copyright (c) 2004-2015. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -7,7 +7,7 @@ #ifndef METASIMGRID_PRIVATE_H #define METASIMGRID_PRIVATE_H -#include "msg/msg.h" +#include "simgrid/msg.h" #include "simgrid/simix.h" #include "surf/surf.h" #include "xbt/fifo.h" @@ -22,11 +22,27 @@ SG_BEGIN_DECL() /********************************* Task **************************************/ + +#define MSG_BT(ptr, m) \ + do {xbt_ex_t *_xbt_ex_t = xbt_new0(xbt_ex_t, 1); \ + /* build the exception */ \ + _xbt_ex_t->msg = (bprintf(m)); \ + _xbt_ex_t->category = (xbt_errcat_t)(0); \ + _xbt_ex_t->value = (0); \ + _xbt_ex_t->procname = (char*)xbt_procname(); \ + _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->bt_strings = NULL; \ + xbt_backtrace_current(_xbt_ex_t); \ + ptr = _xbt_ex_t; } while(0) + typedef struct simdata_task { - smx_action_t compute; /* SIMIX modeling of computation */ - smx_action_t comm; /* SIMIX modeling of communication */ - double message_size; /* Data size */ - double computation_amount; /* Computation size */ + smx_synchro_t compute; /* SIMIX modeling of computation */ + smx_synchro_t comm; /* SIMIX modeling of communication */ + double bytes_amount; /* Data size */ + double flops_amount; /* Computation size */ msg_process_t sender; msg_process_t receiver; msg_host_t source; @@ -37,12 +53,12 @@ typedef struct simdata_task { /* CPU affinity database of this task */ xbt_dict_t affinity_mask_db; /* smx_host_t host => unsigned long mask */ - int isused; /* Indicates whether the task is used in SIMIX currently */ + void *isused; /* Indicates whether the task is used in SIMIX currently */ int host_nb; /* ==0 if sequential task; parallel task if not */ /******* Parallel Tasks Only !!!! *******/ - smx_host_t *host_list; - double *comp_amount; - double *comm_amount; + sg_host_t *host_list; + double *flops_parallel_amount; + double *bytes_parallel_amount; } s_simdata_task_t; /********************************* File **************************************/ @@ -52,7 +68,7 @@ typedef struct simdata_file { /*************** Begin GPU ***************/ typedef struct simdata_gpu_task { - double computation_amount; /* Computation size */ + double flops_amount; /* Computation size */ double dispatch_latency; double collect_latency; int isused; /* Indicates whether the task is used in SIMIX currently */ @@ -67,7 +83,7 @@ typedef struct simdata_process { #ifdef MSG_USE_DEPRECATED m_channel_t put_channel; /* used for debugging purposes */ #endif - smx_action_t waiting_action; + smx_synchro_t waiting_action; msg_task_t waiting_task; char **argv; /* arguments table if any */ int argc; /* arguments number if any */ @@ -87,7 +103,7 @@ typedef struct process_arg { } s_process_arg_t, *process_arg_t; typedef struct msg_comm { - smx_action_t s_comm; /* SIMIX communication object encapsulated (the same for both processes) */ + smx_synchro_t s_comm; /* SIMIX communication object encapsulated (the same for both processes) */ msg_task_t task_sent; /* task sent (NULL for the receiver) */ msg_task_t *task_received; /* where the task will be received (NULL for the sender) */ msg_error_t status; /* status of the communication once finished */ @@ -114,6 +130,7 @@ typedef struct MSG_Global { int max_channel; #endif int session; + int debug_multiple_use; unsigned long int sent_msg; /* Total amount of messages sent during the simulation */ void (*task_copy_callback) (msg_task_t task, msg_process_t src, msg_process_t dst); void_f_pvoid_t process_data_cleanup; @@ -137,28 +154,24 @@ XBT_PUBLIC_DATA(MSG_Global_t) msg_global; # define MSG_RETURN(val) return(val) #endif -msg_host_t __MSG_host_create(smx_host_t workstation); +msg_host_t __MSG_host_create(sg_host_t host); msg_storage_t __MSG_storage_create(smx_storage_t storage); void __MSG_host_destroy(msg_host_t host); +void __MSG_host_priv_free(msg_host_priv_t priv); void __MSG_storage_destroy(msg_storage_priv_t host); void __MSG_file_destroy(msg_file_priv_t host); void MSG_process_cleanup_from_SIMIX(smx_process_t smx_proc); -void MSG_process_create_from_SIMIX(smx_process_t *process, const char *name, +smx_process_t MSG_process_create_from_SIMIX(const char *name, xbt_main_func_t code, void *data, - const char *hostname, double kill_time, int argc, - char **argv, xbt_dict_t properties, int auto_restart); -void MSG_comm_copy_data_from_SIMIX(smx_action_t comm, void* buff, size_t buff_size); - -void _MSG_action_init(void); -void _MSG_action_exit(void); + const char *hostname, double kill_time, + int argc, char **argv, + xbt_dict_t properties, int auto_restart, + smx_process_t parent_process); +void MSG_comm_copy_data_from_SIMIX(smx_synchro_t comm, void* buff, size_t buff_size); void MSG_post_create_environment(void); -static inline void *msg_host_resource_priv(const void *host) { - return xbt_lib_get_level((void *)host, MSG_HOST_LEVEL); -} - void MSG_host_add_task(msg_host_t host, msg_task_t task); void MSG_host_del_task(msg_host_t host, msg_task_t task); @@ -181,7 +194,7 @@ void TRACE_msg_process_change_host(msg_process_t process, msg_host_t old_host, msg_host_t new_host); void TRACE_msg_process_create (const char *process_name, int process_pid, msg_host_t host); void TRACE_msg_process_destroy (const char *process_name, int process_pid, msg_host_t host); -void TRACE_msg_process_kill(msg_process_t process); +void TRACE_msg_process_kill(smx_process_exit_status_t status, msg_process_t process); void TRACE_msg_process_suspend(msg_process_t process); void TRACE_msg_process_resume(msg_process_t process); void TRACE_msg_process_sleep_in(msg_process_t process); //called from msg/gos.c