X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cb91af44a1bd7e5f331686df25d5fe80ff571a43..2c620172723596963b0971d9602cffbe8893e39b:/include/msg/datatypes.h
diff --git a/include/msg/datatypes.h b/include/msg/datatypes.h
index 79fc90ae62..755d900632 100644
--- a/include/msg/datatypes.h
+++ b/include/msg/datatypes.h
@@ -1,5 +1,4 @@
-/* Copyright (c) 2004, 2005, 2007, 2008, 2009, 2010. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2004-2012. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
@@ -8,6 +7,7 @@
#define MSG_DATATYPE_H
#include "xbt/misc.h"
#include "xbt/file_stat.h"
+#include "xbt/lib.h"
#include "simgrid/simix.h"
#include "simgrid_config.h" // for HAVE_TRACING
@@ -30,14 +30,9 @@ typedef struct s_smx_rvpoint *msg_mailbox_t;
/* ******************************** Host ************************************ */
-typedef struct m_host {
- smx_host_t smx_host; /**< SIMIX representation of this host */
-#ifdef MSG_USE_DEPRECATED
- msg_mailbox_t *mailboxes; /**< the channels */
-#endif
-} s_m_host_t;
+extern int MSG_HOST_LEVEL;
-/** @brief Host datatype
+/** @brief Host datatype.
@ingroup m_host_management
A location (or host) is any possible place where
@@ -47,13 +42,30 @@ typedef struct m_host {
some private data that can be only accessed by local
process.
*/
-typedef struct m_host *m_host_t;
+typedef xbt_dictelm_t msg_host_t;
+typedef s_xbt_dictelm_t s_msg_host_t;
+
+typedef struct msg_host_priv {
+
+ // 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);
+}
+
+
/* ******************************** Task ************************************ */
typedef struct simdata_task *simdata_task_t;
-typedef struct m_task {
+typedef struct msg_task {
char *name; /**< @brief task name if any */
simdata_task_t simdata; /**< @brief simulator data */
void *data; /**< @brief user data */
@@ -61,16 +73,52 @@ typedef struct m_task {
long long int counter; /* task unique identifier for instrumentation */
char *category; /* task category for instrumentation */
#endif
-} s_m_task_t;
+} s_msg_task_t;
-/** @brief Task datatype
+/** @brief Task datatype.
@ingroup m_task_management
A task may then be defined by a computing
amount, a message size and some private
data.
*/
-typedef struct m_task *m_task_t;
+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 ************************************* */
+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 ************************************ */
@@ -89,29 +137,35 @@ typedef struct msg_file {
*/
typedef struct msg_file *msg_file_t;
+
+/** @brief File datatype.
+ @ingroup msg_file_management
+
+ You should consider this as an opaque object.
+ */
typedef s_file_stat_t s_msg_stat_t, *msg_stat_t;
/*************** Begin GPU ***************/
typedef struct simdata_gpu_task *simdata_gpu_task_t;
-typedef struct m_gpu_task {
+typedef struct msg_gpu_task {
char *name; /**< @brief task name if any */
simdata_gpu_task_t simdata; /**< @brief simulator data */
#ifdef HAVE_TRACING
long long int counter; /* task unique identifier for instrumentation */
char *category; /* task category for instrumentation */
#endif
-} s_m_gpu_task_t;
+} s_msg_gpu_task_t;
-/** @brief GPU task datatype
+/** @brief GPU task datatype.
@ingroup m_task_management
A task may then be defined by a computing
amount, a dispatch latency and a collect latency.
\see m_task_management
*/
-typedef struct m_gpu_task *m_gpu_task_t;
+typedef struct msg_gpu_task *msg_gpu_task_t;
/*************** End GPU ***************/
/**
@@ -122,7 +176,7 @@ typedef struct m_gpu_task *m_gpu_task_t;
*/
typedef struct msg_comm *msg_comm_t;
-/** \brief Default value for an uninitialized #m_task_t.
+/** \brief Default value for an uninitialized #msg_task_t.
\ingroup m_task_management
*/
#define MSG_TASK_UNINITIALIZED NULL
@@ -139,13 +193,20 @@ typedef struct msg_comm *msg_comm_t;
structure, but always use the provided API to interact with
processes.
*/
-typedef struct s_smx_process *m_process_t;
+typedef struct s_smx_process *msg_process_t;
#ifdef MSG_USE_DEPRECATED
-typedef int m_channel_t;
-#endif
-
+/* Compatibility typedefs */
+typedef int m_channel_t;
+typedef msg_gpu_task_t m_gpu_task_t;
+typedef msg_host_t m_host_t;
+typedef msg_process_t m_process_t;
+typedef msg_task_t m_task_t;
+typedef s_msg_gpu_task_t s_m_gpu_task_t;
+typedef s_msg_host_t s_m_host_t;
+typedef s_msg_task_t s_m_task_t;
+#endif
SG_END_DECL()
#endif