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
let xfer_cpu_overhead to be given by a user
[simgrid.git]
/
src
/
msg
/
msg_private.h
diff --git
a/src/msg/msg_private.h
b/src/msg/msg_private.h
index
f1c64b3
..
e708105
100644
(file)
--- a/
src/msg/msg_private.h
+++ b/
src/msg/msg_private.h
@@
-58,8
+58,6
@@
typedef struct simdata_gpu_task {
typedef struct simdata_process {
msg_host_t m_host; /* the host on which the process is running */
typedef struct simdata_process {
msg_host_t m_host; /* the host on which the process is running */
- int PID; /* used for debugging purposes */
- int PPID; /* The parent PID */
msg_host_t put_host; /* used for debugging purposes */
#ifdef MSG_USE_DEPRECATED
m_channel_t put_channel; /* used for debugging purposes */
msg_host_t put_host; /* used for debugging purposes */
#ifdef MSG_USE_DEPRECATED
m_channel_t put_channel; /* used for debugging purposes */
@@
-89,33
+87,18
@@
typedef struct msg_comm {
msg_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;
msg_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;
-/*
-typedef enum {
- msg_vm_state_suspended, msg_vm_state_running, msg_vm_state_migrating
-} e_msg_vm_state_t;
-typedef struct msg_vm {
- const char *name;
- s_xbt_swag_hookup_t all_vms_hookup;
- s_xbt_swag_hookup_t host_vms_hookup;
- xbt_dynar_t processes;
- e_msg_vm_state_t state;
- msg_host_t location;
- int coreAmount;
-} s_msg_vm_t;
-*/
+
/************************** Global variables ********************************/
typedef struct MSG_Global {
xbt_fifo_t host;
#ifdef MSG_USE_DEPRECATED
int max_channel;
#endif
/************************** Global variables ********************************/
typedef struct MSG_Global {
xbt_fifo_t host;
#ifdef MSG_USE_DEPRECATED
int max_channel;
#endif
- int PID;
int session;
unsigned long int sent_msg; /* Total amount of messages sent during the simulation */
void (*task_copy_callback) (msg_task_t task, msg_process_t src, msg_process_t dst);
void_f_pvoid_t process_data_cleanup;
int session;
unsigned long int sent_msg; /* Total amount of messages sent during the simulation */
void (*task_copy_callback) (msg_task_t task, msg_process_t src, msg_process_t dst);
void_f_pvoid_t process_data_cleanup;
- xbt_swag_t vms;
} s_MSG_Global_t, *MSG_Global_t;
/*extern MSG_Global_t msg_global;*/
} s_MSG_Global_t, *MSG_Global_t;
/*extern MSG_Global_t msg_global;*/
@@
-137,9
+120,7
@@
XBT_PUBLIC_DATA(MSG_Global_t) msg_global;
#endif
msg_host_t __MSG_host_create(smx_host_t workstation);
#endif
msg_host_t __MSG_host_create(smx_host_t workstation);
-void __MSG_host_destroy(msg_host_priv_t host);
-
-void __MSG_display_process_status(void);
+void __MSG_host_destroy(msg_host_t host);
void MSG_process_cleanup_from_SIMIX(smx_process_t smx_proc);
void MSG_process_create_from_SIMIX(smx_process_t *process, const char *name,
void MSG_process_cleanup_from_SIMIX(smx_process_t smx_proc);
void MSG_process_create_from_SIMIX(smx_process_t *process, const char *name,
@@
-153,6
+134,13
@@
void _MSG_action_exit(void);
void MSG_post_create_environment(void);
void MSG_post_create_environment(void);
+static inline void *msg_host_resource_priv(const void *host) {
+ return xbt_lib_get_level((void *)host, MSG_HOST_LEVEL);
+}
+
+void MSG_host_add_task(msg_host_t host, msg_task_t task);
+void MSG_host_del_task(msg_host_t host, msg_task_t task);
+
/********** Tracing **********/
/* declaration of instrumentation functions from msg_task_instr.c */
void TRACE_msg_set_task_category(msg_task_t task, const char *category);
/********** Tracing **********/
/* declaration of instrumentation functions from msg_task_instr.c */
void TRACE_msg_set_task_category(msg_task_t task, const char *category);
@@
-180,16
+168,17
@@
void TRACE_msg_process_sleep_out(msg_process_t process);
void TRACE_msg_process_end(msg_process_t process);
/* declaration of instrumentation functions from instr_msg_vm.c */
void TRACE_msg_process_end(msg_process_t process);
/* declaration of instrumentation functions from instr_msg_vm.c */
-char *instr_vm_id
(msg_vm_t vm, char *str, int len);
-char *instr_vm_id_2
(const char *vm_name, char *str, int len);
+char *instr_vm_id(msg_vm_t vm, char *str, int len);
+char *instr_vm_id_2(const char *vm_name, char *str, int len);
void TRACE_msg_vm_change_host(msg_vm_t vm, msg_host_t old_host,
msg_host_t new_host);
void TRACE_msg_vm_change_host(msg_vm_t vm, msg_host_t old_host,
msg_host_t new_host);
-void TRACE_msg_vm_create (const char *vm_name, msg_host_t host);
+void TRACE_msg_vm_start(msg_vm_t vm);
+void TRACE_msg_vm_create(const char *vm_name, msg_host_t host);
void TRACE_msg_vm_kill(msg_vm_t process);
void TRACE_msg_vm_suspend(msg_vm_t vm);
void TRACE_msg_vm_resume(msg_vm_t vm);
void TRACE_msg_vm_kill(msg_vm_t process);
void TRACE_msg_vm_suspend(msg_vm_t vm);
void TRACE_msg_vm_resume(msg_vm_t vm);
-void TRACE_msg_vm_s
leep_in
(msg_vm_t vm);
-void TRACE_msg_vm_
sleep_out
(msg_vm_t vm);
+void TRACE_msg_vm_s
ave
(msg_vm_t vm);
+void TRACE_msg_vm_
restore
(msg_vm_t vm);
void TRACE_msg_vm_end(msg_vm_t vm);
SG_END_DECL()
void TRACE_msg_vm_end(msg_vm_t vm);
SG_END_DECL()