X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7b33e9d03f09b1474cf98945d2f634fc7021c773..e3bb3fa0da0fe033ac8ff471ea382010177855c8:/include/msg/datatypes.h
diff --git a/include/msg/datatypes.h b/include/msg/datatypes.h
index 7d01a0d727..34c965a4d0 100644
--- a/include/msg/datatypes.h
+++ b/include/msg/datatypes.h
@@ -1,127 +1,2 @@
-/* $Id$ */
-
-/* Copyright (c) 2002,2003,2004 Arnaud Legrand. 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_DATATYPE_H
-#define MSG_DATATYPE_H
-
-/********************************* Host **************************************/
-
-struct s_m_host {
- char *name; /* host name if any */
- void *simdata; /* simulator data */
- void *data; /* user data */
-};
-/** \brief Host datatype
- \ingroup m_datatypes_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.
-
- \see m_host_management
-*/
-typedef struct s_m_host *m_host_t;
-
-/********************************* Link **************************************/
-struct s_m_link {
- char *name; /* link name if any */
- void *simdata; /* simulator data */
- void *data; /* user data */
-};
-
-/** \brief Link datatype
- \ingroup m_datatypes_management
-
- A link is an agglomeration of communicating resources
- representing a set of physical network links.
-
- \see m_link_management
-*/
-typedef struct s_m_link *m_link_t;
-
-/********************************* Task **************************************/
-
-struct s_m_task {
- char *name; /* host name if any */
- void *simdata; /* simulator data */
- void *data; /* user data */
-};
-/** \brief Task datatype
- \ingroup m_datatypes_management
-
- A task may then be defined by a computing
- amount, a message size and some private
- data.
- \see m_task_management
-*/
-typedef struct s_m_task *m_task_t;
-
-/** \brief Default value for an uninitialized #m_task_t.
- \ingroup m_datatypes_management
-*/
-#define MSG_TASK_UNINITIALIZED NULL
-/******************************* Process *************************************/
-
-struct s_m_process {
- char *name; /* process name if any */
- void *simdata; /* simulator data */
- void *data; /* user data */
-};
-/** \brief Agent datatype
- \ingroup m_datatypes_management
- An agent may be defined as a code, with some private
- data, executing in a location.
- \see m_process_management
-*/
-typedef struct s_m_process *m_process_t;
-/** \brief Agent code datatype
- \ingroup m_datatypes_management
- The code of an agent is a m_process_code_t, i.e. a function with no arguments
- returning no value.
- \see m_process_management
-*/
-typedef int(*m_process_code_t)(int argc,char *argv[]) ;
-
-/********************************** Channel **********************************/
-/** \brief Channel datatype
- \ingroup m_datatypes_management
- A channel is a number and identifies a mailbox type (just as a
- port number does).
- \see m_channel_management
-*/
-typedef int m_channel_t;
-
-/****************************** Error handling *******************************/
-/** \brief Error handling
-*/typedef enum {
- MSG_OK = 0, /**< Everything is right. Keep on going this way ! */
- MSG_WARNING, /**< Mmmh! Something must be not perfectly clean. But I
- may be a paranoid freak... ! */
- MSG_TRANSFER_FAILURE, /**< There has been a problem during you task
- transfer. Either the network is down or the remote host has been
- shutdown. */
- MSG_HOST_FAILURE, /**< System shutdown. The host on which you are
- running has just been rebooted. Free your datastructures and
- return now !*/
- MSG_FATAL /**< You've done something wrong. You'd better look at it... */
-} MSG_error_t;
-
-typedef enum {
- MSG_SILENT = 0,
- MSG_SOME,
- MSG_VERBOSE
-} MSG_outputmode_t;
-
-typedef enum {
- MSG_STORE_AND_FORWARD = 1, /* 0 means uninitialized value */
- MSG_TCP
-} MSG_sharing_t;
-
-#endif
+#warning You should now include directly simgrid/msg.h instead of msg/datatypes.h
+#include "simgrid/msg.h"