#include "xbt/swag.h"
#include "xbt/dict.h"
#include "xbt/config.h"
-#include "instr/private.h"
+#include "instr/instr_private.h"
SG_BEGIN_DECL()
/********************************* Task **************************************/
typedef struct simdata_task {
- smx_action_t compute; /* SURF modeling of computation */
- smx_action_t comm; /* SIMIX communication */
- double message_size; /* Data size */
- double computation_amount; /* Computation size */
+ smx_action_t compute; /* SIMIX modeling of computation */
+ smx_action_t comm; /* SIMIX modeling of communication */
+ double message_size; /* Data size */
+ double computation_amount; /* Computation size */
m_process_t sender;
m_process_t receiver;
m_host_t source;
double priority;
double rate;
- int refcount;
+ int isused; /* Indicates whether the task is used in SIMIX currently */
int host_nb; /* ==0 if sequential task; parallel task if not */
/******* Parallel Tasks Only !!!! *******/
smx_host_t *host_list;
typedef struct simdata_process {
m_host_t m_host; /* the host on which the process is running */
- smx_process_t s_process;
int PID; /* used for debugging purposes */
int PPID; /* The parent PID */
m_host_t put_host; /* used for debugging purposes */
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 */
-} s_simdata_process_t;
+ void* data; /* user data */
+} s_simdata_process_t, *simdata_process_t;
typedef struct process_arg {
const char *name;
double kill_time;
} s_process_arg_t, *process_arg_t;
+typedef struct msg_comm {
+ smx_action_t s_comm; /* SIMIX communication object encapsulated (the same for both processes) */
+ m_task_t task_sent; /* task sent (NULL for the receiver) */
+ m_task_t *task_received; /* where the task will be received (NULL for the sender) */
+ MSG_error_t status; /* status of the communication once finished */
+} s_msg_comm_t;
+
/************************** Global variables ********************************/
typedef struct MSG_Global {
xbt_fifo_t host;
- xbt_fifo_t process_list;
int max_channel;
int PID;
int session;
/*************************************************************/
-#define PROCESS_SET_ERRNO(val) (MSG_process_self()->simdata->last_errno=val)
-#define PROCESS_GET_ERRNO() (MSG_process_self()->simdata->last_errno)
+#define PROCESS_SET_ERRNO(val) \
+ (((simdata_process_t) SIMIX_process_self_get_data())->last_errno=val)
+#define PROCESS_GET_ERRNO() \
+ (((simdata_process_t) SIMIX_process_self_get_data())->last_errno)
#define MSG_RETURN(val) do {PROCESS_SET_ERRNO(val);return(val);} while(0)
/* #define CHECK_ERRNO() ASSERT((PROCESS_GET_ERRNO()!=MSG_HOST_FAILURE),"Host failed, you cannot call this function.") */
-#define CHECK_HOST() xbt_assert1(SIMIX_req_host_get_state(SIMIX_host_self())==1,\
- "Host failed, you cannot call this function. (state=%d)",SIMIX_req_host_get_state(SIMIX_host_self()))
+/*#define CHECK_HOST() xbt_assert(SIMIX_req_host_get_state(SIMIX_host_self())==1,\
+ "Host failed, you cannot call this function. (state=%d)",SIMIX_req_host_get_state(SIMIX_host_self()))*/
+#define CHECK_HOST()
m_host_t __MSG_host_create(smx_host_t workstation, void *data);
-
void __MSG_host_destroy(m_host_t host);
void __MSG_display_process_status(void);
-void __MSG_process_cleanup(smx_process_t smx_proc);
-void *_MSG_process_create_from_SIMIX(const char *name,
- xbt_main_func_t code, void *data,
- char *hostname, int argc,
- char **argv, xbt_dict_t properties);
-void _MSG_process_kill_from_SIMIX(void *p);
+void MSG_process_cleanup_from_SIMIX(smx_process_t smx_proc);
+void MSG_process_create_from_SIMIX(smx_process_t *process, const char *name,
+ xbt_main_func_t code, void *data,
+ const char *hostname, int argc,
+ char **argv, xbt_dict_t properties);
+void MSG_process_kill_from_SIMIX(smx_process_t p);
void _MSG_action_init(void);
void _MSG_action_exit(void);
