X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c5ad8ca1a68bbaa9152471c8d0eeb99d762f0d86..757c0f8844ae51c9e9a9085165c5dc46e5d1ce5c:/src/msg/msg_private.h

diff --git a/src/msg/msg_private.h b/src/msg/msg_private.h
index 1c5a83fff8..23699ddb44 100644
--- a/src/msg/msg_private.h
+++ b/src/msg/msg_private.h
@@ -8,7 +8,7 @@
 #define METASIMGRID_PRIVATE_H
 
 #include "msg/msg.h"
-#include "simix/simix.h"
+#include "simgrid/simix.h"
 #include "surf/surf.h"
 #include "xbt/fifo.h"
 #include "xbt/dynar.h"
@@ -20,10 +20,6 @@
 SG_BEGIN_DECL()
 
 /**************** datatypes **********************************/
-typedef struct simdata_host {
-  smx_host_t smx_host;          /* SURF modeling                                                                */
-  msg_mailbox_t *mailboxes;     /* mailboxes to store msg tasks of of the host  */
-} s_simdata_host_t;
 
 /********************************* Task **************************************/
 
@@ -45,6 +41,20 @@ typedef struct simdata_task {
   double *comm_amount;
 } s_simdata_task_t;
 
+/********************************* File **************************************/
+typedef struct simdata_file {
+  smx_file_t smx_file;
+} s_simdata_file_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,7 +62,9 @@ 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;
   char **argv;                  /* arguments table if any */
@@ -78,15 +90,31 @@ typedef struct msg_comm {
   MSG_error_t status;           /* status of the communication once finished */
 } s_msg_comm_t;
 
+typedef enum {
+  msg_vm_state_suspended, msg_vm_state_running, msg_vm_state_migrating
+} e_msg_vm_state_t;
+
+typedef struct msg_vm {
+  s_xbt_swag_hookup_t all_vms_hookup;
+  s_xbt_swag_hookup_t host_vms_hookup;
+  xbt_dynar_t processes;
+  e_msg_vm_state_t state;
+  m_host_t location;
+  int coreAmount;
+} s_msg_vm_t;
+
 /************************** 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;
+  xbt_swag_t vms;
 } s_MSG_Global_t, *MSG_Global_t;
 
 /*extern MSG_Global_t msg_global;*/
@@ -103,14 +131,11 @@ 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(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
-#define CHECK_HOST()
 
-m_host_t __MSG_host_create(smx_host_t workstation, void *data);
+m_host_t __MSG_host_create(smx_host_t workstation);
 void __MSG_host_destroy(m_host_t host);
 
 void __MSG_display_process_status(void);
@@ -118,7 +143,7 @@ void __MSG_display_process_status(void);
 void MSG_process_cleanup_from_SIMIX(smx_process_t smx_proc);
 void MSG_process_create_from_SIMIX(smx_process_t *process, const char *name,
                                    xbt_main_func_t code, void *data,
-                                   const char *hostname, int argc,
+                                   const char *hostname, double kill_time,  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);