X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a13889143f3dcc24f6100d07e9d20e710e74e0ad..ee52f84fe512219acf534c4d4654c3df56659e91:/include/msg/datatypes.h
diff --git a/include/msg/datatypes.h b/include/msg/datatypes.h
index b081c6b438..c844ad10af 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. */
@@ -7,22 +6,34 @@
#ifndef MSG_DATATYPE_H
#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
SG_BEGIN_DECL()
-/* ******************************** Host ************************************ */
+/* ******************************** Mailbox ************************************ */
+
+/** @brief Mailbox datatype
+ * @ingroup msg_task_usage
+ *
+ * Object representing a communication rendez-vous point, on which
+ * the sender finds the receiver it wants to communicate with. As a
+ * MSG user, you will only rarely manipulate any of these objects
+ * directly, since most of the public interface (such as
+ * #MSG_task_send and friends) hide this object behind a string
+ * alias. That mean that you don't provide the mailbox on which you
+ * want to send your task, but only the name of this mailbox. */
+typedef struct s_smx_rvpoint *msg_mailbox_t;
-typedef struct simdata_host *simdata_host_t;
+/* ******************************** Environment ************************************ */
+typedef struct s_as *msg_as_t;
-typedef struct m_host {
- char *name; /**< @brief host name if any */
- simdata_host_t simdata; /**< @brief simulator data */
- void *data; /**< @brief user data */
-} s_m_host_t;
+/* ******************************** Host ************************************ */
-/** @brief Host datatype
+extern int MSG_HOST_LEVEL;
+
+/** @brief Host datatype.
@ingroup m_host_management
A location (or host) is any possible place where
@@ -32,13 +43,27 @@ 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 {
+ xbt_swag_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 (msg_host_priv_t )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 */
@@ -46,25 +71,49 @@ 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;
+/* ******************************** VM ************************************* */
+typedef struct msg_vm *msg_vm_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;
/* ******************************** File ************************************ */
typedef struct simdata_file *simdata_file_t;
+typedef struct s_file_info {
+ 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 *name; /**< @brief file name */
- simdata_file_t simdata; /**< @brief simulator data */
- void *data; /**< @brief user data */
+ 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.
@@ -72,43 +121,51 @@ typedef struct msg_file {
You should consider this as an opaque object.
*/
+
typedef struct msg_file *msg_file_t;
-typedef s_file_stat_t s_msg_stat_t, *msg_stat_t;
+/* ******************************** Storage ************************************ */
+typedef struct simdata_storage *simdata_storage_t;
+
+typedef struct msg_storage {
+ char *name;
+ simdata_storage_t simdata; /**< @brief simulator data */
+ void *data; /**< @brief user data */
+} s_msg_storage_t;
+typedef struct msg_storage *msg_storage_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 ***************/
/**
* \brief @brief Communication action.
- * \ingroup m_datatypes_management
+ * \ingroup msg_task_usage
*
- * Communication actions transfer tasks between processes.
- * For a given task, the sender and the receiver have distinct objects.
+ * Object representing an ongoing communication between processes. Such beast is usually obtained by using #MSG_task_isend, #MSG_task_irecv or friends.
*/
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
@@ -125,19 +182,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
-
-/* ******************************** Mailbox ************************************ */
-
-/** @brief Mailbox datatype
- @ingroup m_datatypes_management
- */
-typedef struct s_smx_rvpoint *msg_mailbox_t;
+/* 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