Add AS support in MSG and java bindings

[simgrid.git] / include / msg / datatypes.h

diff --git a/include/msg/datatypes.h b/include/msg/datatypes.h
index e5b3ea1..357748a 100644 (file)
--- a/include/msg/datatypes.h
+++ b/include/msg/datatypes.h
@@ -27,6 +27,8 @@ SG_BEGIN_DECL()
  * want to send your task, but only the name of this mailbox. */
 typedef struct s_smx_rvpoint *msg_mailbox_t;
 
+/* ******************************** Environment ************************************ */
+typedef struct s_as *msg_as_t;
 
 /* ******************************** Host ************************************ */
 
@@ -46,17 +48,17 @@ typedef xbt_dictelm_t msg_host_t;
 typedef s_xbt_dictelm_t s_msg_host_t;
 
 typedef struct msg_host_priv {
+  int        dp_enabled;
+  xbt_dict_t dp_objs;
+  double     dp_updated_by_deleted_tasks;
 
-       // TODO Warning keeping such vms attribut may lead to some complexity at the SURF Level.
-       // Please check with Arnaud
-       xbt_dynar_t vms;
 #ifdef MSG_USE_DEPRECATED
   msg_mailbox_t *mailboxes;     /**< the channels  */
 #endif
 } s_msg_host_priv_t, *msg_host_priv_t;
 
 static inline msg_host_priv_t MSG_host_priv(msg_host_t host){
-  return xbt_lib_get_level(host, MSG_HOST_LEVEL);
+  return (msg_host_priv_t )xbt_lib_get_level(host, MSG_HOST_LEVEL);
 }
 
 
@@ -84,43 +86,14 @@ typedef struct msg_task {
  */
 typedef struct msg_task *msg_task_t;
 
-/* ******************************** Hypervisor ************************************* */
-typedef struct msg_hypervisor *msg_hypervisor_t;
-
-typedef struct msg_hypervisor {
-       const char *name;
-       s_xbt_swag_hookup_t all_hypervisor_hookup;
-       xbt_dynar_t vms;   // vms on this hypervisor
-       msg_host_t host;  // physical host of this hypervisor
-
-/* The hypervisor object does not have parameters like the number of CPU
-* cores and the size of memory. These parameters come from those of the
-* physical host.
-**/
-       int overcommit;
-
-} s_msg_hypervisor_t;
-
-/* ********************************  VM ************************************* */
+/* ******************************** VM ************************************* */
 typedef msg_host_t msg_vm_t;
 typedef msg_host_priv_t msg_vm_priv_t;
 
-typedef enum {
-msg_vm_state_created,
-msg_vm_state_running,
-msg_vm_state_sleeping,
-msg_vm_state_migrating,
-msg_vm_state_resuming,
-msg_vm_state_suspended,
-msg_vm_state_saved,
-msg_vm_state_restoring,
-} e_msg_vm_state_t;
-
 static inline msg_vm_priv_t MSG_vm_priv(msg_vm_t vm){
   return xbt_lib_get_level(vm, MSG_HOST_LEVEL);
 }
 
-
 /* ******************************** File ************************************ */
 typedef struct simdata_file *simdata_file_t;