One function to rule them all.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@3985 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/src/msg/gos.c b/src/msg/gos.c
index 066c700..d00b791 100644 (file)
--- a/src/msg/gos.c
+++ b/src/msg/gos.c
@@ -115,7 +115,6 @@ static MSG_error_t __MSG_task_get_with_time_out_from_host(m_task_t * task,
        }
        process->simdata->waiting_task = t;
        SIMIX_register_action_to_condition(t_simdata->comm, t_simdata->cond);
        }
        process->simdata->waiting_task = t;
        SIMIX_register_action_to_condition(t_simdata->comm, t_simdata->cond);

-       SIMIX_register_condition_to_action(t_simdata->comm, t_simdata->cond);

        SIMIX_cond_wait(t_simdata->cond,t_simdata->mutex);
        process->simdata->waiting_task = NULL;
 
        SIMIX_cond_wait(t_simdata->cond,t_simdata->mutex);
        process->simdata->waiting_task = NULL;
 


@@ -565,7 +564,6 @@ MSG_error_t MSG_task_execute(m_task_t task)
 
        self->simdata->waiting_task = task;
        SIMIX_register_action_to_condition(simdata->compute, simdata->cond);
 
        self->simdata->waiting_task = task;
        SIMIX_register_action_to_condition(simdata->compute, simdata->cond);

-       SIMIX_register_condition_to_action(simdata->compute, simdata->cond);

        SIMIX_cond_wait(simdata->cond, simdata->mutex);
        self->simdata->waiting_task = NULL;
 
        SIMIX_cond_wait(simdata->cond, simdata->mutex);
        self->simdata->waiting_task = NULL;
 


@@ -675,7 +673,6 @@ MSG_error_t MSG_parallel_task_execute(m_task_t task)
 
        self->simdata->waiting_task = task;
        SIMIX_register_action_to_condition(simdata->compute, simdata->cond);
 
        self->simdata->waiting_task = task;
        SIMIX_register_action_to_condition(simdata->compute, simdata->cond);

-       SIMIX_register_condition_to_action(simdata->compute, simdata->cond);

        SIMIX_cond_wait(simdata->cond, simdata->mutex);
        self->simdata->waiting_task = NULL;
 
        SIMIX_cond_wait(simdata->cond, simdata->mutex);
        self->simdata->waiting_task = NULL;
 


@@ -728,7 +725,6 @@ MSG_error_t MSG_process_sleep(double nb_sec)
        /* create conditional and register action to it */
        cond = SIMIX_cond_init();
 
        /* create conditional and register action to it */
        cond = SIMIX_cond_init();
 

-       SIMIX_register_condition_to_action(act_sleep, cond);

        SIMIX_register_action_to_condition(act_sleep, cond);
        SIMIX_cond_wait(cond,mutex);
        SIMIX_mutex_unlock(mutex);
        SIMIX_register_action_to_condition(act_sleep, cond);
        SIMIX_cond_wait(cond,mutex);
        SIMIX_mutex_unlock(mutex);