X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8be7ea3f9e71cd563e91b6aba63f5c70f043fbd5..662f44287e3fd62ebdf93b4c8173603dde9693b7:/include/msg/datatypes.h

diff --git a/include/msg/datatypes.h b/include/msg/datatypes.h
index ec37fac7f1..e69f229643 100644
--- a/include/msg/datatypes.h
+++ b/include/msg/datatypes.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004-2013. The SimGrid Team.
+/* Copyright (c) 2004-2014. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@ SG_BEGIN_DECL()
 typedef struct s_smx_rvpoint *msg_mailbox_t;
 
 /* ******************************** Environment ************************************ */
-typedef struct s_as *msg_as_t;
+typedef struct As *msg_as_t;
 
 /* ******************************** Host ************************************ */
 
@@ -48,7 +48,12 @@ typedef xbt_dictelm_t msg_host_t;
 typedef s_xbt_dictelm_t s_msg_host_t;
 
 typedef struct msg_host_priv {
-  xbt_swag_t vms;
+  int        dp_enabled;
+  xbt_dict_t dp_objs;
+  double     dp_updated_by_deleted_tasks;
+
+  xbt_dict_t affinity_mask_db;
+
 #ifdef MSG_USE_DEPRECATED
   msg_mailbox_t *mailboxes;     /**< the channels  */
 #endif
@@ -83,47 +88,58 @@ typedef struct msg_task {
  */
 typedef struct msg_task *msg_task_t;
 
-/* ********************************  VM ************************************* */
-typedef struct msg_vm *msg_vm_t;
+/* ******************************** VM ************************************* */
+typedef msg_host_t msg_vm_t;
+typedef msg_host_priv_t msg_vm_priv_t;
 
-typedef enum {
-  msg_vm_state_suspended, msg_vm_state_running, msg_vm_state_migrating
-} e_msg_vm_state_t;
-
-typedef struct msg_vm {
-  char *name;
-  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;
-  msg_host_t location;
-  int coreAmount;
-} s_msg_vm_t;
+static inline msg_vm_priv_t MSG_vm_priv(msg_vm_t vm){
+  return (msg_vm_priv_t) xbt_lib_get_level(vm, MSG_HOST_LEVEL);
+}
 
 /* ******************************** File ************************************ */
+//typedef struct simdata_file *simdata_file_t;
+//
+//typedef struct s_msg_file_info {
+//  sg_size_t size;
+//  char* mount_point;
+//  char* storageId;
+//  char* storage_type;
+//  char* content_type;
+//} s_msg_file_info_t, *msg_file_info_t;
+//
+//typedef struct msg_file {
+//  char *fullname;               /**< @brief file full name (path+name)*/
+//  simdata_file_t simdata;       /**< @brief simulator data  */
+//  msg_file_info_t info;
+//} s_msg_file_t;
+//
+///** @brief File datatype.
+// *  @ingroup msg_file_management
+// *
+// *  You should consider this as an opaque object.
+// */
+//
+//typedef struct msg_file *msg_file_t;
+extern int MSG_FILE_LEVEL;
 typedef struct simdata_file *simdata_file_t;
 
-typedef struct s_file_info {
-  size_t size;
+typedef xbt_dictelm_t msg_file_t;
+typedef s_xbt_dictelm_t s_msg_file_t;
+
+typedef struct msg_file_priv  {
+  const char *fullname;
+  sg_size_t size;
   char* mount_point;
   char* storageId;
   char* storage_type;
   char* content_type;
-} s_file_info_t, *msg_file_info_t;
-
-typedef struct msg_file {
-  char *fullname;               /**< @brief file full name (path+name)*/
-  simdata_file_t simdata;       /**< @brief simulator data  */
-  msg_file_info_t info;
-} s_msg_file_t;
+  void *data;
+  simdata_file_t simdata;
+} s_msg_file_priv_t, *msg_file_priv_t;
 
-/** @brief File datatype.
- *  @ingroup msg_file_management
- *
- *  You should consider this as an opaque object.
- */
-
-typedef struct msg_file *msg_file_t;
+static inline msg_file_priv_t MSG_file_priv(msg_file_t file){
+  return (msg_file_priv_t )xbt_lib_get_level(file, MSG_FILE_LEVEL);
+}
 
 /* ******************************** Storage ************************************ */
 /* TODO: PV: to comment */
@@ -143,6 +159,10 @@ typedef struct msg_storage_priv  {
   void * dummy;
 } s_msg_storage_priv_t, *msg_storage_priv_t;
 
+static inline msg_storage_priv_t MSG_storage_priv(msg_storage_t storage){
+  return (msg_storage_priv_t )xbt_lib_get_level(storage, MSG_STORAGE_LEVEL);
+}
+
 /*************** Begin GPU ***************/
 typedef struct simdata_gpu_task *simdata_gpu_task_t;