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
Merge branch 'master' into hypervisor
[simgrid.git]
/
src
/
msg
/
msg_global.c
diff --git
a/src/msg/msg_global.c
b/src/msg/msg_global.c
index
f40bf21
..
de97107
100644
(file)
--- a/
src/msg/msg_global.c
+++ b/
src/msg/msg_global.c
@@
-37,7
+37,7
@@
void MSG_init_nocheck(int *argc, char **argv) {
xbt_getpid = MSG_process_self_PID;
if (!msg_global) {
xbt_getpid = MSG_process_self_PID;
if (!msg_global) {
- s_msg_vm_t vm; // to compute the offset
+
//
s_msg_vm_t vm; // to compute the offset
SIMIX_global_init(argc, argv);
SIMIX_global_init(argc, argv);
@@
-46,11
+46,10
@@
void MSG_init_nocheck(int *argc, char **argv) {
#ifdef MSG_USE_DEPRECATED
msg_global->max_channel = 0;
#endif
#ifdef MSG_USE_DEPRECATED
msg_global->max_channel = 0;
#endif
- msg_global->PID = 1;
msg_global->sent_msg = 0;
msg_global->task_copy_callback = NULL;
msg_global->process_data_cleanup = NULL;
msg_global->sent_msg = 0;
msg_global->task_copy_callback = NULL;
msg_global->process_data_cleanup = NULL;
- msg_global->vms = xbt_swag_new(xbt_swag_offset(vm,all_vms_hookup));
+
//
msg_global->vms = xbt_swag_new(xbt_swag_offset(vm,all_vms_hookup));
/* initialization of the action module */
_MSG_action_init();
/* initialization of the action module */
_MSG_action_init();
@@
-152,14
+151,12
@@
void MSG_config(const char *key, const char *value){
*/
int MSG_process_killall(int reset_PIDs)
{
*/
int MSG_process_killall(int reset_PIDs)
{
- simcall_process_killall();
+ simcall_process_killall(
reset_PIDs
);
- if (reset_PIDs > 0) {
- msg_global->PID = reset_PIDs;
+ if (reset_PIDs > 0)
msg_global->session++;
msg_global->session++;
- }
- return
msg_global->PID
;
+ return
0
;
}
}