X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ddf4a32b4868d8cab7bd22f0b7b34bdd5b7dffad..23a502252be475af7547139790b3f2310b3c9603:/include/simgrid/msg.h
diff --git a/include/simgrid/msg.h b/include/simgrid/msg.h
index de6861ee29..b3f49b091d 100644
--- a/include/simgrid/msg.h
+++ b/include/simgrid/msg.h
@@ -1,706 +1,439 @@
-/* Copyright (c) 2004-2014. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2004-2019. 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. */
-#ifndef MSG_H
-#define MSG_H
-
-#include "xbt.h"
-#include "xbt/lib.h"
-#include "simgrid/simix.h"
-#include "simgrid/platf.h"
-
-SG_BEGIN_DECL()
-
-/* ******************************** 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;
-
-/* ******************************** Environment ************************************ */
-typedef struct As *msg_as_t;
-
-/* ******************************** Host ************************************ */
-
-XBT_PUBLIC_DATA(int) MSG_HOST_LEVEL;
-
-/** @brief Host datatype.
- @ingroup m_host_management
-
- A location (or host) is any possible place where
- a process may run. Thus it is represented as a physical
- resource with computing capabilities, some mailboxes
- to enable running process to communicate with remote ones, and
- some private data that can be only accessed by local
- process.
- */
-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;
- int is_migrating;
-
- xbt_dict_t affinity_mask_db;
-
-#ifdef MSG_USE_DEPRECATED
- msg_mailbox_t *mailboxes; /**< the channels */
+#ifndef SIMGRID_MSG_H
+#define SIMGRID_MSG_H
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#ifndef MIN
+#define MIN(a, b) ((a) < (b) ? (a) : (b))
+#endif
+#ifndef MAX
+#define MAX(a, b) ((a) > (b) ? (a) : (b))
#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);
+#ifdef __cplusplus
+#include