X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/edde8f7fbc1b74a81551bf9eb7bac1935b999296..65820b2b3a3ce25fb8df2321530644a22eaf9e76:/src/msg/msg_private.h

diff --git a/src/msg/msg_private.h b/src/msg/msg_private.h
index cf9f97519d..3934c2c213 100644
--- a/src/msg/msg_private.h
+++ b/src/msg/msg_private.h
@@ -45,6 +45,16 @@ typedef struct simdata_task {
   double *comm_amount;
 } s_simdata_task_t;
 
+
+/*************** Begin GPU ***************/
+typedef struct simdata_gpu_task {
+  double computation_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 {
@@ -52,11 +62,13 @@ typedef struct simdata_process {
   int PID;                      /* used for debugging purposes */
   int PPID;                     /* The parent PID */
   m_host_t put_host;            /* used for debugging purposes */
+#ifdef MSG_USE_DEPRECATED
   m_channel_t put_channel;      /* used for debugging purposes */
+#endif
   smx_action_t waiting_action;
   m_task_t waiting_task;
-  int argc;                     /* arguments number if any */
   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 */
 } s_simdata_process_t, *simdata_process_t;
@@ -81,10 +93,14 @@ typedef struct msg_comm {
 /************************** Global variables ********************************/
 typedef struct MSG_Global {
   xbt_fifo_t host;
+#ifdef MSG_USE_DEPRECATED
   int max_channel;
+#endif
   int PID;
   int session;
   unsigned long int sent_msg;   /* Total amount of messages sent during the simulation */
+  void (*task_copy_callback) (m_task_t task, m_process_t src, m_process_t dst);
+  void_f_pvoid_t process_data_cleanup;
 } s_MSG_Global_t, *MSG_Global_t;
 
 /*extern MSG_Global_t msg_global;*/
@@ -101,8 +117,8 @@ XBT_PUBLIC_DATA(MSG_Global_t) msg_global;
 #define MSG_RETURN(val) do {PROCESS_SET_ERRNO(val);return(val);} while(0)
 /* #define CHECK_ERRNO()  ASSERT((PROCESS_GET_ERRNO()!=MSG_HOST_FAILURE),"Host failed, you cannot call this function.") */
 
-/*#define CHECK_HOST()  xbt_assert(SIMIX_req_host_get_state(SIMIX_host_self())==1,\
-                                  "Host failed, you cannot call this function. (state=%d)",SIMIX_req_host_get_state(SIMIX_host_self()))*/
+/*#define CHECK_HOST()  xbt_assert(simcall_host_get_state(SIMIX_host_self())==1,\
+                                  "Host failed, you cannot call this function. (state=%d)",simcall_host_get_state(SIMIX_host_self()))*/
 #else
 #  define MSG_RETURN(val) return(val)
 #endif
@@ -119,6 +135,7 @@ void MSG_process_create_from_SIMIX(smx_process_t *process, const char *name,
                                    const char *hostname, int argc,
                                    char **argv, xbt_dict_t properties);
 void MSG_process_kill_from_SIMIX(smx_process_t p);
+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);