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
make sure that MSG_task_execute() is not called by error on parallel tasks
[simgrid.git]
/
src
/
msg
/
private.h
diff --git
a/src/msg/private.h
b/src/msg/private.h
index
29f7a41
..
a70973f
100644
(file)
--- a/
src/msg/private.h
+++ b/
src/msg/private.h
@@
-1,8
+1,5
@@
-/* $Id$ */
-
-/* Copyright (c) 2002-2007 Arnaud Legrand. */
-/* Copyright (c) 2007 Bruno Donassolo. */
-/* All rights reserved. */
+/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. 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. */
/* 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. */
@@
-10,7
+7,6
@@
#ifndef METASIMGRID_PRIVATE_H
#define METASIMGRID_PRIVATE_H
#ifndef METASIMGRID_PRIVATE_H
#define METASIMGRID_PRIVATE_H
-#include <stdio.h>
#include "msg/msg.h"
#include "simix/simix.h"
#include "surf/surf.h"
#include "msg/msg.h"
#include "simix/simix.h"
#include "surf/surf.h"
@@
-19,6
+15,7
@@
#include "xbt/swag.h"
#include "xbt/dict.h"
#include "xbt/config.h"
#include "xbt/swag.h"
#include "xbt/dict.h"
#include "xbt/config.h"
+#include "instr/private.h"
SG_BEGIN_DECL()
SG_BEGIN_DECL()
@@
-26,9
+23,7
@@
SG_BEGIN_DECL()
/* this structure represents a mailbox */
typedef struct s_msg_mailbox {
char *alias; /* the key of the mailbox in the global dictionary */
/* this structure represents a mailbox */
typedef struct s_msg_mailbox {
char *alias; /* the key of the mailbox in the global dictionary */
- xbt_fifo_t tasks; /* the list of the tasks in the mailbox */
smx_cond_t cond; /* the condition on the mailbox */
smx_cond_t cond; /* the condition on the mailbox */
- char *hostname; /* the name of the host containing the mailbox */
smx_rdv_t rdv; /* SIMIX rendez-vous point */
} s_msg_mailbox_t;
smx_rdv_t rdv; /* SIMIX rendez-vous point */
} s_msg_mailbox_t;
@@
-42,7
+37,7
@@
SG_BEGIN_DECL()
typedef struct simdata_task {
smx_action_t compute; /* SURF modeling of computation */
typedef struct simdata_task {
smx_action_t compute; /* SURF modeling of computation */
- smx_
action_t comm; /* SURF modeling of
communication */
+ smx_
comm_t comm; /* SIMIX
communication */
double message_size; /* Data size */
double computation_amount; /* Computation size */
smx_cond_t cond;
double message_size; /* Data size */
double computation_amount; /* Computation size */
smx_cond_t cond;
@@
-70,6
+65,7
@@
SG_BEGIN_DECL()
m_host_t put_host; /* used for debugging purposes */
m_channel_t put_channel; /* used for debugging purposes */
smx_action_t waiting_action;
m_host_t put_host; /* used for debugging purposes */
m_channel_t put_channel; /* used for debugging purposes */
smx_action_t waiting_action;
+ m_task_t waiting_task;
int argc; /* arguments number if any */
char **argv; /* arguments table if any */
MSG_error_t last_errno; /* the last value returned by a MSG_function */
int argc; /* arguments number if any */
char **argv; /* arguments table if any */
MSG_error_t last_errno; /* the last value returned by a MSG_function */
@@
-123,6
+119,7
@@
XBT_PUBLIC_DATA(MSG_Global_t) msg_global;
void _MSG_process_kill_from_SIMIX(void *p);
void _MSG_action_init(void);
void _MSG_process_kill_from_SIMIX(void *p);
void _MSG_action_init(void);
+ void _MSG_action_exit(void);
SG_END_DECL()
#endif
SG_END_DECL()
#endif