X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3ef6ce6e499e5400eea06facd1896d1b5e94fde9..e1038e90b6035149be3fa02273cff848f4914ac9:/src/msg/msg_private.h

diff --git a/src/msg/msg_private.h b/src/msg/msg_private.h
index fdca8f17c1..3edff2f8d9 100644
--- a/src/msg/msg_private.h
+++ b/src/msg/msg_private.h
@@ -22,8 +22,6 @@ 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,7 +32,7 @@ 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)
@@ -70,15 +68,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 {
@@ -110,7 +99,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 +125,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)
 
@@ -178,8 +164,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 +176,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);