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 S4U
[simgrid.git]
/
src
/
simix
/
smx_process.c
diff --git
a/src/simix/smx_process.c
b/src/simix/smx_process.c
index 51c2859f470c414fb6d09f7fc9b1593905102bba..bc1a0528d6b5897fdacf0d7f52617b9dd41ac410 100644
(file)
--- a/
src/simix/smx_process.c
+++ b/
src/simix/smx_process.c
@@
-1,4
+1,4
@@
-/* Copyright (c) 2007-201
4
. The SimGrid Team.
+/* Copyright (c) 2007-201
5
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-348,7
+348,7
@@
void SIMIX_process_kill(smx_process_t process, smx_process_t issuer) {
case SIMIX_SYNC_EXECUTE:
case SIMIX_SYNC_PARALLEL_EXECUTE:
case SIMIX_SYNC_EXECUTE:
case SIMIX_SYNC_PARALLEL_EXECUTE:
- SIMIX_
host
_execution_destroy(process->waiting_synchro);
+ SIMIX_
process
_execution_destroy(process->waiting_synchro);
break;
case SIMIX_SYNC_COMMUNICATE:
break;
case SIMIX_SYNC_COMMUNICATE:
@@
-405,7
+405,7
@@
void SIMIX_process_throw(smx_process_t process, xbt_errcat_t cat, int value, con
case SIMIX_SYNC_EXECUTE:
case SIMIX_SYNC_PARALLEL_EXECUTE:
case SIMIX_SYNC_EXECUTE:
case SIMIX_SYNC_PARALLEL_EXECUTE:
- SIMIX_
host
_execution_cancel(process->waiting_synchro);
+ SIMIX_
process
_execution_cancel(process->waiting_synchro);
break;
case SIMIX_SYNC_COMMUNICATE:
break;
case SIMIX_SYNC_COMMUNICATE:
@@
-461,8
+461,7
@@
void SIMIX_process_killall(smx_process_t issuer, int reset_pid)
SIMIX_process_empty_trash();
}
SIMIX_process_empty_trash();
}
-void simcall_HANDLER_process_change_host(smx_simcall_t simcall, smx_process_t process,
- sg_host_t dest)
+void simcall_HANDLER_process_set_host(smx_simcall_t simcall, smx_process_t process, sg_host_t dest)
{
process->new_host = dest;
}
{
process->new_host = dest;
}
@@
-538,7
+537,7
@@
smx_synchro_t SIMIX_process_suspend(smx_process_t process, smx_process_t issuer)
}
} else {
/* FIXME: computation size is zero. Is it okay that bound is zero ? */
}
} else {
/* FIXME: computation size is zero. Is it okay that bound is zero ? */
- return SIMIX_
host_execute("suspend", process->host
, 0.0, 1.0, 0.0, 0);
+ return SIMIX_
process_execute(process, "suspend"
, 0.0, 1.0, 0.0, 0);
}
}
}
}