A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
I forgot to update my tree before commiting (once again), and got conflicts as punishment
[simgrid.git]
/
src
/
msg
/
msg_private.h
diff --git
a/src/msg/msg_private.h
b/src/msg/msg_private.h
index
c966362
..
55a22d6
100644
(file)
--- a/
src/msg/msg_private.h
+++ b/
src/msg/msg_private.h
@@
-8,7
+8,7
@@
#define METASIMGRID_PRIVATE_H
#include "msg/msg.h"
#define METASIMGRID_PRIVATE_H
#include "msg/msg.h"
-#include "sim
ix
/simix.h"
+#include "sim
grid
/simix.h"
#include "surf/surf.h"
#include "xbt/fifo.h"
#include "xbt/dynar.h"
#include "surf/surf.h"
#include "xbt/fifo.h"
#include "xbt/dynar.h"
@@
-20,10
+20,6
@@
SG_BEGIN_DECL()
/**************** datatypes **********************************/
SG_BEGIN_DECL()
/**************** datatypes **********************************/
-typedef struct simdata_host {
- smx_host_t smx_host; /* SURF modeling */
- msg_mailbox_t *mailboxes; /* mailboxes to store msg tasks of of the host */
-} s_simdata_host_t;
/********************************* Task **************************************/
/********************************* Task **************************************/
@@
-125,7
+121,7
@@
XBT_PUBLIC_DATA(MSG_Global_t) msg_global;
# define MSG_RETURN(val) return(val)
#endif
# define MSG_RETURN(val) return(val)
#endif
-m_host_t __MSG_host_create(smx_host_t workstation
, void *data
);
+m_host_t __MSG_host_create(smx_host_t workstation);
void __MSG_host_destroy(m_host_t host);
void __MSG_display_process_status(void);
void __MSG_host_destroy(m_host_t host);
void __MSG_display_process_status(void);