X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/63d60cea51ea82af1006ac5aac881c7675ad949d..a73d204e173f35c0abb92b26e061929066b8b283:/include/simgrid/msg.h
diff --git a/include/simgrid/msg.h b/include/simgrid/msg.h
index 5965716b9d..a481a3283e 100644
--- a/include/simgrid/msg.h
+++ b/include/simgrid/msg.h
@@ -1,548 +1,444 @@
-/* Copyright (c) 2004-2015. 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/forward.h"
-#include "simgrid/simix.h"
-
-SG_BEGIN_DECL()
-
-/* ************************* Autonomous System ****************************** */
-typedef simgrid_As *msg_as_t;
-
-/* ******************************** Host ************************************ */
-
-/** @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 sg_host_t msg_host_t;
-
-
-XBT_PUBLIC_DATA(int) sg_storage_max_file_descriptors;
-/* ******************************** Task ************************************ */
-
-typedef struct simdata_task *simdata_task_t;
-
-typedef struct msg_task {
- char *name; /**< @brief task name if any */
- simdata_task_t simdata; /**< @brief simulator data */
- void *data; /**< @brief user data */
- long long int counter; /* task unique identifier for instrumentation */
- char *category; /* task category for instrumentation */
-} s_msg_task_t;
+#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
+#ifdef __cplusplus
+#include