X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cb91af44a1bd7e5f331686df25d5fe80ff571a43..30e53e313b361eadd271dd83184627f43d480491:/include/msg/datatypes.h
diff --git a/include/msg/datatypes.h b/include/msg/datatypes.h
index 79fc90ae62..483c582c1c 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. */
@@ -30,14 +29,15 @@ typedef struct s_smx_rvpoint *msg_mailbox_t;
/* ******************************** Host ************************************ */
-typedef struct m_host {
+typedef struct msg_host {
+ xbt_swag_t vms;
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;
+} s_msg_host_t;
-/** @brief Host datatype
+/** @brief Host datatype.
@ingroup m_host_management
A location (or host) is any possible place where
@@ -47,13 +47,13 @@ typedef struct m_host {
some private data that can be only accessed by local
process.
*/
-typedef struct m_host *m_host_t;
+typedef struct msg_host *msg_host_t;
/* ******************************** 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 +61,16 @@ 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;
/* ******************************** File ************************************ */
@@ -95,23 +95,23 @@ 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 +122,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 +139,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