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
First running version after the relocation of the context module [Cristian]
[simgrid.git]
/
src
/
gras
/
Virtu
/
sg_process.c
diff --git
a/src/gras/Virtu/sg_process.c
b/src/gras/Virtu/sg_process.c
index
975c627
..
218b447
100644
(file)
--- a/
src/gras/Virtu/sg_process.c
+++ b/
src/gras/Virtu/sg_process.c
@@
-187,7
+187,8
@@
int gras_os_getpid(void)
if (process != NULL){
data = (gras_procdata_t *)SIMIX_process_get_data(process);
if (process != NULL){
data = (gras_procdata_t *)SIMIX_process_get_data(process);
- return data->pid;
+ if(data != NULL)
+ return data->pid;
}
return 0;
}
return 0;
@@
-237,7
+238,6
@@
void gras_function_register(const char *name, xbt_main_func_t code)
void gras_main()
{
void gras_main()
{
- smx_cond_t cond = NULL;
smx_action_t action;
xbt_fifo_t actions_done = xbt_fifo_new();
xbt_fifo_t actions_failed = xbt_fifo_new();
smx_action_t action;
xbt_fifo_t actions_done = xbt_fifo_new();
xbt_fifo_t actions_failed = xbt_fifo_new();
@@
-249,19
+249,15
@@
void gras_main()
while (SIMIX_solve(actions_done, actions_failed) != -1.0) {
while ((action = xbt_fifo_pop(actions_failed))) {
while (SIMIX_solve(actions_done, actions_failed) != -1.0) {
while ((action = xbt_fifo_pop(actions_failed))) {
- DEBUG1("** %s failed **", action->name);
- while ((cond = xbt_fifo_pop(action->cond_list))) {
- SIMIX_cond_broadcast(cond);
- }
+ DEBUG1("** %s failed **", SIMIX_action_get_name(action));
+ SIMIX_action_signal_all (action);
/* action finished, destroy it */
// SIMIX_action_destroy(action);
}
while ((action = xbt_fifo_pop(actions_done))) {
/* action finished, destroy it */
// SIMIX_action_destroy(action);
}
while ((action = xbt_fifo_pop(actions_done))) {
- DEBUG1("** %s done **", action->name);
- while ((cond = xbt_fifo_pop(action->cond_list))) {
- SIMIX_cond_broadcast(cond);
- }
+ DEBUG1("** %s done **", SIMIX_action_get_name(action));
+ SIMIX_action_signal_all (action);
/* action finished, destroy it */
//SIMIX_action_destroy(action);
}
/* action finished, destroy it */
//SIMIX_action_destroy(action);
}